Diff [f9feab8cc2f80d40d81f4393bd616d37f41be6ef:90152a4860529aff7214be01cd22abd37012cd19] for / – Cforall

.gitignore

-              rf9feab8
+              r90152a4
 config.status
 config.log
+config.py
 stamp-h1
+Makefile
+driver/Makefile
+libcfa/Makefile
+src/Makefile
+/Makefile
+**/Makefile
 /version
 …
 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.cf
+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

Jenkins/FullBuild

-              rf9feab8
+              r90152a4
                                         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 ) },
 …
                 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: publish],                              \
                         [$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)
+        }

Jenkins/TestRegen

-              rf9feab8
+              r90152a4
                         email()
+                }
+        }
+        }
         catch (Exception caughtError) {
                 email_error()
 …
         def install_dir = pwd tmp: true
         //Configure the conpilation (Output is not relevant)
         //Use the current directory as the installation target so nothing
 …
                 def email_subject = "[cforall dashboard][TEST REGEN# ${env.BUILD_NUMBER}] - Result"
                 def email_body = """This is an automated email from the Jenkins build machine. It was
 generated http://plg2:8082/dashboard.
+generated https://cforall.uwaterloo.ca:8082/dashboard.html.
 Please apply the required changes using the following method :
 …
         def email_subject = "[cforall dashboard][TEST REGEN# ${env.BUILD_NUMBER}] - FAILURE"
         def email_body = """This is an automated email from the Jenkins build machine. It was
 generated http://plg2:8082/dashboard.
+generated https://cforall.uwaterloo.ca:8082/dashboard.html.
 Test generation encoutered an error please see attached logs

Jenkinsfile

-              rf9feab8
+              r90152a4
 node ('master'){
+        boolean bIsSandbox = env.BRANCH_NAME == "jenkins-sandbox"
+        // 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"
 …
                         notify_server(0)
+                        prepare_build()
+                        Settings = prepare_build()
+                        clean()
                         checkout()
 …
                         benchmark()
-                        clean()
                         build_doc()
 …
                 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)
+                if( Settings && !Settings.Silent ) {
+                        email(log_needed, Settings.IsSandbox)
+                }
 …
 //===========================================================================================================
-// 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]
+}
-def prepare_build() {
-        properties ([                                                                                                   \
-                [$class: 'ParametersDefinitionProperty',                                                                \
-                        parameterDefinitions: [                                                                         \
-                                [$class: 'ChoiceParameterDefinition',                                           \
-                                        description: 'Which compiler to use',                                   \
-                                        name: 'pCompiler',                                                              \
-                                        choices: 'gcc-6\ngcc-5\ngcc-4.9\nclang',                                        \
-                                        defaultValue: 'gcc-6',                                                          \
-                                ],                                                                                              \
-                                [$class: 'ChoiceParameterDefinition',                                           \
-                                        description: 'The target architecture',                                 \
-                                        name: 'pArchitecture',                                                          \
-                                        choices: 'x64\nx86',                                                            \
-                                        defaultValue: 'x64',                                                            \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If false, only the quick test suite is ran',              \
-                                        name: 'pRunAllTests',                                                           \
-                                        defaultValue: false,                                                            \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins also runs benchmarks',           \
-                                        name: 'pRunBenchmark',                                                          \
-                                        defaultValue: true,                                                             \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins also builds documentation',              \
-                                        name: 'pBuildDocumentation',                                                    \
-                                        defaultValue: true,                                                             \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins also publishes results',                 \
-                                        name: 'pPublish',                                                               \
-                                        defaultValue: false,                                                            \
-                                ],                                                                                              \
-                                [$class: 'BooleanParameterDefinition',                                                  \
-                                        description: 'If true, jenkins will not send emails',           \
-                                        name: 'pSilent',                                                                        \
-                                        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 --silent --data "wait=${wait}" -X POST http://plg2:8082/jenkins/notify > /dev/null || true"""
-        return
+}
-def make_doc() {
-        def err = null
-        try {
-                sh 'make clean > /dev/null'
-                sh 'make > /dev/null 2>&1'
+        }
-        catch (Exception caughtError) {
-                err = caughtError //rethrow error later
-                sh 'cat *.log'
+        }
-        finally {
-                if (err) throw err // Must re-throw exception to propagate error
+        }
+}
-//Description of a compiler (Must be serializable since pipelines are persistent)
-class CC_Desc implements Serializable {
-        public String cc_name
-        public String cpp_cc
-        public String cfa_cc
-        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
-                this.cc_name = cc_name
-                this.cpp_cc = cpp_cc
-                this.cfa_cc = cfa_cc
+        }
+}
-def compiler_from_params(cc) {
-        switch( cc ) {
-                case 'gcc-6':
-                        return new CC_Desc('gcc-6', 'g++-6', 'gcc-6')
-                break
-                case 'gcc-5':
-                        return new CC_Desc('gcc-5', 'g++-5', 'gcc-5')
-                break
-                case 'gcc-4.9':
-                        return new CC_Desc('gcc-4.9', 'g++-4.9', 'gcc-4.9')
-                break
-                case 'clang':
-                        return new CC_Desc('clang', 'clang++', 'gcc-6')
-                break
-                default :
-                        error "Unhandled compiler : ${cc}"
+        }
+}
-def architecture_from_params( arch ) {
-        switch( arch ) {
-                case 'x64':
-                        return '--host=x86_64'
-                break
-                case 'x86':
-                        return '--host=i386'
-                break
-                default :
-                        error "Unhandled architecture : ${arch}"
+        }
+}
-//===========================================================================================================
 // Main compilation routines
 //===========================================================================================================
+def clean() {
+        build_stage('Cleanup') {
+                // 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') {
                 //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'
+                final scmVars = checkout scm
+                Settings.GitNewRef = scmVars.GIT_COMMIT
+                Settings.GitOldRef = scmVars.GIT_PREVIOUS_COMMIT
+                echo GitLogMessage()
+        }
+}
 …
 def build() {
         build_stage('Build') {
+                def install_dir = pwd tmp: true
+                //Configure the conpilation (Output is not relevant)
+                //Use the current directory as the installation target so nothing
+                //escapes the sandbox
+                //Also specify the compiler by hand
+                sh "./configure CXX=${compiler.cpp_cc} ${architecture} --with-backend-compiler=${compiler.cfa_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
+                //Compile the project
+                sh 'make -j 8 --no-print-directory V=0 install'
+                // 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 ) {
+                                targets="--with-target-hosts='host:debug,host:nodebug'"
+                        } else {
+                                targets="--with-target-hosts='host:debug'"
+                        }
+                        sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
+                        //Compile the project
+                        sh 'make -j 8 --no-print-directory'
+                }
+        }
+}
 …
         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'
+                dir (BuildDir) {
+                        //Run the tests from the tests directory
+                        if ( Settings.RunAllTests ) {
+                                sh 'make --no-print-directory -C tests all-tests debug=yes'
+                                sh 'make --no-print-directory -C tests all-tests debug=no '
+                        }
+                        else {
+                                sh 'make --no-print-directory -C tests'
+                        }
+                }
+        }
 …
         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'
+                if( !Settings.RunBenchmark ) return
+                dir (BuildDir) {
+                        //Append bench results
+                        sh "make --no-print-directory -C benchmark jenkins githash=${Settings.GitNewRef} arch=${Settings.Architecture} | tee ${SrcDir}/bench.json"
+                }
+        }
+}
 …
         build_stage('Documentation') {
                 if( !do_doc ) return
+                if( !Settings.BuildDocumentation ) return
                 dir ('doc/user') {
 …
         build_stage('Publish') {
                 if( !do_publish ) return
+                if( !Settings.Publish ) return
                 //Then publish the results
                 sh 'curl -H "Content-Type: application/json" --silent --data @bench.json http://plg2:8082/jenkins/publish > /dev/null || true'
+                sh 'curl --silent --show-error -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".
+def GitLogMessage() {
+        if (!Settings || !Settings.GitOldRef || !Settings.GitNewRef) return "\nERROR retrieveing git information!\n"
+        sh "${SrcDir}/tools/PrettyGitLogs.sh ${BuildDir} ${Settings.GitOldRef} ${Settings.GitNewRef}"
+        def gitUpdate = readFile("${BuildDir}/GIT_UPDATE")
+        def gitLog    = readFile("${BuildDir}/GIT_LOG")
+        def gitDiff   = readFile("${BuildDir}/GIT_DIFF")
+        return """
 The branch ${env.BRANCH_NAME} has been updated.
+   via  ${gitRefOldValue} (commit)
+  from  ${gitRefNewValue} (commit)
+${gitUpdate}
 Check console output at ${env.BUILD_URL} to view the results.
 …
 - Status --------------------------------------------------------------
 BUILD# ${env.BUILD_NUMBER} - ${status}
+BUILD# ${env.BUILD_NUMBER} - ${currentBuild.result}
 - Log -----------------------------------------------------------------
 …
 ${gitDiff}
 """
+}
+//Standard build email notification
+def email(boolean log, boolean bIsSandbox) {
+        //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 = """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 Cforall repository.
+""" + GitLogMessage()
         def email_to = "cforall@lists.uwaterloo.ca"
+        //send email notification
+        emailext body: email_body, subject: email_subject, to: email_to, attachLog: log
+}
+        if( Settings && !Settings.IsSandbox ) {
+                //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
+//===========================================================================================================
+//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
+        }
+}
+//Description of an architecture (Must be serializable since pipelines are persistent)
+class Arch_Desc implements Serializable {
+        public String name
+        public String flags
+        Arch_Desc(String name, String flags) {
+                this.name  = name
+                this.flags = flags
+        }
+}
+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')
+                        break
+                        case 'x86':
+                                this.Architecture = new Arch_Desc('x86', '--host=i386')
+                        break
+                        default :
+                                error "Unhandled architecture : ${arch}"
+                }
+                this.RunAllTests        = param.RunAllTests
+                this.RunBenchmark       = param.RunBenchmark
+                this.BuildDocumentation = param.BuildDocumentation
+                this.Publish            = param.Publish
+                this.Silent             = param.Silent
+                this.IsSandbox          = (branch == "jenkins-sandbox")
+                def full = param.RunAllTests ? " (Full)" : ""
+                this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
+                this.DescLong = """Compiler              : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_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 = ''
+        }
+}
+def prepare_build() {
+        // prepare the properties
+        properties ([                                                                                                   \
+                [$class: 'ParametersDefinitionProperty',                                                                \
+                        parameterDefinitions: [                                                                         \
+                                [$class: 'ChoiceParameterDefinition',                                           \
+                                        description: 'Which compiler to use',                                   \
+                                        name: 'Compiler',                                                                       \
+                                        choices: 'gcc-6\ngcc-5\ngcc-4.9\nclang',                                        \
+                                        defaultValue: 'gcc-6',                                                          \
+                                ],                                                                                              \
+                                [$class: 'ChoiceParameterDefinition',                                           \
+                                        description: 'The target architecture',                                 \
+                                        name: 'Architecture',                                                           \
+                                        choices: 'x64\nx86',                                                            \
+                                        defaultValue: 'x64',                                                            \
+                                ],                                                                                              \
+                                [$class: 'BooleanParameterDefinition',                                                  \
+                                        description: 'If false, only the quick test suite is ran',              \
+                                        name: 'RunAllTests',                                                            \
+                                        defaultValue: false,                                                            \
+                                ],                                                                                              \
+                                [$class: 'BooleanParameterDefinition',                                                  \
+                                        description: 'If true, jenkins also runs benchmarks',           \
+                                        name: 'RunBenchmark',                                                           \
+                                        defaultValue: false,                                                            \
+                                ],                                                                                              \
+                                [$class: 'BooleanParameterDefinition',                                                  \
+                                        description: 'If true, jenkins also builds documentation',              \
+                                        name: 'BuildDocumentation',                                                     \
+                                        defaultValue: true,                                                             \
+                                ],                                                                                              \
+                                [$class: 'BooleanParameterDefinition',                                                  \
+                                        description: 'If true, jenkins also publishes results',                 \
+                                        name: 'Publish',                                                                        \
+                                        defaultValue: false,                                                            \
+                                ],                                                                                              \
+                                [$class: 'BooleanParameterDefinition',                                                  \
+                                        description: 'If true, jenkins will not send emails',           \
+                                        name: 'Silent',                                                                         \
+                                        defaultValue: false,                                                            \
+                                ],                                                                                              \
+                        ],
+                ]])
+        final settings = new BuildSettings(params, env.BRANCH_NAME)
+        currentBuild.description = settings.DescShort
+        echo                       settings.DescLong
+        return settings
+}
+def build_stage(String name, Closure block ) {
+        StageName = name
+        echo " -------- ${StageName} -------- "
+        stage(name, block)
+}
+def notify_server(int wait) {
+        sh """curl --silent --show-error --data "wait=${wait}" -X POST https://cforall.uwaterloo.ca:8082/jenkins/notify > /dev/null || true"""
+        return
+}
+def make_doc() {
+        def err = null
+        try {
+                sh 'make clean > /dev/null'
+                sh 'make > /dev/null 2>&1'
+        }
+        catch (Exception caughtError) {
+                err = caughtError //rethrow error later
+                sh 'cat *.log'
+        }
+        finally {
+                if (err) throw err // Must re-throw exception to propagate error
+        }
+}

Makefile.am

-              rf9feab8
+              r90152a4
 ## file "LICENCE" distributed with Cforall.
 ##
 ## Makefile.am --
+## Makefile.am --
 ##
 ## Author           : Peter A. Buhr
 …
 ###############################################################################
+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
+BACKEND_CC = @BACKEND_CC@     # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
+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}
+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

-              rf9feab8
+              r90152a4
 ######################## -*- 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/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/missing $(top_srcdir)/src/config.h.in \
+        INSTALL README automake/compile automake/config.guess \
+        automake/config.sub automake/depcomp automake/install-sh \
+        automake/missing automake/ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 …
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
+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@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 …
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 …
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 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
+MAINTAINERCLEANFILES = lib/* bin/* tests/.deps/* tests/.out/*
+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
 …
 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 \
 …
 .PRECIOUS: Makefile
+ # order important
+@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}
+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.

README

-              rf9feab8
+              r90152a4
 - the implicit coercion of structure types to the type of their first member is
   not implemented
 Who is responsible for cfa-cc?
 ------------------------------
 …
 The Cforall project maintains a web page:
         http://plg.uwaterloo.ca/~cforall
+        https://cforall.uwaterloo.ca

aclocal.m4

-              rf9feab8
+              r90152a4
 # 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 -*-

automake/compile

Property mode changed from 100755 to 120000

-              rf9feab8
+              r90152a4
+#! /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

-              rf9feab8
+              r90152a4
+#! /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

-              rf9feab8
+              r90152a4
+#! /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

-              rf9feab8
+              r90152a4
+#! /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

-              rf9feab8
+              r90152a4
+#!/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

-              rf9feab8
+              r90152a4
+#! /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

-              rf9feab8
+              r90152a4
+#! /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

-              rf9feab8
+              r90152a4
+#! /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

-              rf9feab8
+              r90152a4
 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
+DRIVER_DIR
 CFA_LIBDIR
 CFA_BINDIR
 CFA_INCDIR
 CFA_PREFIX
-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
+DOendif
+DOifskipcompile
 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
+with_target_hosts
 enable_dependency_tracking
+'
 …
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
-  --disable-maintainer-mode
-                          disable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
-  --enable-target-release Build and install the release target
-  --enable-target-debug   Build and install the debug target
-  --enable-threading      Build and install libcfa with threading support
-                          (Enabled by default)
   --enable-dependency-tracking
                           do not reject slow dependency extractors
 …
   --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
 Some influential environment variables:
 …
 #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='\'
+# 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
+#==============================================================================
+# HACK to be able to use conditionnals inside makefiles
+DOifskipcompile='ifeq ($(skipcompile),yes)
+else'
+DOendif='endif'
+#==============================================================================
+# backend compiler implementation
 # Check whether --with-backend-compiler was given.
 …
 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.
+       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
 …
 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
+       # 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
 …
+# 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
+if test "x$prefix" = "xNONE"; then
+        cfa_prefix=${ac_default_prefix}
+else
+        cfa_prefix=${prefix}
+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
+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=*) ;;
+                # 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
 …
+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
+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") ;;
+                *)
+                        >&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";;
+                "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";;
+                *)
+                >&2 echo "Unkown 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
+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";;
+                "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";;
+                *)
+                >&2 echo "Unkown 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
 #define CFA_FLAGS "${CFAFLAGS}"
 …
+#==============================================================================
 # Checks for programs.
 ac_ext=cpp
 …
+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 tests/preempt_longrun/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.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 …
 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:
 …
 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" ;;
     "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" ;;
+    "tests/preempt_longrun/Makefile") CONFIG_FILES="$CONFIG_FILES tests/preempt_longrun/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;}
 …
-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

-              rf9feab8
+              r90152a4
 AC_CONFIG_AUX_DIR([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
+#==============================================================================
+# HACK to be able to use conditionnals inside makefiles
+DOifskipcompile='ifeq ($(skipcompile),yes)
+else'
+AC_SUBST([DOifskipcompile])
+AM_SUBST_NOTMAKE([DOifskipcompile])
+DOendif='endif'
+AC_SUBST([DOendif])
+AM_SUBST_NOTMAKE([DOendif])
+#==============================================================================
+# backend compiler implementation
 AC_ARG_WITH(backend-compiler,
         [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
         backendcompiler=$withval, backendcompiler="")
+       [  --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}
+       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
+       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"])
+if test "x$prefix" = "xNONE"; then
+        cfa_prefix=${ac_default_prefix}
+else
+        cfa_prefix=${prefix}
+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})
+#==============================================================================
+# 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
+CFACPP=${DRIVER_DIR}cfa-cpp
+AC_SUBST(DRIVER_DIR)
+AC_SUBST(CFACC)
+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=*) ;;
+                # 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_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") ;;
+                *)
+                        >&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
+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_CHECK_FUNCS([memset putenv strchr strtol])
+#==============================================================================
 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
+        tests/preempt_longrun/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

-              rf9feab8
+              r90152a4
 %% Created On       : Sat Apr  9 10:06:17 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Aug 28 20:18:42 2017
 %% Update Count     : 355
+%% Last Modified On : Mon Jul  9 08:28:05 2018
+%% Update Count     : 380
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \newcommand{\CFAIcon}{\textsf{C}\raisebox{\depth}{\rotatebox{180}{\textsf{A}}}\xspace} % Cforall symbolic name
 \newcommand{\CFA}{\protect\CFAIcon} % safe for section/caption
+\newcommand{\CFA}{\protect\CFAIcon}             % safe for section/caption
 \newcommand{\CFL}{\textrm{Cforall}\xspace} % Cforall symbolic name
 \newcommand{\Celeven}{\textrm{C11}\xspace} % C11 symbolic name
 …
 \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}}}}
 …
 % index macros
 \newcommand{\italic}[1]{\emph{\hyperpage{#1}}}
 \newcommand{\definition}[1]{\textbf{\hyperpage{#1}}}
+\newcommand{\Definition}[1]{\textbf{\hyperpage{#1}}}
 \newcommand{\see}[1]{\emph{see}~#1}
 …
 \def\impl{\@bsphack\begingroup
           \def\protect##1{\string##1\space}\@sanitize
           \@wrxref{|definition}}
+          \@wrxref{|Definition}}
 \newcommand{\indexcode}[1]{{\lstinline$#1$}}
 \def\use{\@bsphack\begingroup
 …
     \if@nobreak \ifvmode\nobreak\fi\fi\@esphack}
 %\newcommand{\use}[1]{\index{#1@{\lstinline$#1$}}}
 %\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|definition}}
+%\newcommand{\impl}[1]{\index{\protect#1@{\lstinline$\protect#1$}|Definition}}
 % inline text and lowercase index: \Index{inline and lowercase index text}
 …
 % Latin abbreviation
+\newcommand{\abbrevFont}{\textit}       % set empty for no italics
+\newcommand{\abbrevFont}{\textit}                       % set empty for no italics
+\@ifundefined{eg}{
 \newcommand{\EG}{\abbrevFont{e}.\abbrevFont{g}.}
 \newcommand*{\eg}{%
 …
                 {\@ifnextchar{:}{\EG}%
                         {\EG,\xspace}}%
+}%
+}}{}%
+\@ifundefined{ie}{
 \newcommand{\IE}{\abbrevFont{i}.\abbrevFont{e}.}
 \newcommand*{\ie}{%
 …
                 {\@ifnextchar{:}{\IE}%
                         {\IE,\xspace}}%
+}%
+}}{}%
+\@ifundefined{etc}{
 \newcommand{\ETC}{\abbrevFont{etc}}
 \newcommand*{\etc}{%
         \@ifnextchar{.}{\ETC}%
+        {\ETC\xspace}%
+}%
+\newcommand{\ETAL}{\abbrevFont{et\:al}}
+\newcommand{\etal}{%
+        \@ifnextchar{.}{\ETAL}%
+                {\abbrevFont{\ETAL}.\xspace}%
+}%
+        {\ETC.\xspace}%
+}}{}%
+\@ifundefined{etal}{
+\newcommand{\ETAL}{\abbrevFont{et}~\abbrevFont{al}}
+\newcommand*{\etal}{%
+        \@ifnextchar{.}{\protect\ETAL}%
+                {\protect\ETAL.\xspace}%
+}}{}%
+\@ifundefined{viz}{
 \newcommand{\VIZ}{\abbrevFont{viz}}
 \newcommand{\viz}{%
+\newcommand*{\viz}{%
         \@ifnextchar{.}{\VIZ}%
                 {\abbrevFont{\VIZ}.\xspace}%
 }%
+                {\VIZ.\xspace}%
+}}{}%
 \makeatother
 \newenvironment{quote2}{%
         \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindent\rightmargin\leftmargin}%
+\newenvironment{cquote}{%
+        \list{}{\lstset{resetmargins=true,aboveskip=0pt,belowskip=0pt}\topsep=4pt\parsep=0pt\leftmargin=\parindentlnth\rightmargin\leftmargin}%
         \item\relax
 }{%
         \endlist
 }% quote2
+}% cquote
 \newenvironment{rationale}{%
   \begin{quote2}\noindent$\Box$\enspace
+  \begin{cquote}\noindent$\Box$\enspace
 }{%
   \hfill\enspace$\Box$\end{quote2}
+  \hfill\enspace$\Box$\end{cquote}
 }%
 …
 \newenvironment{syntax}{
 \paragraph{Syntax}
 \begin{quote2}
+\begin{cquote}
 \begin{description}[noitemsep,leftmargin=\parindentlnth]
 }{
 \end{description}
 \end{quote2}
+\end{cquote}
+}
 % \def\syntax{\paragraph{Syntax}\trivlist\parindent=.5in\item[\hskip.5in]}
 …
 \newcommand{\opt}{$_{opt}$\ }
 \usepackage{varioref}                 % extended references
+\usepackage{varioref}                                   % extended references
 % adjust varioref package with default "section" and "page" titles, and optional title with faraway page numbers
 % \VRef{label} => Section 2.7, \VPageref{label} => page 17
 …
 language=CFA,
 columns=fullflexible,
 basicstyle=\linespread{0.9}\sf,                                                 % reduce line spacing and use sanserif font
 stringstyle=\tt,                                                                                % use typewriter font
 tabsize=5,                                                                                              % N space tabbing
 xleftmargin=\parindentlnth,                                                             % indent code to paragraph indentation
 extendedchars=true,                                                                             % allow ASCII characters in the range 128-255
 escapechar=§,                                                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
 mathescape=true,                                                                                % LaTeX math escape in CFA code $...$
 keepspaces=true,                                                                                %
 showstringspaces=false,                                                                 % do not show spaces with cup
 showlines=true,                                                                                 % show blank lines at end of code
 aboveskip=4pt,                                                                                  % spacing above/below code block
+basicstyle=\linespread{0.9}\sf,                 % reduce line spacing and use sanserif font
+stringstyle=\tt,                                                % use typewriter font
+tabsize=5,                                                              % N space tabbing
+xleftmargin=\parindentlnth,                             % indent code to paragraph indentation
+extendedchars=true,                                             % allow ASCII characters in the range 128-255
+escapechar=§,                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
+mathescape=true,                                                % LaTeX math escape in CFA code $...$
+keepspaces=true,                                                %
+showstringspaces=false,                                 % do not show spaces with cup
+showlines=true,                                                 % show blank lines at end of code
+aboveskip=4pt,                                                  % spacing above/below code block
 belowskip=3pt,
 % replace/adjust listing characters that look bad in sanserif
 …
         {~}{\raisebox{0.3ex}{$\scriptstyle\sim\,$}}1 {`}{\ttfamily\upshape\hspace*{-0.1ex}`}1
         {<-}{$\leftarrow$}2 {=>}{$\Rightarrow$}2 {->}{\makebox[1ex][c]{\raisebox{0.4ex}{\rule{0.8ex}{0.075ex}}}\kern-0.2ex\textgreater}2,
 moredelim=**[is][\color{red}]{®}{®},                                    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
 moredelim=**[is][\color{blue}]{ß}{ß},                                   % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
 moredelim=**[is][\color{OliveGreen}]{¢}{¢},                     % green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
 moredelim=[is][\lstset{keywords={}}]{¶}{¶},                     % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
+moredelim=**[is][\color{red}]{®}{®},    % red highlighting ®...® (registered trademark symbol) emacs: C-q M-.
+moredelim=**[is][\color{blue}]{ß}{ß},   % blue highlighting ß...ß (sharp s symbol) emacs: C-q M-_
+moredelim=**[is][\color{OliveGreen}]{¢}{¢}, % green highlighting ¢...¢ (cent symbol) emacs: C-q M-"
+moredelim=[is][\lstset{keywords={}}]{¶}{¶}, % keyword escape ¶...¶ (pilcrow symbol) emacs: C-q M-^
 }% lstset
 }% CFADefaults
 …
 \CFADefaults
 % inline code ©...© (copyright symbol) emacs: C-q M-)
 \lstMakeShortInline©                                                                    % single-character for \lstinline
+\lstMakeShortInline©                                    % single-character for \lstinline
 }% CFAStyle

doc/LaTeXmacros/lstlang.sty

-              rf9feab8
+              r90152a4
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Wed Aug 30 22:11:14 2017
 %% Update Count     : 14
+%% Last Modified On : Fri Apr  6 23:44:50 2018
+%% Update Count     : 20
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \lstdefinelanguage{sml} {
         morekeywords= {
+                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before, bool,
+                case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor, handle,
+                if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op, open,
+                option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature, string, struct,
+                structure, substring, then, true, type, unit, val, vector, where, while, with, withtype, word
+        },
+        morestring=[b]",
+        morecomment=[s]{(*}{*)},
+                EQUAL, GREATER, LESS, NONE, SOME, abstraction, abstype, and, andalso, array, as, before,
+                bool, case, char, datatype, do, else, end, eqtype, exception, exn, false, fn, fun, functor,
+                handle, if, in, include, infix, infixr, int, let, list, local, nil, nonfix, not, o, of, op,
+                open, option, orelse, overload, print, raise, real, rec, ref, sharing, sig, signature,
+                string, struct, structure, substring, then, true, type, unit, val, vector, where, while,
+                with, withtype, word
+    },
+    morestring=[b]",
+    morecomment=[s]{(*}{*)},
+}
 …
 \lstdefinelanguage{rust}{
+        % Keywords
         morekeywords=[1]{
                 abstract, alignof, as, become, box, break, const, continue, crate, do, else, enum, extern,
         false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
         override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
         trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
+                false, final, fn, for, if, impl, in, let, loop, macro, match, mod, move, mut, offsetof,
+                override, priv, proc, pub, pure, ref, return, Self, self, sizeof, static, struct, super,
+                trait, true, type, typeof, unsafe, unsized, use, virtual, where, while, yield
         },
+        % Strings
         morestring=[b]{"},
+        % Comments
         comment=[l]{//},
         morecomment=[s]{/*}{*/},
+        % Options
         sensitive=true
+}
 \lstdefinelanguage{Pseudo}{
+\lstdefinelanguage{pseudo}{
         morekeywords={string,uint,int,bool,float},
         sensitive=true,
 …
 \lstdefinelanguage{CFA}[ANSI]{C}{
         morekeywords={
                 _Alignas, _Alignof, __alignof, __alignof__, asm, __asm, __asm__, _At, __attribute,
                 __attribute__, auto, _Bool, catch, catchResume, choose, _Complex, __complex, __complex__,
                 __const, __const__, disable, dtype, enable, __extension__, fallthrough, fallthru,
                 finally, forall, ftype, _Generic, _Imaginary, inline, __label__, lvalue, _Noreturn, one_t,
                 otype, restrict, _Static_assert, throw, throwResume, trait, try, ttype, typeof, __typeof,
                 __typeof__, virtual, with, zero_t},
         morekeywords=[2]{
                 _Atomic, coroutine, is_coroutine, is_monitor, is_thread, monitor, mutex, nomutex, or,
                 resume, suspend, thread, _Thread_local, waitfor, when, yield},
+                _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,
+                __float80, float80, __float128, float128, forall, ftype, _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}%
+}

doc/proposals/ctordtor/Makefile

-              rf9feab8
+              r90152a4
 ## 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

-              rf9feab8
+              r90152a4
-% 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/tuples/Makefile

-              rf9feab8
+              r90152a4
 ## 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

-              rf9feab8
+              r90152a4
-% 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{
 …
 \addcontentsline{toc}{section}{\refname}
 \bibliographystyle{plain}
 \bibliography{cfa}
+\bibliography{pl}
 %\addcontentsline{toc}{section}{\indexname} % add index name to table of contents

doc/proposals/user_conversions.md

-              rf9feab8
+              r90152a4
 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/.gitignore

-              rf9feab8
+              r90152a4
 # generated by latex
+*.aux
+*.bbl
+*.blg
+*.brf
+*.dvi
+*.idx
+*.ilg
+*.ind
+*.log
+*.out
+build/*
 *.pdf
 *.ps
-*.toc

doc/refrat/Makefile

-              rf9feab8
+              r90152a4
 ## Define the appropriate configuration variables.
+## Define the configuration variables.
+TeXLIB = .:../LaTeXmacros:../LaTeXmacros/listings:../LaTeXmacros/enumitem:../bibliography/:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
+Build = build
+Figures = figures
+Macros = ../LaTeXmacros
+TeXLIB = .:${Macros}:${Build}:../bibliography:
+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 = refrat.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 \
                 ../LaTeXmacros/common.tex ../LaTeXmacros/lstlang.sty ../LaTeXmacros/indexstyle ../bibliography/cfa.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 ${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 ../LaTeXmacros/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
 …
 predefined :
         sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
+        sed -f predefined.sed ${BASE}.tex > ${basename $@}.cf
 ## 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/refrat/keywords.tex

-              rf9feab8
+              r90152a4
 %% Created On       : Sun Aug  6 08:17:27 2017
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Wed Aug 30 22:10:10 2017
 %% Update Count     : 5
+%% Last Modified On : Fri Apr  6 15:16:11 2018
+%% Update Count     : 7
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \begin{tabular}{@{}llllll@{}}
 \begin{tabular}{@{}l@{}}
-©_At©                   \\
 ©catch©                 \\
 ©catchResume©   \\
 ©choose©                \\
 ©coroutine©             \\
+©disable©               \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©disable©               \\
 ©dtype©                 \\
 ©enable©                \\
+©exception©             \\
 ©fallthrough©   \\
 ©fallthru©              \\
 …
 ©forall©                \\
 ©ftype©                 \\
-©lvalue©                \\
 ©monitor©               \\
+©mutex©                 \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©mutex©                 \\
 ©one_t©                 \\
 ©otype©                 \\
 ©throw©                 \\
 ©throwResume©   \\
+©trait©                 \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©trait©                 \\
 ©try©                   \\
 ©ttype©                 \\
 ©virtual©               \\
 ©waitfor©               \\
+©when©                  \\
 \end{tabular}
+&
 \begin{tabular}{@{}l@{}}
-©when©                  \\
 ©with©                  \\
 ©zero_t©                \\
+                                \\
                                 \\
                                 \\

doc/refrat/refrat.tex

-              rf9feab8
+              r90152a4
 %% Created On       : Wed Apr  6 14:52:25 2016
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Tue Aug 15 18:46:31 2017
 %% Update Count     : 106
+%% Last Modified On : Wed Jan 31 17:30:23 2018
+%% Update Count     : 108
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 The manual deliberately imitates the ordering of the \Celeven standard (although the section numbering differs).
 Unfortunately, this means the manual contains more ``forward references'' than usual, making it harder to follow if the reader does not have a copy of the \Celeven standard.
+For a simple introduction to \CFA, see the companion document ``An Overview of \CFA''
+\cite{Ditchfield96:Overview}.
+For a simple introduction to \CFA, see~\cite{Cforall}.
 \begin{rationale}
 …
 \begin{rationale}
 Since each subsection describes the interpretations of an expression in terms of the interpretations of its subexpressions, this chapter can be taken as describing an overload resolution algorithm that uses one bottom-up pass over an expression tree.
 Such an algorithm was first described (for Ada) by Baker~\cite{Bak:overload}.
+Such an algorithm was first described (for Ada) by Baker~\cite{Baker82}.
 It is extended here to handle polymorphic functions and arithmetic conversions.
 The overload resolution rules and the predefined functions have been chosen so that, in programs that do not introduce overloaded declarations, expressions will have the same meaning in C and in \CFA.
 …
 \bibliographystyle{plain}
 \bibliography{cfa}
+\bibliography{pl}

doc/user/.gitignore

-              rf9feab8
+              r90152a4
 # generated by latex
+*.aux
+*.bbl
+*.blg
+*.brf
+*.dvi
+*.idx
+*.ilg
+*.ind
+*.log
+*.out
+build/*
 *.pdf
 *.ps
-*.toc

doc/user/Makefile

-              rf9feab8
+              r90152a4
 ## Define the appropriate configuration variables.
+## Define the configuration variables.
+TeXLIB = .:../LaTeXmacros:../bibliography/:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
+Build = build
+Figures = figures
+Macros = ../LaTeXmacros
+TeXLIB = .:${Macros}:${Build}:../bibliography:
+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 = user.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
+build/version: ../../configure | ${Build}
+        ../../configure --version | grep "cfa-cc configure" | grep -oEe "([0-9]+\.)+[0-9]+" > $@
+${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 \
                 ../LaTeXmacros/common.tex ../LaTeXmacros/lstlang.sty ../LaTeXmacros/indexstyle ../bibliography/cfa.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 ${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 ../LaTeXmacros/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
         ${LaTeX} ${basename $@}.tex
-predefined :
-        sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
 ## 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/user/user.tex

-              rf9feab8
+              r90152a4
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -*- 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 : Mon Nov 27 18:09:59 2017
 %% Update Count     : 3143
+%% Last Modified On : Thu Jul 26 17:29:05 2018
+%% Update Count     : 3366
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 …
 \usepackage[dvips,plainpages=false,pdfpagelabels,pdfpagemode=UseNone,colorlinks=true,pagebackref=true,linkcolor=blue,citecolor=blue,urlcolor=blue,pagebackref=true,breaklinks=true]{hyperref}
 \usepackage{breakurl}
-\renewcommand{\UrlFont}{\small\sf}
 \usepackage[pagewise]{lineno}
 …
 % 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{quote2}
+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}}      \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\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}).
 …
 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 5 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.
 …
 \begin{comment}
 A simple example is leveraging the existing type-unsafe (©void *©) C ©bsearch© to binary search a sorted floating-point array:
+A simple example is leveraging the existing type-unsafe (©void *©) C ©bsearch© to binary search a sorted floating array:
 \begin{lstlisting}
 void * bsearch( const void * key, const void * base, size_t dim, size_t size,
 …
                                 *(double *)t2 < *(double *)t1 ? 1 : 0; }
 double key = 5.0, vals[10] = { /* 10 sorted floating-point values */ };
 double * val = (double *)bsearch( &key, vals, 10, sizeof(vals[0]), comp );      $\C{// search sorted array}$
+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}§
 \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}.
+\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 point constant}§
 ®_®e®_®+1®_®00;                                               §\C{// floating point constant}§
 x®_®ff®_®ff®_®p®_®3;                                   §\C{// hexadecimal floating point}§
 x®_®1.ffff®_®ffff®_®p®_®128®_®l;               §\C{// hexadecimal floating point long 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}
 …
+\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}
+\section{\texorpdfstring{Labelled \LstKeywordStyle{continue} / \LstKeywordStyle{break}}{Labelled continue / break}}
+\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 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 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{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}}
+\subsection{\texorpdfstring{\LstKeywordStyle{if} Statement}{if Statement}}
+The ©if© expression allows declarations, similar to ©for© declaration expression:
+\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}§
+\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.
+%\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}
+%\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@\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.
 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@\lstinline@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{\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{quote2}
+\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{quote2}
+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 3: ...
+        ...
+        ®int z = 0;®                            §\C{// unreachable initialization, cannot appear after case}§
+        z = 2;
+  case 3:
+        ®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}§
+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}§
+        int i;
+        double d;
+};
+S s, as[10];
+\end{cfa}
+However, functions manipulating aggregates must repeat the aggregate name to access its containing fields:
+\begin{cfa}
+void f( S s ) {
+        ®s.®c; ®s.®i; ®s.®d;                                    §\C{// access containing fields}§
+}
+\end{cfa}
+which extends to multiple levels of qualification for nested aggregates.
+A similar situation occurs in object-oriented programming, \eg \CC:
+\begin{C++}
+struct S {
+        char c;                                                                 §\C{// fields}§
+        int i;
+        double d;
+        void f() {                                                              §\C{// implicit ``this'' aggregate}§
+                ®this->®c; ®this->®i; ®this->®d;        §\C{// access containing fields}§
+        }
+  ...
+}
+\end{cfa}
+\end{enumerate}
+\section{\texorpdfstring{\LstKeywordStyle{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{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
+\begin{cfa}
+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{quote2}
+In addition, two forms of subranges are allowed to specify case values: a new \CFA form and an existing GNU C form.\footnote{
+The GNU C form \emph{requires} spaces around the ellipse.}
+\begin{quote2}
+\begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
+\multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{GNU C}}     \\
+\begin{cfa}
+switch ( i ) {
+  case ®1~5:®
+        ...
+  case ®10~15:®
+        ...
+}
+\end{cfa}
+&
+\begin{cfa}
+switch ( i )
+  case ®1 ... 5®:
+        ...
+  case ®10 ... 15®:
+        ...
+}
+\end{cfa}
+&
+\begin{cfa}
+// 1, 2, 3, 4, 5
+// 10, 11, 12, 13, 14, 15
+\end{cfa}
+\end{tabular}
+\end{quote2}
+Lists of subranges are also allowed.
+\begin{cfa}
+case ®1~5, 12~21, 35~42®:
+\end{cfa}
+\section{\texorpdfstring{\LstKeywordStyle{with} Clause / Statement}{with Clause / Statement}}
+\label{s:WithClauseStatement}
+}
+\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.
+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.
+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}§
+}
+\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:
+\begin{cfa}
+§\emph{with-statement}§:
+        'with' '(' §\emph{expression-list}§ ')' §\emph{compound-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.
+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.
+This semantic is different from Pascal, which nests the openings from left to right.
+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;
+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©.
+\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©.
+To solve this problem, parameters are treated like an initialized aggregate:
+\begin{cfa}
+struct Params {
+        S & s;
+        int i;
+} params;
+\end{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:
+% \begin{cfa}
+% struct S { int i, j; } sv;
+% with ( sv ) {                                                         §\C{// implicit reference}§
+%       S & sr = sv;
+%       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}§
+%               }
+%               i = 2; j = 3;                                           §\C{\color{red}// sr.i, sr.j}§
+%       }
+%       i = 1; j = 2;                                                   §\C{\color{red}// sv.i, sv.j}§
+% }
+% \end{cfa}
 In \Index{object-oriented} programming, there is an implicit first parameter, often names \textbf{©self©} or \textbf{©this©}, which is elided.
 …
 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}§
+        }
+}
 \end{C++}
 Since CFA is non-object-oriented, the equivalent object-oriented program looks like:
+Since \CFA is non-object-oriented, the equivalent object-oriented program looks like:
 \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;
+}
 \end{cfa}
 but it is cumbersome having to write "©this.©" many times in a member.
+but it is cumbersome having to write ``©this.©'' many times in a member.
 \CFA provides a ©with© clause/statement (see Pascal~\cite[\S~4.F]{Pascal}) to elided the "©this.©" by opening a scope containing field identifiers, changing the qualified fields into variables and giving an opportunity for optimizing qualified references.
 \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}§
+int mem( S & this ) ®with( this )® {            §\C{// with clause}§
+        i = 1;                                                                  §\C{\color{red}// this.i}§
+        j = 2;                                                                  §\C{\color{red}// this.j}§
+}
 \end{cfa}
 …
 \begin{cfa}
 struct T { double m, n; };
 int mem2( S &this1, T &this2 ) ®with this1, this2® {
+int mem2( S & this1, T & this2 ) ®with( this1, this2 )® {
         i = 1; j = 2;
         m = 1.0; n = 2.0;
 …
         struct S1 { ... } s1;
         struct S2 { ... } s2;
         ®with s1® {                     // with statement
+        ®with( s1 )® {                                                  §\C{// with statement}§
                 // access fields of s1 without qualification
                 ®with s2® {  // nesting
+                ®with s2® {                                                     §\C{// nesting}§
                         // access fields of s1 and s2 without qualification
+                }
 …
 struct S { int i; int j; double m; } a, c;
 struct T { int i; int k; int m } b, c;
+®with a, b® {
+        j + k;                                          §\C{// unambiguous, unique names define unique types}§
+        i;                                                      §\C{// ambiguous, same name and type}§
+        a.i + b.i;                                      §\C{// unambiguous, qualification defines unique names}§
+        m;                                                      §\C{// ambiguous, same name and no context to define unique type}§
+        m = 5.0;                                        §\C{// unambiguous, same name and context defines unique type}§
+        m = 1;                                          §\C{// unambiguous, same name and context defines unique type}§
+}
+®with c® { ... }                                §\C{// ambiguous, same name and no context}§
+®with (S)c® { ... }                             §\C{// unambiguous, same name and cast defines unique type}§
+\end{cfa}
+with( a, b )
+{
+}
+\end{cfa}
+\begin{comment}
 The components in the "with" clause
 …
 the "with" to be implemented because I hate having to type all those object
 names for fields. It's a great way to drive people away from the language.
+\end{comment}
 …
 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 {
 …
 \section{Declarations}
 \label{s:Declarations}
+\section{Alternative Declarations}
+\label{s:AlternativeDeclarations}
 C declaration syntax is notoriously confusing and error prone.
 For example, many C programmers are confused by a declaration as simple as:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}ll@{}}
 \begin{cfa}
 …
 \raisebox{-0.75\totalheight}{\input{Cdecl}}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 Is this an array of 5 pointers to integers or a \Index{pointer} to an array of 5 integers?
 The fact this declaration is unclear to many C programmers means there are \Index{productivity} and \Index{safety} issues even for basic programs.
+If there is any doubt, it implies \Index{productivity} and \Index{safety} issues even for basic programs.
 Another example of confusion results from the fact that a routine name and its parameters are embedded within the return type, mimicking the way the return value is used at the routine's call site.
 For example, a routine returning a \Index{pointer} to an array of integers is defined and used in the following way:
 \begin{cfa}
 int ®(*®f®())[®5®]® {...};                              §\C{definition}§
  ... ®(*®f®())[®3®]® += 1;                              §\C{usage}§
+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}).
 …
 In the following example, \R{red} is the base type and \B{blue} is qualifiers.
 The \CFA declarations move the qualifiers to the left of the base type, \ie move the blue to the left of the red, while the qualifiers have the same meaning but are ordered left to right to specify a variable's type.
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 The only exception is \Index{bit field} specification, which always appear to the right of the base type.
 % Specifically, the character ©*© is used to indicate a pointer, square brackets ©[©\,©]© are used to represent an array or function return value, and parentheses ©()© are used to indicate a routine parameter.
 However, unlike C, \CFA type declaration tokens are distributed across all variables in the declaration list.
 For instance, variables ©x© and ©y© of type \Index{pointer} to integer are defined in \CFA as follows:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 The downside of this semantics is the need to separate regular and \Index{pointer} declarations:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 which is \Index{prescribing} a safety benefit.
 Other examples are:
 \begin{quote2}
+\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}} \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 All type qualifiers, \eg ©const©, ©volatile©, etc., are used in the normal way with the new declarations and also appear left to right, \eg:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{1em}}l@{\hspace{1em}}l@{}}
 \multicolumn{1}{c@{\hspace{1em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{1em}}}{\textbf{C}} \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 All declaration qualifiers, \eg ©extern©, ©static©, etc., are used in the normal way with the new declarations but can only appear at the start of a \CFA routine declaration,\footnote{\label{StorageClassSpecifier}
 The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature.~\cite[\S~6.11.5(1)]{C11}} \eg:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{\hspace{2em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c@{\hspace{2em}}}{\textbf{C}} \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 The new declaration syntax can be used in other contexts where types are required, \eg casts and the pseudo-routine ©sizeof©:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
 \begin{cfa}
 y = (®* int®)x;
 i = sizeof(®[ 5 ] * int®);
+y = (* int)x;
+i = sizeof([ 5 ] * int);
 \end{cfa}
+&
 \begin{cfa}
 y = (®int *®)x;
 i = sizeof(®int * [ 5 ]®);
+y = (int *)x;
+i = sizeof(int * [ 5 ]);
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 Finally, new \CFA declarations may appear together with C declarations in the same program block, but cannot be mixed within a specific declaration.
 Therefore, a programmer has the option of either continuing to use traditional C declarations or take advantage of the new style.
+Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX systems.
+\section{Exponentiation Operator}
+C, \CC, and Java (and many other programming languages) have no exponentiation operator\index{exponentiation!operator}\index{operator!exponentiation}, \ie $x^y$, and instead use a routine, like \Indexc{pow}, to perform the exponentiation operation.
+\CFA extends the basic operators with the exponentiation operator ©?\?©\index{?\\?@\lstinline$?\?$} and ©?\=?©\index{?\\=?@\lstinline$?\=?$}, as in, ©x \ y© and ©x \= y©, which means $x^y$ and $x \leftarrow x^y$.
+The priority of the exponentiation operator is between the cast and multiplicative operators, so that ©w * (int)x \ (int)y * z© is parenthesized as ©((w * (((int)x) \ ((int)y))) * z)©.
+As for \Index{division}, there are exponentiation operators for integral and floating-point types, including the builtin \Index{complex} types.
+Unsigned integral exponentiation\index{exponentiation!unsigned integral} is performed with repeated multiplication\footnote{The multiplication computation is optimized to $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-point 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-point result.
+Floating-point exponentiation\index{exponentiation!floating point} is performed using \Index{logarithm}s\index{exponentiation!logarithm}, so the base cannot be negative.
+\begin{cfa}
+sout | 2 ®\® 8u | 4 ®\® 3u | -4 ®\® 3u | 4 ®\® -3 | -4 ®\® -3 | 4.0 ®\® 2.1 | (1.0f+2.0fi) ®\® (3.0f+2.0fi) | endl;
+64 -64 0.015625 -0.015625 18.3791736799526 0.264715-1.1922i
+\end{cfa}
+Parenthesis are necessary for the complex constants or the expresion is parsed as ©1.0f+(2.0fi \ 3.0f)+2.0fi©.
+The exponentiation operator is available for all the basic types, but for user-defined types, only the integral-computation versions are available.
+For returning an integral value, the user type ©T© must define multiplication, ©*©, and one, ©1©;
+for returning a floating-point value, an additional divide of type ©T© into a ©double© returning a ©double© (©double ?/?( double, T )©) is necessary for negative exponents.
+Clearly, both styles need to be supported for some time due to existing C-style header-files, particularly for UNIX-like systems.
 …
 A program \newterm{object} is a region of data storage in the execution environment, the contents of which can represent values.
 In most cases, objects are located in memory at an address, and the variable name for an object is an implicit address to the object generated by the compiler and automatically dereferenced, as in:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}ll@{\hspace{2em}}l@{}}
 \begin{cfa}
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 where the right example is how the compiler logically interprets the variables in the left example.
 Since a variable name only points to one address during its lifetime, it is an \Index{immutable} \Index{pointer};
 …
 In general, variable addresses are stored in instructions instead of loaded from memory, and hence may not occupy storage.
 These approaches are contrasted in the following:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l|l@{}}
 \multicolumn{1}{c|}{explicit variable address} & \multicolumn{1}{c}{implicit variable address} \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 Finally, the immutable nature of a variable's address and the fact that there is no storage for the variable pointer means pointer assignment\index{pointer!assignment}\index{assignment!pointer} is impossible.
 Therefore, the expression ©x = y© has only one meaning, ©*x = *y©, \ie manipulate values, which is why explicitly writing the dereferences is unnecessary even though it occurs implicitly as part of \Index{instruction decoding}.
 …
 (Similarly, an integer variable can contain multiple integer literals during its lifetime versus an integer constant representing a single literal during its lifetime, and like a variable name, may not occupy storage if the literal is embedded directly into instructions.)
 Hence, a pointer occupies memory to store its current address, and the pointer's value is loaded by dereferencing, \eg:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{2em}}l@{}}
 \begin{cfa}
 …
 \raisebox{-0.5\totalheight}{\input{pointer2.pstex_t}}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 Notice, an address has a \Index{duality}\index{address!duality}: a location in memory or the value at that location.
 …
 \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.
 …
 The position of the ©const© qualifier \emph{after} the pointer/reference qualifier causes confuse for C programmers.
 The ©const© qualifier cannot be moved before the pointer/reference qualifier for C style-declarations;
 \CFA-style declarations (see \VRef{s:Declarations}) attempt to address this issue:
 \begin{quote2}
+\CFA-style declarations (see \VRef{s:AlternativeDeclarations}) attempt to address this issue:
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{C}}        \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 where the \CFA declaration is read left-to-right.
 …
 \begin{cfa}
 void f( int i );
 void (*fp)( int );                                      §\C{// routine pointer}§
+void (* fp)( int );                                     §\C{// routine pointer}§
 fp = f;                                                         §\C{// reference initialization}§
 fp = &f;                                                        §\C{// pointer initialization}§
 …
 \begin{itemize}
 \item
 if ©R© is an \Index{rvalue} of type ©T &$_1$...&$_r$© where $r \ge 1$ references (©&© symbols) than ©&R© has type ©T ®*®&$_{\color{red}2}$...&$_{\color{red}r}$©, \ie ©T© pointer with $r-1$ references (©&© symbols).
 \item
 if ©L© is an \Index{lvalue} of type ©T &$_1$...&$_l$© where $l \ge 0$ references (©&© symbols) then ©&L© has type ©T ®*®&$_{\color{red}1}$...&$_{\color{red}l}$©, \ie ©T© pointer with $l$ references (©&© symbols).
+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:
 …
 \item
 lvalue to reference conversion: \lstinline[deletekeywords=lvalue]$lvalue-type cv1 T$ converts to ©cv2 T &©, which allows implicitly converting variables to references.
+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 &)
 …
 \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).
 Like C, it is possible to declare multiple routine-prototypes in a single declaration, where the return type is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:Declarations}), \eg:
+Like C, it is possible to declare multiple routine-prototypes in a single declaration, where the return type is distributed across \emph{all} routine names in the declaration list (see~\VRef{s:AlternativeDeclarations}), \eg:
 \begin{cfa}
 C :             const double bar1(), bar2( int ), bar3( double );
 …
 Default arguments and overloading (see Section 24) are complementary.
 While in theory default arguments can be simulated with overloading, as in:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{default arguments}}   & \multicolumn{1}{c}{\textbf{overloading}}      \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 the number of required overloaded routines is linear in the number of default values, which is unacceptable growth.
 In general, overloading should only be used over default arguments if the body of the routine is significantly different.
 …
         struct T t;
 } s;
 …
 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 ) {
 …
+}
 int main() {
         * [int]( int ) fp = foo();      §\C{// int (*fp)( int )}§
+        * [int]( int ) fp = foo();      §\C{// int (* fp)( int )}§
         sout | fp( 3 ) | endl;
+}
 \end{cfa}
 because
+because
 Currently, there are no \Index{lambda} expressions, \ie unnamed routines because routine names are very important to properly select the correct routine.
 …
 In the latter approach, additional return values are passed as pointer parameters.
 A pointer parameter is assigned inside the routine to emulate a return.
 For example, consider C's \Indexc{modf} function, which returns the integral and fractional part of a floating-point value.
+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}§
 …
 The common case is printing out a sequence of variables separated by whitespace.
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}l@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CFA}}        & \multicolumn{1}{c}{\textbf{\CC}}      \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\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]@, @''.
 …
 Finally, \CFA uses the logical-or operator for I/O as it is the lowest-priority overloadable operator, other than assignment.
 Therefore, fewer output expressions require parenthesis.
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}ll@{}}
 \textbf{\CFA:}
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\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.
 …
         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
 …
         int id;
         float size;
         Parts *optionalParts;
+        Parts * optionalParts;
 };
 …
 Auto type-inferencing occurs in a declaration where a variable's type is inferred from its initialization ex\-pression type.
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{3em}}ll@{}}
 \multicolumn{1}{c@{\hspace{3em}}}{\textbf{\CC}} & \multicolumn{1}{c}{\textbf{\Indexc{gcc}}} \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 The two important capabilities are:
 \begin{itemize}
 …
 generic(type T)
 typedef int (*predicate)(T);
+typedef int (* predicate)(T);
 generic(type Captured, type T)
 typedef void (*callback)(Captured, T);
+typedef void (* callback)(Captured, T);
 generic(type T)
 void find(int length, T *array,
+void find(int length, T * array,
         predicate(T) p, callback(void *, T)f) {
         int i;
 …
 struct LinkedListElem {
         T elem;
         LinkedListElem(T) *next;
+        LinkedListElem(T) * next;
 };
 LinkedListElem *++?(LinkedListElem **elem) {
         return *elem = elem->next;
+LinkedListElem *++?(LinkedListElem ** elem) {
+        return * elem = elem->next;
+}
 generic (type T)
 struct LinkedList {
         LinkedListElem(T) *head;
+        LinkedListElem(T) * head;
         unsigned int size;
+}
 generic (type T | bool ?==?(T, T))
 bool contains(LinkedList(T) *list, T elem) {
         for(LinkedListElem *iter = list->head; iter != 0; ++iter) {
+bool contains(LinkedList(T) * list, T elem) {
+        for(LinkedListElem * iter = list->head; iter != 0; ++iter) {
         if (iter->elem == elem) return true;
+        }
 …
 // transferring requires mutual exclusion and calls deleteJob
 void transferJob(mutex Worker &from, Worker &to) {
+void transferJob(mutex Worker & from, Worker & to) {
         ...
         deleteJob(j);
 …
 #include <unistd.h>
+}
 size_t fileSize( const char *path ) {
+size_t fileSize( const char * path ) {
         struct stat s;
         stat(path, &s);
 …
 #[link(name = "libc")]
 extern {
         fn stat(path: *const u8,
         buf: *mut stat_t) -> c_int;
+}
 fn fileSize(path: *const u8) -> size_t
+        fn stat(path: * const u8,
+        buf: * mut stat_t) -> c_int;
+}
+fn fileSize(path: * const u8) -> size_t
+{
         unsafe {
 …
 generic(type T, type N |
         { int ?<?(N, N); })
 T *maximize(N (*f)(const T&),
+T * maximize(N (*f)(const T&),
         int n, T *a) {
         T *bestX = NULL;
+        T * bestX = NULL;
         N bestN;
         for (int i = 0; i < n; i++) {
 …
+}
 string *longest(int n, string *p)
+string * longest(int n, string *p)
+{
         return maximize(length, n, p);
 …
 \begin{cfa}
 template<typename T, typename F>
 T *maximize(const F &f,
+T * maximize(const F &f,
         int n, T *a) {
         typedef decltype(f(a[0])) N;
         T *bestX = NULL;
+        T * bestX = NULL;
         N bestN;
         for (int i = 0; i < n; i++) {
 …
+}
 string *longest(int n, string *p) {
+string * longest(int n, string *p) {
         return maximize(
         [](const string &s) {
 …
 \begin{cfa}
 task Nonzero {
         int *data;
+        int * data;
         int start;
         int end;
 …
 \CFA introduces the following new keywords.
 \begin{quote2}
+\begin{cquote}
 \input{../refrat/keywords}
 \end{quote2}
+\end{cquote}
 …
 \Celeven prescribes the following standard header-files~\cite[\S~7.1.2]{C11} and \CFA adds to this list:
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}llllll|l@{}}
 \multicolumn{6}{c|}{C11} & \multicolumn{1}{c}{\CFA}             \\
 …
 \end{tabular}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 For the prescribed head-files, \CFA uses header interposition to wraps these includes in an ©extern "C"©;
 hence, names in these include files are not mangled\index{mangling!name} (see~\VRef{s:Interoperability}).
 …
 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
 …
 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}
 …
 double scalbln( double, long int );
 long double scalbln( long double, long int );
+\end{cfa}
+\section{Time Keeping}
+\label{s:TimeKeeping}
+%\subsection{\texorpdfstring{\protect\lstinline@Duration@}{Duration}}
+\subsection{\texorpdfstring{\LstBasicStyle{Duration}}{Duration}}
+\label{s:Duration}
+\leavevmode
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+struct Duration {
+        int64_t tv;                                                     §\C{// nanoseconds}§
+};
+void ?{}( Duration & dur );
+void ?{}( Duration & dur, zero_t );
+Duration ?=?( Duration & dur, zero_t );
+Duration +?( Duration rhs );
+Duration ?+?( Duration & lhs, Duration rhs );
+Duration ?+=?( Duration & lhs, Duration rhs );
+Duration -?( Duration rhs );
+Duration ?-?( Duration & lhs, Duration rhs );
+Duration ?-=?( Duration & lhs, Duration rhs );
+Duration ?*?( Duration lhs, int64_t rhs );
+Duration ?*?( int64_t lhs, Duration rhs );
+Duration ?*=?( Duration & lhs, int64_t rhs );
+int64_t ?/?( Duration lhs, Duration rhs );
+Duration ?/?( Duration lhs, int64_t rhs );
+Duration ?/=?( Duration & lhs, int64_t rhs );
+double div( Duration lhs, Duration rhs );
+Duration ?%?( Duration lhs, Duration rhs );
+Duration ?%=?( Duration & lhs, Duration rhs );
+_Bool ?==?( Duration lhs, Duration rhs );
+_Bool ?!=?( Duration lhs, Duration rhs );
+_Bool ?<? ( Duration lhs, Duration rhs );
+_Bool ?<=?( Duration lhs, Duration rhs );
+_Bool ?>? ( Duration lhs, Duration rhs );
+_Bool ?>=?( Duration lhs, Duration rhs );
+_Bool ?==?( Duration lhs, zero_t );
+_Bool ?!=?( Duration lhs, zero_t );
+_Bool ?<? ( Duration lhs, zero_t );
+_Bool ?<=?( Duration lhs, zero_t );
+_Bool ?>? ( Duration lhs, zero_t );
+_Bool ?>=?( Duration lhs, zero_t );
+Duration abs( Duration rhs );
+Duration ?`ns( int64_t nsec );
+Duration ?`us( int64_t usec );
+Duration ?`ms( int64_t msec );
+Duration ?`s( int64_t sec );
+Duration ?`s( double sec );
+Duration ?`m( int64_t min );
+Duration ?`m( double min );
+Duration ?`h( int64_t hours );
+Duration ?`h( double hours );
+Duration ?`d( int64_t days );
+Duration ?`d( double days );
+Duration ?`w( int64_t weeks );
+Duration ?`w( double weeks );
+int64_t ?`ns( Duration dur );
+int64_t ?`us( Duration dur );
+int64_t ?`ms( Duration dur );
+int64_t ?`s( Duration dur );
+int64_t ?`m( Duration dur );
+int64_t ?`h( Duration dur );
+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{\LstBasicStyle{timeval}}{timeval}}
+\label{s:timeval}
+\leavevmode
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+void ?{}( timeval & t );
+void ?{}( timeval & t, time_t sec, suseconds_t usec );
+void ?{}( timeval & t, time_t sec );
+void ?{}( timeval & t, zero_t );
+void ?{}( timeval & t, Time time );
+timeval ?=?( timeval & t, zero_t );
+timeval ?+?( timeval & lhs, timeval rhs );
+timeval ?-?( timeval & lhs, timeval rhs );
+_Bool ?==?( timeval lhs, timeval rhs );
+_Bool ?!=?( timeval lhs, timeval rhs );
+\end{cfa}
+%\subsection{\texorpdfstring{\protect\lstinline@timespec@}{timespec}}
+\subsection{\texorpdfstring{\LstBasicStyle{timespec}}{timespec}}
+\label{s:timespec}
+\leavevmode
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+void ?{}( timespec & t );
+void ?{}( timespec & t, time_t sec, __syscall_slong_t nsec );
+void ?{}( timespec & t, time_t sec );
+void ?{}( timespec & t, zero_t );
+void ?{}( timespec & t, Time time );
+timespec ?=?( timespec & t, zero_t );
+timespec ?+?( timespec & lhs, timespec rhs );
+timespec ?-?( timespec & lhs, timespec rhs );
+_Bool ?==?( timespec lhs, timespec rhs );
+_Bool ?!=?( timespec lhs, timespec rhs );
+\end{cfa}
+%\subsection{\texorpdfstring{\protect\lstinline@itimerval@}{itimerval}}
+\subsection{\texorpdfstring{\LstBasicStyle{itimerval}}{itimerval}}
+\label{s:itimerval}
+\leavevmode
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+void ?{}( itimerval & itv, Duration alarm );
+void ?{}( itimerval & itv, Duration alarm, Duration interval );
+\end{cfa}
+%\subsection{\texorpdfstring{\protect\lstinline@Time@}{Time}}
+\subsection{\texorpdfstring{\LstBasicStyle{Time}}{Time}}
+\label{s:Time}
+\leavevmode
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+struct Time {
+        uint64_t tv;                                            §\C{// nanoseconds since UNIX epoch}§
+};
+void ?{}( Time & time );
+void ?{}( Time & time, zero_t );
+Time ?=?( Time & time, zero_t );
+void ?{}( Time & time, timeval t );
+Time ?=?( Time & time, timeval t );
+void ?{}( Time & time, timespec t );
+Time ?=?( Time & time, timespec t );
+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 );
+char * ?`ymd( Time time, char * buf ) { // short form
+        return yy_mm_dd( time, buf );
+} // ymd
+char * mm_dd_yy( Time time, char * buf );
+char * ?`mdy( Time time, char * buf ) { // short form
+        return mm_dd_yy( time, buf );
+} // mdy
+char * dd_mm_yy( Time time, char * buf );
+char * ?`dmy( Time time, char * buf ) { // short form
+        return dd_mm_yy( time, buf );;
+} // dmy
+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}
+\section{Clock}
+\subsection{C time}
+\label{s:Ctime}
+\leavevmode
+\begin{cfa}[aboveskip=0pt,belowskip=0pt]
+char * ctime( time_t tp );
+char * ctime_r( time_t tp, char * buf );
+tm * gmtime( time_t tp );
+tm * gmtime_r( time_t tp, tm * result );
+tm * localtime( time_t tp );
+tm * localtime_r( time_t tp, tm * result );
+\end{cfa}
+%\subsection{\texorpdfstring{\protect\lstinline@Clock@}{Clock}}
+\subsection{\texorpdfstring{\LstBasicStyle{Clock}}{Clock}}
+\label{s:Clock}
+\leavevmode
+\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}§
+};
+void resetClock( Clock & clk );
+void resetClock( Clock & clk, Duration adj );
+void ?{}( Clock & clk );
+void ?{}( Clock & clk, Duration adj );
+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 );
+timeval getTime( Clock & clk );
+tm getTime( Clock & clk );
 \end{cfa}
 …
 The following factorial programs contrast using GMP with the \CFA and C interfaces, where the output from these programs appears in \VRef[Figure]{f:MultiPrecisionFactorials}.
 (Compile with flag \Indexc{-lgmp} to link with the GMP library.)
 \begin{quote2}
+\begin{cquote}
 \begin{tabular}{@{}l@{\hspace{\parindentlnth}}|@{\hspace{\parindentlnth}}l@{}}
 \multicolumn{1}{c|@{\hspace{\parindentlnth}}}{\textbf{\CFA}}    & \multicolumn{1}{@{\hspace{\parindentlnth}}c}{\textbf{C}}      \\
 …
 \end{cfa}
 \end{tabular}
 \end{quote2}
+\end{cquote}
 \begin{figure}
 …
 \end{cfa}
 \bibliographystyle{plain}
 \bibliography{cfa}
+\bibliography{pl}

src/CodeGen/CodeGenerator.cc

-              rf9feab8
+              r90152a4
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Sep  3 20:42:52 2017
 // Update Count     : 490
+// Last Modified On : Sat May  5 09:08:32 2018
+// Update Count     : 494
 //
 #include "CodeGenerator.h"
 …
 #include <list>                      // for _List_iterator, list, list<>::it...
-#include "Common/SemanticError.h"    // for SemanticError
 #include "Common/UniqueName.h"       // for UniqueName
 #include "Common/utility.h"          // for CodeLocation, toString
 …
+        }
         CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( CodeGenerator::tabsize ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ), endl( *this ) {}
+        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 ) {}
         string CodeGenerator::mangleName( DeclarationWithType * decl ) {
+                if ( pretty ) return decl->get_name();
+                if ( decl->get_mangleName() != "" ) {
+                // GCC builtins should always be printed unmangled
+                if ( pretty || decl->linkage.is_gcc_builtin ) return decl->name;
+                if ( decl->mangleName != "" ) {
                         // need to incorporate scope level in order to differentiate names for destructors
                         return decl->get_scopedMangleName();
                 } else {
                         return decl->get_name();
+                        return decl->name;
                 } // if
+        }
 …
                 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
 …
+        }
+        // *** Expression
+        void CodeGenerator::previsit( Expression * node ) {
+                previsit( (BaseSyntaxNode *)node );
+                GuardAction( [this, node](){
+                        if ( printExprTypes && node->result ) {
+                                output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
+                        }
+                } );
+        }
         // *** Declarations
         void CodeGenerator::postvisit( FunctionDecl * functionDecl ) {
+                // deleted decls should never be used, so don't print them
+                if ( functionDecl->isDeleted && genC ) return;
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
 …
                         functionDecl->get_statements()->accept( *visitor );
                 } // if
+                if ( functionDecl->isDeleted ) {
+                        output << " = void";
+                }
+        }
         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 ) {
                         // only generate an anonymous name when generating C code, otherwise it clutters the output too much
 …
                         objectDecl->get_init()->accept( *visitor );
                 } // if
+                if ( objectDecl->isDeleted ) {
+                        output << " = void";
+                }
                 if ( objectDecl->get_bitfieldWidth() ) {
 …
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
+                genAttributes( aggDecl->get_attributes() );
+                if( ! aggDecl->get_parameters().empty() && ! genC ) {
+                if( ! aggDecl->parameters.empty() && ! 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 << aggDecl->get_name();
+                output << kind;
+                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;
 …
                         output << " }";
+                }
+        }
+        void CodeGenerator::postvisit( StaticAssertDecl * assertDecl ) {
+                output << "_Static_assert(";
+                assertDecl->condition->accept( *visitor );
+                output << ", ";
+                assertDecl->message->accept( *visitor );
+                output << ")";
+        }
 …
         void CodeGenerator::postvisit( Constant * constant ) {
                 output << constant->get_value() ;
+                output << constant->get_value();
+        }
 …
                 output << "(";
                 if ( castExpr->get_result()->isVoid() ) {
                         output << "(void)" ;
+                        output << "(void)";
                 } else {
                         // at least one result type of cast.
 …
                         output << ")";
                 } // if
+                castExpr->get_arg()->accept( *visitor );
+                castExpr->arg->accept( *visitor );
+                output << ")";
+        }
+        void CodeGenerator::postvisit( KeywordCastExpr * castExpr ) {
+                assertf( ! genC, "KeywordCast should not reach code generation." );
+                extension( castExpr );
+                output << "((" << castExpr->targetString() << " &)";
+                castExpr->arg->accept( *visitor );
                 output << ")";
+        }
 …
         void CodeGenerator::postvisit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                std::list< Statement * > & stmts = stmtExpr->statements->kids;
                 output << "({" << endl;
                 ++indent;
 …
                                 // cannot cast to void, otherwise the expression statement has no value
                                 if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
                                         exprStmt->get_expr()->accept( *visitor );
+                                        exprStmt->expr->accept( *visitor );
                                         output << ";" << endl;
                                         ++i;
 …
                 expr->callExpr->accept( *visitor );
+        }
+        void CodeGenerator::postvisit( DeletedExpr * expr ) {
+                assertf( ! genC, "Deleted expressions should not reach code generation." );
+                expr->expr->accept( *visitor );
+        }
+        void CodeGenerator::postvisit( DefaultArgExpr * arg ) {
+                assertf( ! 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." );
+                output << "_Generic(";
+                expr->control->accept( *visitor );
+                output << ", ";
+                unsigned int numAssocs = expr->associations.size();
+                unsigned int i = 0;
+                for ( GenericExpr::Association & assoc : expr->associations ) {
+                        if (assoc.isDefault) {
+                                output << "default: ";
+                        } else {
+                                output << genType( assoc.type, "", pretty, genC ) << ": ";
+                        }
+                        assoc.expr->accept( *visitor );
+                        if ( i+1 != numAssocs ) {
+                                output << ", ";
+                        }
+                        i++;
+                }
+                output << ")";
+        }
         // *** Statements
 …
                         } // for
                 } // if
                 output << " );" ;
+                output << " );";
+        }
 …
                 output << "( ";
                 if ( asmStmt->get_instruction() ) asmStmt->get_instruction()->accept( *visitor );
+                output << " )" ;
+                output << " )";
+        }
+        void CodeGenerator::postvisit( DirectiveStmt * dirStmt ) {
+                output << endl << dirStmt->directive;                   // endl prevents spaces before directive
+        }
 …
         void CodeGenerator::postvisit( SwitchStmt * switchStmt ) {
                 output << "switch ( " ;
+                output << "switch ( ";
                 switchStmt->get_condition()->accept( *visitor );
                 output << " ) ";
 …
                 ++indent;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() )  ;
+                        output << indent << printLabels( (*i)->get_labels() ) ;
                         (*i)->accept( *visitor );
                         output << endl;
 …
                         output << "continue";
                         break;
+                  case BranchStmt::FallThrough:
+                  case BranchStmt::FallThroughDefault:
+                        assertf( ! 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 ( ! branchStmt->get_target().empty() ) {
+                                output << " " << branchStmt->get_target();
+                        } else if ( branchStmt->get_type() == BranchStmt::FallThrough ) {
+                                output << " default";
+                        }
+                }
                 output << ";";
+        }
 …
         void CodeGenerator::postvisit( WhileStmt * whileStmt ) {
                 if ( whileStmt->get_isDoWhile() ) {
                         output << "do" ;
+                        output << "do";
                 } else {
                         output << "while (" ;
+                        output << "while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ")";
 …
                 if ( whileStmt->get_isDoWhile() ) {
                         output << " while (" ;
+                        output << " while (";
                         whileStmt->get_condition()->accept( *visitor );
                         output << ");";

src/CodeGen/CodeGenerator.h

-              rf9feab8
+              r90152a4
 namespace CodeGen {
         struct CodeGenerator : public WithShortCircuiting, public WithVisitorRef<CodeGenerator> {
+        struct CodeGenerator : public WithShortCircuiting, public WithGuards, public WithVisitorRef<CodeGenerator> {
           static int tabsize;
                 CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false );
+                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false, bool printExprTypes = false );
                 //*** Turn off visit_children for all nodes
 …
                 void postvisit( BaseSyntaxNode * );
+                //*** print type for all expressions
+                void previsit( Expression * node );
                 //*** Declaration
                 void postvisit( StructDecl * );
                 void postvisit( FunctionDecl * );
                 void postvisit( ObjectDecl * );
+                void postvisit( UnionDecl *aggregateDecl );
+                void postvisit( EnumDecl *aggregateDecl );
+                void postvisit( TraitDecl *aggregateDecl );
+                void postvisit( TypedefDecl *typeDecl );
+                void postvisit( TypeDecl *typeDecl );
+                void postvisit( UnionDecl * aggregateDecl );
+                void postvisit( EnumDecl * aggregateDecl );
+                void postvisit( TraitDecl * aggregateDecl );
+                void postvisit( TypedefDecl * typeDecl );
+                void postvisit( TypeDecl * typeDecl );
+                void postvisit( StaticAssertDecl * assertDecl );
                 //*** Initializer
 …
                 void postvisit( LabelAddressExpr *addressExpr );
                 void postvisit( CastExpr *castExpr );
+                void postvisit( KeywordCastExpr * castExpr );
                 void postvisit( VirtualCastExpr *castExpr );
                 void postvisit( UntypedMemberExpr *memberExpr );
 …
                 void postvisit( StmtExpr * );
                 void postvisit( ConstructorExpr * );
+                void postvisit( DeletedExpr * );
+                void postvisit( DefaultArgExpr * );
+                void postvisit( GenericExpr * );
                 //*** Statements
 …
                 void postvisit( ExprStmt * );
                 void postvisit( AsmStmt * );
+                void postvisit( DirectiveStmt * );
                 void postvisit( AsmDecl * );                            // special: statement in declaration context
                 void postvisit( IfStmt * );
 …
                 bool genC = false;    // true if output has to be C code
                 bool lineMarks = false;
+                bool printExprTypes = false;
         public:
                 LineEnder endl;

src/CodeGen/FixMain.cc

-              rf9feab8
+              r90152a4
 #include "Common/SemanticError.h"  // for SemanticError
+#include "CodeGen/GenType.h"       // for GenType
 #include "SynTree/Declaration.h"   // for FunctionDecl, operator<<
 #include "SynTree/Type.h"          // for FunctionType
 …
         std::unique_ptr<FunctionDecl> FixMain::main_signature = nullptr;
+        template<typename container>
+        std::string genTypeAt(const container& p, size_t idx) {
+                return genType((*std::next(p.begin(), idx))->get_type(), "");
+        }
         void FixMain::registerMain(FunctionDecl* functionDecl)
+        {
                 if(main_signature) {
                         throw SemanticError("Multiple definition of main routine\n", functionDecl);
+                        SemanticError(functionDecl, "Multiple definition of main routine\n");
+                }
                 main_signature.reset( functionDecl->clone() );
 …
                         os << main_signature->get_scopedMangleName() << "(";
+                        switch(main_signature->get_functionType()->get_parameters().size()) {
+                                case 3: os << "argc, argv, envp"; break;
+                                case 2: os << "argc, argv"; break;
+                        const auto& params = main_signature->get_functionType()->get_parameters();
+                        switch(params.size()) {
+                                case 3: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv, (" << genTypeAt(params, 2) << ")envp"; break;
+                                case 2: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv"; break;
                                 case 0: break;
                                 default : assert(false);

src/CodeGen/FixNames.cc

-              rf9feab8
+              r90152a4
                 auto && name = SymTab::Mangler::mangle( mainDecl.get() );
                 // std::cerr << name << std::endl;
                 return name;
+                return std::move(name);
+        }
         std::string mangle_main_args() {
 …
                 auto&& name = SymTab::Mangler::mangle( mainDecl.get() );
                 // std::cerr << name << std::endl;
                 return name;
+                return std::move(name);
+        }
 …
                         int nargs = functionDecl->get_functionType()->get_parameters().size();
                         if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
                                 throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl);
+                                SemanticError(functionDecl, "Main expected to have 0, 2 or 3 arguments\n");
+                        }
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( new ConstantExpr( Constant::from_int( 0 ) ) ) );

src/CodeGen/GenType.cc

-              rf9feab8
+              r90152a4
 namespace CodeGen {
+        class GenType : public Visitor {
+          public:
+                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; }
+                virtual void visit( FunctionType *funcType );
+                virtual void visit( VoidType *voidType );
+                virtual void visit( BasicType *basicType );
+                virtual void visit( PointerType *pointerType );
+                virtual void visit( ArrayType *arrayType );
+                virtual void visit( ReferenceType *refType );
+                virtual void visit( StructInstType *structInst );
+                virtual void visit( UnionInstType *unionInst );
+                virtual void visit( EnumInstType *enumInst );
+                virtual void visit( TypeInstType *typeInst );
+                virtual void visit( TupleType * tupleType );
+                virtual void visit( VarArgsType *varArgsType );
+                virtual void visit( ZeroType *zeroType );
+                virtual void visit( OneType *oneType );
+        struct GenType : public WithVisitorRef<GenType>, public WithShortCircuiting {
+                std::string typeString;
+                GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks );
+                void previsit( BaseSyntaxNode * );
+                void postvisit( BaseSyntaxNode * );
+                void postvisit( FunctionType * funcType );
+                void postvisit( VoidType * voidType );
+                void postvisit( BasicType * basicType );
+                void postvisit( PointerType * pointerType );
+                void postvisit( ArrayType * arrayType );
+                void postvisit( ReferenceType * refType );
+                void postvisit( StructInstType * structInst );
+                void postvisit( UnionInstType * unionInst );
+                void postvisit( EnumInstType * enumInst );
+                void postvisit( TypeInstType * typeInst );
+                void postvisit( TupleType  * tupleType );
+                void postvisit( VarArgsType * varArgsType );
+                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;
+                bool pretty = false;    // pretty print
+                bool genC = false;      // generating C code?
+                bool lineMarks = false; // lineMarks on for CodeGenerator?
         };
         std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
                 GenType gt( baseString, pretty, genC, lineMarks );
+                PassVisitor<GenType> gt( baseString, pretty, genC, lineMarks );
                 std::ostringstream os;
 …
                 type->accept( gt );
                 return os.str() + gt.get_typeString();
+                return os.str() + gt.pass.typeString;
+        }
 …
         GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
+        void GenType::visit( VoidType *voidType ) {
+        // *** BaseSyntaxNode
+        void GenType::previsit( BaseSyntaxNode * ) {
+                // turn off automatic recursion for all nodes, to allow each visitor to
+                // precisely control the order in which its children are visited.
+                visit_children = false;
+        }
+        void GenType::postvisit( BaseSyntaxNode * node ) {
+                std::stringstream ss;
+                node->print( ss );
+                assertf( false, "Unhandled node reached in GenType: %s", ss.str().c_str() );
+        }
+        void GenType::postvisit( VoidType * voidType ) {
                 typeString = "void " + typeString;
                 handleQualifiers( voidType );
+        }
         void GenType::visit( BasicType *basicType ) {
                 BasicType::Kind kind = basicType->get_kind();
+        void GenType::postvisit( BasicType * basicType ) {
+                BasicType::Kind kind = basicType->kind;
                 assert( 0 <= kind && kind < BasicType::NUMBER_OF_BASIC_TYPES );
                 typeString = std::string( BasicType::typeNames[kind] ) + " " + typeString;
 …
+        }
         void GenType::genArray( const Type::Qualifiers &qualifiers, Type *base, Expression *dimension, bool isVarLen, bool isStatic ) {
+        void GenType::genArray( const Type::Qualifiers & qualifiers, Type * base, Expression *dimension, bool isVarLen, bool isStatic ) {
                 std::ostringstream os;
                 if ( typeString != "" ) {
 …
                 typeString = os.str();
                 base->accept( *this );
+        }
         void GenType::visit( PointerType *pointerType ) {
                 assert( pointerType->get_base() != 0);
                 if ( pointerType->get_isStatic() || pointerType->get_isVarLen() || pointerType->get_dimension() ) {
                         genArray( pointerType->get_qualifiers(), pointerType->get_base(), pointerType->get_dimension(), pointerType->get_isVarLen(), pointerType->get_isStatic() );
+                base->accept( *visitor );
+        }
+        void GenType::postvisit( PointerType * pointerType ) {
+                assert( pointerType->base != 0);
+                if ( pointerType->get_isStatic() || pointerType->get_isVarLen() || pointerType->dimension ) {
+                        genArray( pointerType->get_qualifiers(), pointerType->base, pointerType->dimension, pointerType->get_isVarLen(), pointerType->get_isStatic() );
                 } else {
                         handleQualifiers( pointerType );
 …
                                 typeString = "*" + typeString;
                         } // if
                         pointerType->get_base()->accept( *this );
                 } // if
+        }
         void GenType::visit( ArrayType *arrayType ) {
                 genArray( arrayType->get_qualifiers(), arrayType->get_base(), arrayType->get_dimension(), arrayType->get_isVarLen(), arrayType->get_isStatic() );
+        }
         void GenType::visit( ReferenceType *refType ) {
                 assert( refType->get_base() != 0);
+                        pointerType->base->accept( *visitor );
+                } // if
+        }
+        void GenType::postvisit( ArrayType * arrayType ) {
+                genArray( arrayType->get_qualifiers(), arrayType->base, arrayType->dimension, arrayType->get_isVarLen(), arrayType->get_isStatic() );
+        }
+        void GenType::postvisit( ReferenceType * refType ) {
+                assert( refType->base != 0);
                 assertf( ! genC, "Reference types should not reach code generation." );
                 handleQualifiers( refType );
                 typeString = "&" + typeString;
                 refType->get_base()->accept( *this );
+        }
         void GenType::visit( FunctionType *funcType ) {
+                refType->base->accept( *visitor );
+        }
+        void GenType::postvisit( FunctionType * funcType ) {
                 std::ostringstream os;
 …
                 /************* parameters ***************/
                 const std::list<DeclarationWithType *> &pars = funcType->get_parameters();
+                const std::list<DeclarationWithType *> &pars = funcType->parameters;
                 if ( pars.empty() ) {
 …
                 typeString = os.str();
                 if ( funcType->get_returnVals().size() == 0 ) {
+                if ( funcType->returnVals.size() == 0 ) {
                         typeString = "void " + typeString;
                 } else {
                         funcType->get_returnVals().front()->get_type()->accept( *this );
+                        funcType->returnVals.front()->get_type()->accept( *visitor );
                 } // if
                 // add forall
                 if( ! funcType->get_forall().empty() && ! genC ) {
+                if( ! funcType->forall.empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
                         PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
                         os << "forall(";
                         cg.pass.genCommaList( funcType->get_forall().begin(), funcType->get_forall().end() );
+                        cg.pass.genCommaList( funcType->forall.begin(), funcType->forall.end() );
                         os << ")" << std::endl;
                         typeString = os.str() + typeString;
 …
+        }
         void GenType::visit( StructInstType *structInst )  {
                 typeString = structInst->get_name() + handleGeneric( structInst ) + " " + typeString;
+        void GenType::postvisit( StructInstType * structInst )  {
+                typeString = structInst->name + handleGeneric( structInst ) + " " + typeString;
                 if ( genC ) typeString = "struct " + typeString;
                 handleQualifiers( structInst );
+        }
         void GenType::visit( UnionInstType *unionInst ) {
                 typeString = unionInst->get_name() + handleGeneric( unionInst ) + " " + typeString;
+        void GenType::postvisit( UnionInstType * unionInst ) {
+                typeString = unionInst->name + handleGeneric( unionInst ) + " " + typeString;
                 if ( genC ) typeString = "union " + typeString;
                 handleQualifiers( unionInst );
+        }
         void GenType::visit( EnumInstType *enumInst ) {
                 typeString = enumInst->get_name() + " " + typeString;
+        void GenType::postvisit( EnumInstType * enumInst ) {
+                typeString = enumInst->name + " " + typeString;
                 if ( genC ) typeString = "enum " + typeString;
                 handleQualifiers( enumInst );
+        }
         void GenType::visit( TypeInstType *typeInst ) {
                 typeString = typeInst->get_name() + " " + typeString;
+        void GenType::postvisit( TypeInstType * typeInst ) {
+                typeString = typeInst->name + " " + typeString;
                 handleQualifiers( typeInst );
+        }
         void GenType::visit( TupleType * tupleType ) {
+        void GenType::postvisit( TupleType * tupleType ) {
                 assertf( ! genC, "Tuple types should not reach code generation." );
                 unsigned int i = 0;
 …
+        }
         void GenType::visit( VarArgsType *varArgsType ) {
+        void GenType::postvisit( VarArgsType * varArgsType ) {
                 typeString = "__builtin_va_list " + typeString;
                 handleQualifiers( varArgsType );
+        }
         void GenType::visit( ZeroType *zeroType ) {
+        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;
 …
+        }
         void GenType::visit( OneType *oneType ) {
+        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;
 …
+        }
+        void GenType::handleQualifiers( Type *type ) {
+        void GenType::postvisit( GlobalScopeType * globalType ) {
+                assertf( ! 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." );
+                typeString = inst->name + " " + typeString;
+                handleQualifiers( inst );
+        }
+        void GenType::postvisit( TypeofType * typeof ) {
+                std::ostringstream os;
+                PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                os << "typeof(";
+                typeof->expr->accept( cg );
+                os << ") " << typeString;
+                typeString = os.str();
+                handleQualifiers( typeof );
+        }
+        void GenType::postvisit( QualifiedType * qualType ) {
+                assertf( ! genC, "Qualified types should not reach code generation." );
+                std::ostringstream os;
+                os << genType( qualType->parent, "", pretty, genC, lineMarks ) << "." << genType( qualType->child, "", pretty, genC, lineMarks ) << typeString;
+                typeString = os.str();
+                handleQualifiers( qualType );
+        }
+        void GenType::handleQualifiers( Type * type ) {
                 if ( type->get_const() ) {
                         typeString = "const " + typeString;

src/CodeGen/Generate.cc

-              rf9feab8
+              r90152a4
         } // namespace
         void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks, bool printExprTypes ) {
                 cleanTree( translationUnit );
                 PassVisitor<CodeGenerator> cgv( os, pretty, generateC, lineMarks );
+                PassVisitor<CodeGenerator> cgv( os, pretty, generateC, lineMarks, printExprTypes );
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
 …
                         os << CodeGen::genPrettyType( type, "" );
                 } else {
                         PassVisitor<CodeGenerator> cgv( os, true, false, false );
+                        PassVisitor<CodeGenerator> cgv( os, true, false, false, false );
                         node->accept( cgv );
+                }

src/CodeGen/Generate.h

rf9feab8	r90152a4
24	24	namespace CodeGen {
25	25	/// Generates code. doIntrinsics determines if intrinsic functions are printed, pretty formats output nicely (e.g., uses unmangled names, etc.), generateC is true when the output must consist only of C code (allows some assertions, etc.)
26		void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false , bool lineMarks = false );
	26	void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false , bool lineMarks = false, bool printTypeExpr = false );
27	27
28	28	/// Generate code for a single node -- helpful for debugging in gdb

src/CodeGen/OperatorTable.cc

-              rf9feab8
+              r90152a4
         } // namespace
         bool operatorLookup( std::string funcName, OperatorInfo &info ) {
+        bool operatorLookup( const std::string & funcName, OperatorInfo & info ) {
                 static bool init = false;
                 if ( ! init ) {
 …
                         return true;
                 } // if
+        }
+        bool isOperator( const std::string & funcName ) {
+                OperatorInfo info;
+                return operatorLookup( funcName, info );
+        }

src/CodeGen/OperatorTable.h

-              rf9feab8
+              r90152a4
         };
+        bool operatorLookup( std::string funcName, OperatorInfo &info );
+        bool isOperator( const std::string & funcName );
+        bool operatorLookup( const std::string & funcName, OperatorInfo & info );
         bool isConstructor( const std::string & );

src/CodeTools/DeclStats.cc

-              rf9feab8
+              r90152a4
 #include <utility>                 // for pair, make_pair
 #include "Common/SemanticError.h"  // for SemanticError
+#include "Common/PassVisitor.h"
 #include "Common/VectorMap.h"      // for VectorMap
 #include "GenPoly/GenPoly.h"       // for hasPolyBase
 …
 namespace CodeTools {
         class DeclStats : public Visitor {
+        struct DeclStats : public WithShortCircuiting {
                 template<typename T>
                 static void sum(T& a, const T& b) { a += b; }
 …
                 struct ArgPackStats {
+                        VectorMap<unsigned> n;                 ///< Count of decls with each number of elements
+                        VectorMap<unsigned> n_basic;           ///< Count of decls with each number of basic type elements
+                        VectorMap<unsigned> n_poly;            ///< Count of decls with each number of polymorphic elements
+                        std::map<unsigned, unsigned> p_basic;  ///< Count of decls with each percentage of basic type elements
+                        std::map<unsigned, unsigned> p_poly;   ///< Count of decls with each percentage of polymorphic elements
+                        VectorMap<unsigned> n_types;           ///< Count of decls with each number of distinct types in the pack
+                        VectorMap<unsigned> n;                   ///< Count of decls with each number of elements
+                        VectorMap<unsigned> n_basic;             ///< Count of decls with each number of basic type elements
+                        VectorMap<unsigned> n_generic;           ///< Count of decls with each number of generic type elements
+                        VectorMap<unsigned> n_poly;              ///< Count of decls with each number of polymorphic elements
+                        VectorMap<unsigned> n_compound;          ///< Count of decls with each number of non-generic compound types
+                        std::map<unsigned, unsigned> p_basic;    ///< Count of decls with each percentage of basic type elements
+                        std::map<unsigned, unsigned> p_generic;  ///< Count of decls with each percentage of generic type elements
+                        std::map<unsigned, unsigned> p_poly;     ///< Count of decls with each percentage of polymorphic elements
+                        std::map<unsigned, unsigned> p_compound; ///< Count of decls with each percentage of non-generic compound type elements
+                        VectorMap<unsigned> n_types;             ///< Count of decls with each number of distinct types in the pack
                         /// Count of decls with each percentage of new types in lists.
                         /// Types used in the parameter list that recur in the return list are not considered to be new.
 …
                                 sum(n, o.n);
                                 sum(n_basic, o.n_basic);
+                                sum(n_generic, o.n_generic);
                                 sum(n_poly, o.n_poly);
+                                sum(n_compound, o.n_compound);
                                 sum(p_basic, o.p_basic);
+                                sum(p_generic, o.p_generic);
                                 sum(p_poly, o.p_poly);
+                                sum(p_compound, o.p_compound);
                                 sum(n_types, o.n_types);
                                 sum(p_new, o.p_new);
 …
                         /// Count of declarations with each number of assertion parameters
                         VectorMap<unsigned> n_type_params;
+                        /// Count of generic types with each number of type parameters
+                        VectorMap<unsigned> n_generic_params;
+                        /// Count of maximum nesting depth of types
+                        VectorMap<unsigned> n_generic_nesting;
                         /// Count of declarations with each name
                         std::unordered_map<std::string, unsigned> by_name;
                         /// Count of uses of each basic type
                         std::unordered_map<std::string, unsigned> basic_type_names;
+                        /// Count of uses of each non-basic type
+                        /// Count of uses of each generic type name (includes "*", "[]", "(*)", "[,]")
+                        std::unordered_map<std::string, unsigned> generic_type_names;
+                        /// Count of uses of each non-generic aggregate type
                         std::unordered_map<std::string, unsigned> compound_type_names;
                         /// Count of decls using each basic type
                         std::unordered_map<std::string, unsigned> basic_type_decls;
+                        /// Count of decls using each generic type (includes "*", "[]", "(*)", "[,]")
+                        std::unordered_map<std::string, unsigned> generic_type_decls;
                         /// Count of decls using each compound type
                         std::unordered_map<std::string, unsigned> compound_type_decls;
 …
                         ArgPackStats assn_returns;
+                        Stats() : n_decls(0), n_type_params(), by_name(), basic_type_names(), compound_type_names(), basic_type_decls(), compound_type_decls(), params(), returns(), n_assns(), assn_params(), assn_returns() {}
+                        Stats() : n_decls(0), n_type_params(), n_generic_params(), n_generic_nesting(),
+                                by_name(), basic_type_names(), generic_type_names(), compound_type_names(),
+                                basic_type_decls(), generic_type_decls(), compound_type_decls(), params(),
+                                returns(), n_assns(), assn_params(), assn_returns() {}
                 public:
 …
                                 sum( n_decls, o.n_decls );
                                 sum( n_type_params, o.n_type_params );
+                                sum( n_generic_params, o.n_generic_params );
+                                sum( n_generic_nesting, o.n_generic_nesting );
                                 sum( by_name, o.by_name );
                                 sum( basic_type_names, o.basic_type_names );
+                                sum( generic_type_names, o.generic_type_names );
                                 sum( compound_type_names, o.compound_type_names );
                                 sum( basic_type_decls, o.basic_type_decls );
+                                sum( generic_type_decls, o.generic_type_decls );
                                 sum( compound_type_decls, o.compound_type_decls );
                                 sum( params, o.params );
 …
                 };
+                Stats for_linkage[LinkageSpec::NoOfSpecs];   ///< Stores separate stats per linkage
+                /// number of counting bins for linkages
+                static const unsigned n_named_specs = 8;
+                /// map from total number of specs to bins
+                static const unsigned ind_for_linkage[16];
+                Stats for_linkage[n_named_specs];            ///< Stores separate stats per linkage
                 std::unordered_set<std::string> seen_names;  ///< Stores manglenames already seen to avoid double-counting
                 Stats total;
 …
                 std::map<std::pair<unsigned, unsigned>, unsigned> exprs_by_fanout_at_depth;
+                void countType( const std::string& name, unsigned& n, std::unordered_map<std::string,
+                                unsigned>& names, std::unordered_map<std::string, unsigned>& decls,
+                                std::unordered_set<std::string>& elSeen ) {
+                        ++n;
+                        ++names[ name ];
+                        if ( elSeen.insert( name ).second ) { ++decls[ name ]; }
+                }
+                void update_max( unsigned& max, unsigned crnt ) {
+                        if ( crnt > max ) max = crnt;
+                }
+                void analyzeSubtype( Type* ty, Stats& stats, std::unordered_set<std::string>& elSeen,
+                                unsigned& n_poly, bool& seen_poly, unsigned& max_depth, unsigned depth ) {
+                        unsigned x;
+                        analyzeType( ty, stats, elSeen, x, x, n_poly, x, seen_poly, max_depth, depth + 1 );
+                }
+                void analyzeSubtypes( std::list<DeclarationWithType*>& tys, Stats& stats,
+                                std::unordered_set<std::string>& elSeen, unsigned& n_poly, bool& seen_poly,
+                                unsigned& max_depth, unsigned depth, unsigned& n_subs ) {
+                        for ( DeclarationWithType* dwt : tys ) {
+                                Type* ty = dwt->get_type();
+                                n_subs += (unsigned)( dynamic_cast<VoidType*>(ty) != nullptr );
+                                analyzeSubtype( ty, stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                        }
+                }
+                void analyzeSubtypes( std::list<Expression*>& tys, Stats& stats,
+                                std::unordered_set<std::string>& elSeen, unsigned& n_poly, bool& seen_poly,
+                                unsigned& max_depth, unsigned depth ) {
+                        for ( Expression* expr : tys ) {
+                                TypeExpr* texpr = dynamic_cast<TypeExpr*>(expr);
+                                if ( ! texpr ) continue;
+                                Type* ty = texpr->get_type();
+                                analyzeSubtype( ty, stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                        }
+                }
+                void analyzeSubtypes( std::list<Type*>& tys, Stats& stats,
+                                std::unordered_set<std::string>& elSeen, unsigned& n_poly, bool& seen_poly,
+                                unsigned& max_depth, unsigned depth ) {
+                        for ( Type* ty : tys ) {
+                                analyzeSubtype( ty, stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                        }
+                }
+                void analyzeType( Type* ty, Stats& stats, std::unordered_set<std::string>& elSeen,
+                                unsigned& n_basic, unsigned& n_generic, unsigned& n_poly, unsigned& n_agg,
+                                bool& seen_poly, unsigned& max_depth, unsigned depth = 0 ) {
+                        if ( BasicType* bt = dynamic_cast<BasicType*>(ty) ) {
+                                std::string name = BasicType::typeNames[ bt->get_kind() ];
+                                countType( name, n_basic, stats.basic_type_names, stats.basic_type_decls, elSeen );
+                                update_max( max_depth, depth );
+                        } else if ( PointerType* pt = dynamic_cast<PointerType*>(ty) ) {
+                                std::string name = "*";
+                                countType(
+                                        name, n_generic, stats.generic_type_names, stats.generic_type_decls, elSeen);
+                                analyzeSubtype(
+                                        pt->get_base(), stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                                ++stats.n_generic_params.at( 1 );
+                        } else if ( ArrayType* at = dynamic_cast<ArrayType*>(ty) ) {
+                                std::string name = "[]";
+                                countType(
+                                        name, n_generic, stats.generic_type_names, stats.generic_type_decls, elSeen);
+                                analyzeSubtype(
+                                        at->get_base(), stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                                ++stats.n_generic_params.at( 1 );
+                        } else if ( ReferenceType* rt = dynamic_cast<ReferenceType*>(ty) ) {
+                                std::string name = "&";
+                                countType(
+                                        name, n_generic, stats.generic_type_names, stats.generic_type_decls, elSeen);
+                                analyzeSubtype(
+                                        rt->get_base(), stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                                ++stats.n_generic_params.at( 1 );
+                        } else if ( FunctionType* ft = dynamic_cast<FunctionType*>(ty) ) {
+                                std::string name = "(*)";
+                                countType(
+                                        name, n_generic, stats.generic_type_names, stats.generic_type_decls, elSeen);
+                                unsigned n_subs = 0;
+                                analyzeSubtypes(
+                                        ft->get_returnVals(), stats, elSeen, n_poly, seen_poly, max_depth, depth,
+                                        n_subs );
+                                analyzeSubtypes(
+                                        ft->get_parameters(), stats, elSeen, n_poly, seen_poly, max_depth, depth,
+                                        n_subs );
+                                ++stats.n_generic_params.at( n_subs );
+                        } else if ( TypeInstType* vt = dynamic_cast<TypeInstType*>(ty) ) {
+                                if ( ! seen_poly ) {
+                                        ++n_poly;
+                                        seen_poly = true;
+                                }
+                                countType(
+                                        vt->get_name(), n_agg, stats.compound_type_names, stats.compound_type_decls,
+                                        elSeen );
+                                update_max( max_depth, depth );
+                        } else if ( ReferenceToType* st = dynamic_cast<ReferenceToType*>(ty) ) {
+                                std::list<Expression*>& params = st->get_parameters();
+                                if ( params.empty() ) {
+                                        countType(
+                                                st->get_name(), n_agg, stats.compound_type_names,
+                                                stats.compound_type_decls, elSeen );
+                                        update_max( max_depth, depth );
+                                } else {
+                                        countType(
+                                                st->get_name(), n_generic, stats.generic_type_names,
+                                                stats.generic_type_decls, elSeen);
+                                        analyzeSubtypes( params, stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                                        ++stats.n_generic_params.at( params.size() );
+                                }
+                        } else if ( TupleType* tt = dynamic_cast<TupleType*>(ty) ) {
+                                std::string name = "[,]";
+                                countType(
+                                        name, n_generic, stats.generic_type_names, stats.generic_type_decls, elSeen);
+                                analyzeSubtypes(
+                                        tt->get_types(), stats, elSeen, n_poly, seen_poly, max_depth, depth );
+                                ++stats.n_generic_params.at( tt->size() );
+                        } else if ( dynamic_cast<VarArgsType*>(ty) ) {
+                                std::string name = "...";
+                                countType(
+                                        name, n_agg, stats.compound_type_names, stats.compound_type_decls, elSeen );
+                                update_max( max_depth, depth );
+                        } else if ( dynamic_cast<ZeroType*>(ty) ) {
+                                std::string name = "0";
+                                countType( name, n_basic, stats.basic_type_names, stats.basic_type_decls, elSeen );
+                                update_max( max_depth, depth );
+                        } else if ( dynamic_cast<OneType*>(ty) ) {
+                                std::string name = "1";
+                                countType( name, n_basic, stats.basic_type_names, stats.basic_type_decls, elSeen );
+                                update_max( max_depth, depth );
+                        }
+                }
                 /// Update arg pack stats based on a declaration list
+                void analyze( Stats& stats, std::unordered_set<std::string>& seen, ArgPackStats& pstats, std::list<DeclarationWithType*>& decls ) {
+                void analyze( Stats& stats, std::unordered_set<std::string>& seen,
+                                std::unordered_set<std::string>& elSeen, ArgPackStats& pstats,
+                                std::list<DeclarationWithType*>& decls ) {
                         std::unordered_set<std::string> types;
+                        unsigned n = 0;        ///< number of args/returns
+                        unsigned n_basic = 0;  ///< number of basic types
+                        unsigned n_poly = 0;   ///< number of polymorphic types
+                        unsigned n_new = 0;    ///< number of new types
+                        unsigned n = 0;                 ///< number of args/returns
+                        unsigned n_basic = 0;           ///< number of basic types
+                        unsigned n_generic = 0;         ///< number of generic types (includes "*", "&", "[]", "(*)", "[,]")
+                        unsigned n_poly = 0;            ///< number of polymorphic types
+                        unsigned n_agg = 0;             ///< number of non-generic aggregate types
+                        unsigned n_new = 0;             ///< number of new types
                         for ( auto decl : decls ) {
                                 Type* dt = decl->get_type();
 …
                                 dt->print( ss );
                                 types.insert( ss.str() );
+                                bool this_new = seen.insert( ss.str() ).second;
+                                if ( this_new ) { ++n_new; }
+                                if ( dynamic_cast<BasicType*>( dt ) ) {
+                                        ++n_basic;
+                                        ++stats.basic_type_names[ ss.str() ];
+                                        if ( this_new ) {
+                                                ++stats.basic_type_decls[ ss.str() ];
+                                        }
+                                } else if ( GenPoly::hasPolyBase( dt ) ) {
+                                        ++n_poly;
+                                } else {
+                                        ++stats.compound_type_names[ ss.str() ];
+                                        if ( this_new ) {
+                                                ++stats.compound_type_decls[ ss.str() ];
+                                        }
+                                }
+                        }
+                                if ( seen.insert( ss.str() ).second ) { ++n_new; }
+                                bool seen_poly = false;
+                                unsigned max_depth = 0;
+                                analyzeType(
+                                        dt, stats, elSeen, n_basic, n_generic, n_poly, n_agg, seen_poly, max_depth );
+                                ++stats.n_generic_nesting.at( max_depth );
+                        }
                         ++pstats.n.at( n );
                         ++pstats.n_basic.at( n_basic );
+                        ++pstats.n_generic.at( n_generic );
                         ++pstats.n_poly.at( n_poly );
+                        ++pstats.n_compound.at( n_agg );
                         if ( n > 0 ) {
                                 ++pstats.p_basic[ n_basic*100/n ];
+                                ++pstats.p_generic[ n_generic*100/n ];
                                 ++pstats.p_poly[ n_poly*100/n ];
+                                ++pstats.p_new[ n_new*100/n ];
+                                ++pstats.p_compound[ n_agg*100/n ];
+                                if ( n > 1 ) ++pstats.p_new[ (n_new-1)*100/(n-1) ];
+                        }
                         ++pstats.n_types.at( types.size() );
 …
                 void analyzeFunc( FunctionType* fnTy, Stats& stats, ArgPackStats& params, ArgPackStats& returns ) {
                         std::unordered_set<std::string> seen;
+                        analyze( stats, seen, params, fnTy->get_parameters() );
+                        analyze( stats, seen, returns, fnTy->get_returnVals() );
+                        std::unordered_set<std::string> elSeen;
+                        analyze( stats, seen, elSeen, params, fnTy->get_parameters() );
+                        analyze( stats, seen, elSeen, returns, fnTy->get_returnVals() );
+                }
 …
         public:
+                using Visitor::visit;
+                virtual void visit( FunctionDecl *decl ) {
+                void previsit( FunctionDecl *decl ) {
                         // skip if already seen declaration for this function
+                        const std::string& mangleName = decl->get_mangleName().empty() ? decl->get_name() : decl->get_mangleName();
+                        if ( ! seen_names.insert( mangleName ).second ) {
+                                maybeAccept( decl->get_statements(), *this );
+                                return;
+                        }
+                        Stats& stats = for_linkage[ decl->get_linkage() ];
+                        ++stats.n_decls;
+                        FunctionType* fnTy = decl->get_functionType();
+                        const Type::ForallList& forall = fnTy->get_forall();
+                        ++stats.n_type_params.at( forall.size() );
+                        unsigned n_assns = 0;
+                        for ( TypeDecl* fdecl : forall ) {
+                                n_assns += fdecl->get_assertions().size();
+                                for ( DeclarationWithType* assn : fdecl->get_assertions() ) {
+                                        FunctionType *assnTy = 0;
+                                        if ( ObjectDecl *assnObj = dynamic_cast<ObjectDecl*>(assn) ) {
+                                                if ( PointerType *ptrTy = dynamic_cast<PointerType*>(assnObj->get_type()) ) {
+                                                        assnTy = dynamic_cast<FunctionType*>(ptrTy->get_base());
+                                                } else assnTy = dynamic_cast<FunctionType*>(assnObj->get_type());
+                                        } else if ( FunctionDecl *assnDecl = dynamic_cast<FunctionDecl*>(assn) ) {
+                                                assnTy = assnDecl->get_functionType();
+                        const std::string& mangleName = decl->get_mangleName().empty() ? decl->name : decl->get_mangleName();
+                        if ( seen_names.insert( mangleName ).second ) {
+                                Stats& stats = for_linkage[ ind_for_linkage[ decl->linkage ] ];
+                                ++stats.n_decls;
+                                FunctionType* fnTy = decl->type;
+                                const Type::ForallList& forall = fnTy->forall;
+                                ++stats.n_type_params.at( forall.size() );
+                                unsigned n_assns = 0;
+                                for ( TypeDecl* fdecl : forall ) {
+                                        n_assns += fdecl->assertions.size();
+                                        for ( DeclarationWithType* assn : fdecl->assertions ) {
+                                                FunctionType *assnTy = nullptr;
+                                                if ( ObjectDecl *assnObj = dynamic_cast<ObjectDecl*>(assn) ) {
+                                                        if ( PointerType *ptrTy = dynamic_cast<PointerType*>(assnObj->get_type()) ) {
+                                                                assnTy = dynamic_cast<FunctionType*>(ptrTy->base);
+                                                        } else assnTy = dynamic_cast<FunctionType*>(assnObj->get_type());
+                                                } else if ( FunctionDecl *assnDecl = dynamic_cast<FunctionDecl*>(assn) ) {
+                                                        assnTy = assnDecl->type;
+                                                }
+                                                if ( assnTy ) analyzeFunc( assnTy, stats, stats.assn_params, stats.assn_returns );
+                                        }
+                                        if ( assnTy ) analyzeFunc( assnTy, stats, stats.assn_params, stats.assn_returns );
+                                }
+                        }
+                        ++stats.n_assns[ n_assns ];
+                        ++stats.by_name[ decl->get_name() ];
+                        analyzeFunc( fnTy, stats, stats.params, stats.returns );
+                        // analyze expressions in decl statements
+                        maybeAccept( decl->get_statements(), *this );
+                }
+                virtual void visit( UntypedExpr *expr ) {
+                                }
+                                ++stats.n_assns[ n_assns ];
+                                ++stats.by_name[ decl->name ];
+                                analyzeFunc( fnTy, stats, stats.params, stats.returns );
+                        }
+                }
+                void previsit( UntypedExpr *expr ) {
+                        visit_children = false;
                         analyzeExpr( expr, 0 );
+                }
 …
                 template<typename F>
                 void printAllHisto( const std::string& name, F extract ) {
                         VectorMap<unsigned> histos[LinkageSpec::NoOfSpecs];
+                        VectorMap<unsigned> histos[n_named_specs];
                         VectorMap<unsigned> thisto;
                         for ( const auto& entry : extract(total) ) { ++thisto.at( entry.second ); }
                         for ( unsigned i = 0; i < LinkageSpec::NoOfSpecs; ++i ) {
+                        for ( unsigned i = 0; i < n_named_specs; ++i ) {
                                 // can't be a higher count in one of the sub-histograms than the total
                                 histos[i].reserve( thisto.size() );
 …
                 template<typename F>
                 void printAllSparseHisto( const std::string& name, F extract ) {
                         std::map<unsigned, unsigned> histos[LinkageSpec::NoOfSpecs];
+                        std::map<unsigned, unsigned> histos[n_named_specs];
                         std::map<unsigned, unsigned> thisto;
                         for ( const auto& entry : extract(total) ) { ++thisto[ entry.second ]; }
                         for ( unsigned i = 0; i < LinkageSpec::NoOfSpecs; ++i ) {
+                        for ( unsigned i = 0; i < n_named_specs; ++i ) {
                                 for ( const auto& entry : extract(for_linkage[i]) ) { ++histos[i][entry.second]; }
+                        }
 …
                                 const auto& key = entry.first;
                                 std::cout << "\"" << name << "\"," << key;
                                 for ( unsigned i = 0; i < LinkageSpec::NoOfSpecs; ++i ) {
+                                for ( unsigned i = 0; i < n_named_specs; ++i ) {
                                         auto it = histos[i].find( key );
                                         if ( it == histos[i].end() ) std::cout << ",0";
 …
                 void printAllPack( const std::string& name, F extract ) {
                         printAllMap("n_basic_" + name, [&extract](const Stats& stats) { return extract(stats).n_basic; });
+                        printAllMap("n_generic_" + name, [&extract](const Stats& stats) { return extract(stats).n_generic; });
                         printAllMap("n_poly_" + name, [&extract](const Stats& stats) { return extract(stats).n_poly; });
+                        printAllMap("n_compound_" + name, [&extract](const Stats& stats) { return extract(stats).n_compound; });
                         printAllMap("n_" + name, [&extract](const Stats& stats) { return extract(stats).n; });
                         printAllMap("%_basic_" + name, [&extract](const Stats& stats) { return extract(stats).p_basic; });
+                        printAllMap("%_generic_" + name, [&extract](const Stats& stats) { return extract(stats).p_generic; });
                         printAllMap("%_poly_" + name, [&extract](const Stats& stats) { return extract(stats).p_poly; });
+                        printAllMap("%_compound_" + name, [&extract](const Stats& stats) { return extract(stats).p_compound; });
                         printAllMap("n_distinct_types_" + name, [&extract](const Stats& stats) { return extract(stats).n_types; });
                         printAllMap("%_new_types_in_" + name, [&extract](const Stats& stats) { return extract(stats).p_new; });
 …
+                        }
                         std::cout << ",,\"intrinsic\",\"Cforall\",\"C\",\"autogen\",\"builtin\",\"TOTAL\"" << std::endl;
+                        std::cout << ",,\"intrinsic\",\"Cforall\",\"C\",\"autogen\",\"compiler\",\"builtinCFA\",\"builtinC\",\"other\",\"TOTAL\"" << std::endl;
                         printAllMap("n_type_params", [](const Stats& stats) { return stats.n_type_params; });
+                        printAllMap("n_generic_params", [](const Stats& stats) { return stats.n_generic_params; });
+                        printAllMap("n_generic_nesting", [](const Stats& stats) { return stats.n_generic_nesting; });
                         printAll("n_decls", [](const Stats& stats) { return stats.n_decls; });
                         printAll("unique_names", [](const Stats& stats) { return stats.by_name.size(); });
 …
                         printAllSparseHisto("basic_type_uses", [](const Stats& stats) { return stats.basic_type_names; });
                         printAllSparseHisto("decls_using_basic_type", [](const Stats& stats) { return stats.basic_type_decls; });
+                        printAll("generic_type_names", [](const Stats& stats) { return stats.generic_type_names.size(); });
+                        printAllSparseHisto("generic_type_uses", [](const Stats& stats) { return stats.generic_type_names; });
+                        printAllSparseHisto("decls_using_generic_type", [](const Stats& stats) { return stats.generic_type_decls; });
                         printAll("compound_type_names", [](const Stats& stats) { return stats.compound_type_names.size(); });
                         printAllSparseHisto("compound_type_uses", [](const Stats& stats) { return stats.compound_type_names; });
 …
         };
+        const unsigned DeclStats::ind_for_linkage[]
+                = { 7, 7, 2, 1,   7, 7, 7, 3,   4, 7, 6, 5,   7, 7, 7, 0 };
         void printDeclStats( std::list< Declaration * > &translationUnit ) {
                 DeclStats stats;
+                PassVisitor<DeclStats> stats;
                 acceptAll( translationUnit, stats );
                 stats.print();
+                stats.pass.print();
+        }

src/CodeTools/TrackLoc.cc

rf9feab8	r90152a4
24	24
25	25	#include "Common/PassVisitor.h" // for PassVisitor
26		~~#include "Common/SemanticError.h" // for SemanticError~~
27	26	#include "Common/utility.h" // for CodeLocation
28	27	#include "SynTree/BaseSyntaxNode.h" // for BaseSyntaxNode
…	…
64	63	}
65	64	else {
66		assertf( false, "Top level node has no CodeLocation %s", ~~name~~.c_str() );
	65	assertf( false, "Top level node has no CodeLocation %s", toString( node ).c_str() );
67	66	}
68	67	}

src/Common/Debug.h

-              rf9feab8
+              r90152a4
 namespace Debug {
         /// debug codegen a translation unit
         static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
+        static inline void codeGen( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Builtin ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
                 filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
                         return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
+                        return ! (decl->linkage & linkageFilter);
                 });
                 std::cerr << "======" << label << "======" << std::endl;
+                CodeGen::generate( decls, std::cerr, false, true );
+                CodeGen::generate(
+                        decls,
+                        std::cerr,
+                        true /* doIntrinsics */,
+                        true /* pretty */,
+                        false /* generateC */,
+                        false /* lineMarks */,
+                        true /* printTypeExpr */
+                );
         #endif
         } // dump
         static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label ) {
+        static inline void treeDump( __attribute__((unused)) const std::list< Declaration * > & translationUnit, __attribute__((unused)) const std::string & label, __attribute__((unused)) LinkageSpec::Spec linkageFilter = LinkageSpec::Compiler ) {
         #ifdef DEBUG
                 std::list< Declaration * > decls;
                 filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), []( Declaration * decl ) {
                         return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+                filter( translationUnit.begin(), translationUnit.end(), back_inserter( decls ), [linkageFilter]( Declaration * decl ) {
+                        return ! (decl->linkage & linkageFilter);
                 });

src/Common/PassVisitor.h

-              rf9feab8
+              r90152a4
 #include "SynTree/Expression.h"
 #include "SynTree/Constant.h"
+#include "SynTree/TypeSubstitution.h"
+class TypeSubstitution;
 #include "PassVisitor.proto.h"
 …
         virtual void visit( TypedefDecl * typeDecl ) override final;
         virtual void visit( AsmDecl * asmDecl ) override final;
+        virtual void visit( StaticAssertDecl * assertDecl ) override final;
         virtual void visit( CompoundStmt * compoundStmt ) override final;
         virtual void visit( ExprStmt * exprStmt ) override final;
         virtual void visit( AsmStmt * asmStmt ) override final;
+        virtual void visit( DirectiveStmt * dirStmt ) override final;
         virtual void visit( IfStmt * ifStmt ) override final;
         virtual void visit( WhileStmt * whileStmt ) override final;
 …
         virtual void visit( NameExpr * nameExpr ) override final;
         virtual void visit( CastExpr * castExpr ) override final;
+        virtual void visit( KeywordCastExpr * castExpr ) override final;
         virtual void visit( VirtualCastExpr * castExpr ) override final;
         virtual void visit( AddressExpr * addressExpr ) override final;
 …
         virtual void visit( StmtExpr *  stmtExpr ) override final;
         virtual void visit( UniqueExpr *  uniqueExpr ) override final;
+        virtual void visit( UntypedInitExpr *  initExpr ) override final;
+        virtual void visit( InitExpr *  initExpr ) override final;
+        virtual void visit( DeletedExpr *  delExpr ) override final;
+        virtual void visit( DefaultArgExpr * argExpr ) override final;
+        virtual void visit( GenericExpr * genExpr ) override final;
         virtual void visit( VoidType * basicType ) override final;
 …
         virtual void visit( ArrayType * arrayType ) override final;
         virtual void visit( ReferenceType * referenceType ) override final;
+        virtual void visit( QualifiedType * qualType ) override final;
         virtual void visit( FunctionType * functionType ) override final;
         virtual void visit( StructInstType * aggregateUseType ) override final;
 …
         virtual void visit( ZeroType * zeroType ) override final;
         virtual void visit( OneType * oneType ) override final;
+        virtual void visit( GlobalScopeType * globalType ) override final;
         virtual void visit( Designation * designation ) override final;
 …
         virtual Declaration * mutate( TypedefDecl * typeDecl ) override final;
         virtual AsmDecl * mutate( AsmDecl * asmDecl ) override final;
+        virtual StaticAssertDecl * mutate( StaticAssertDecl * assertDecl ) override final;
         virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) override final;
         virtual Statement * mutate( ExprStmt * exprStmt ) override final;
         virtual Statement * mutate( AsmStmt * asmStmt ) override final;
+        virtual Statement * mutate( DirectiveStmt * dirStmt ) override final;
         virtual Statement * mutate( IfStmt * ifStmt ) override final;
         virtual Statement * mutate( WhileStmt * whileStmt ) override final;
 …
         virtual Expression * mutate( UntypedExpr * untypedExpr ) override final;
         virtual Expression * mutate( NameExpr * nameExpr ) override final;
         virtual Expression * mutate( AddressExpr * castExpr ) override final;
+        virtual Expression * mutate( AddressExpr * addrExpr ) override final;
         virtual Expression * mutate( LabelAddressExpr * labAddressExpr ) override final;
         virtual Expression * mutate( CastExpr * castExpr ) override final;
+        virtual Expression * mutate( KeywordCastExpr * castExpr ) override final;
         virtual Expression * mutate( VirtualCastExpr * castExpr ) override final;
         virtual Expression * mutate( UntypedMemberExpr * memberExpr ) override final;
 …
         virtual Expression * mutate( StmtExpr *  stmtExpr ) override final;
         virtual Expression * mutate( UniqueExpr *  uniqueExpr ) override final;
+        virtual Expression * mutate( UntypedInitExpr *  initExpr ) 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( VoidType * basicType ) 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;
 …
 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 mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_t >& visitor );
 …
         bool_ref * get_visit_children_ptr() { return visit_children_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 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 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     ( WithStmt            * node ) { indexer_impl_addWith    ( pass, 0, node ); }
+        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 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 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 ); }
 …
 };
+#include "SynTree/TypeSubstitution.h"
 #include "PassVisitor.impl.h"

src/Common/PassVisitor.impl.h

-              rf9feab8
+              r90152a4
 template< typename pass_type >
 static inline void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& visitor ) {
+inline void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& visitor ) {
         DeclList_t* beforeDecls = visitor.get_beforeDecls();
         DeclList_t* afterDecls  = visitor.get_afterDecls();
         SemanticError errors;
+        SemanticErrorException errors;
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
 …
                         // run visitor on declaration
                         maybeAccept_impl( *i, visitor );
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                } catch( SemanticErrorException &e ) {
                         errors.append( e );
+                }
 …
 template< typename pass_type >
 static inline void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& mutator ) {
+inline void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& mutator ) {
         DeclList_t* beforeDecls = mutator.get_beforeDecls();
         DeclList_t* afterDecls  = mutator.get_afterDecls();
         SemanticError errors;
+        SemanticErrorException errors;
         for ( std::list< Declaration* >::iterator i = decls.begin(); ; ++i ) {
 …
                         // run mutator on declaration
                         maybeMutate_impl( *i, mutator );
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                } catch( SemanticErrorException &e ) {
                         errors.append( e );
+                }
 …
 inline void maybeAccept_impl( Container & container, PassVisitor< pass_type > & visitor ) {
         if ( ! visitor.get_visit_children() ) return;
         SemanticError errors;
+        SemanticErrorException errors;
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
 …
                                 (*i)->accept( visitor );
+                        }
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                } catch( SemanticErrorException &e ) {
                         errors.append( e );
+                }
 …
 inline void maybeMutate_impl( Container & container, PassVisitor< pass_type > & mutator ) {
         if ( ! mutator.get_visit_children() ) return;
         SemanticError errors;
+        SemanticErrorException errors;
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
 …
                                 assert( *i );
                         } // if
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                } catch( SemanticErrorException &e ) {
                         errors.append( e );
                 } // try
 …
 void PassVisitor< pass_type >::handleStatementList( std::list< Statement * > & statements, func_t func ) {
         if ( ! get_visit_children() ) return;
         SemanticError errors;
+        SemanticErrorException errors;
         // don't want statements from outer CompoundStmts to be added to this CompoundStmt
 …
                             || ( empty( beforeDecls ) && empty( afterDecls )) );
+                } catch ( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                } catch ( SemanticErrorException &e ) {
                         errors.append( e );
+                }
 …
         maybeAccept_impl   ( node->attributes   , *this );
+        if ( node->name != "" ) {
+                indexerAddId( node );
+        }
+        indexerAddId( node );
         VISIT_END( node );
 …
         maybeMutate_impl   ( node->attributes   , *this );
+        if ( node->name != "" ) {
+                indexerAddId( node );
+        }
+        indexerAddId( node );
         MUTATE_END( DeclarationWithType, node );
 …
         VISIT_START( node );
+        if ( node->name != "" ) {
+                indexerAddId( 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(); } );
+                // 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 );
+                maybeAccept_impl( node->statements, *this );
+                maybeAccept_impl( node->attributes, *this );
+                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 );
+                }
+        }
 …
         MUTATE_START( node );
+        if ( node->name != "" ) {
+                indexerAddId( node );
+        }
+        indexerAddId( node );
+        {
+                // 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(); } );
+                // 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 );
+                maybeMutate_impl( node->type, *this );
+                maybeMutate_impl( node->statements, *this );
+                maybeMutate_impl( node->attributes, *this );
+                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 );
+                        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 );
+                }
+        }
 …
 //--------------------------------------------------------------------------
+// StaticAssertDecl
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( StaticAssertDecl * node ) {
+        VISIT_START( node );
+        node->condition = 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 );
+        node->condition = mutateExpression( node->condition );
+        maybeMutate_impl( node->message, *this );
+        MUTATE_END( StaticAssertDecl, node );
+}
+//--------------------------------------------------------------------------
 // CompoundStmt
 template< typename pass_type >
 …
         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 );
+        }
 …
         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( AsmStmt * node ) {
+        VISIT_BODY( 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_BODY( Statement, node );
+        MUTATE_START( node );
+        maybeMutate_impl( node->instruction, *this );
+        maybeMutate_impl( node->output, *this );
+        maybeMutate_impl( node->input, *this );
+        maybeMutate_impl( node->clobber, *this );
+        MUTATE_END( Statement, node );
+}
+//--------------------------------------------------------------------------
+// AsmStmt
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( DirectiveStmt * node ) {
+        VISIT_START( node )
+        VISIT_END( node );
+}
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( DirectiveStmt * node ) {
+        MUTATE_START( node );
+        MUTATE_END( Statement, node );
+}
 …
         VISIT_START( node );
+        visitExpression( node->condition );
+        node->body = visitStatement( node->body );
+        {
+                // 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 );
+                node->body = visitStatement( node->body );
+        }
         VISIT_END( node );
 …
         MUTATE_START( node );
+        node->condition = mutateExpression( node->condition );
+        node->body      = mutateStatement ( node->body      );
+        {
+                // while 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->body      = mutateStatement ( node->body      );
+        }
         MUTATE_END( Statement, node );
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( BranchStmt * node ) {
+        VISIT_BODY( node );
+        VISIT_START( node );
+        VISIT_END( node );
+}
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( BranchStmt * node ) {
+        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+        MUTATE_END( Statement, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ThrowStmt * node ) {
+        VISIT_BODY( 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_BODY( Statement, node );
+        MUTATE_START( node );
+        maybeMutate_impl( node->expr, *this );
+        maybeMutate_impl( node->target, *this );
+        MUTATE_END( Statement, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( FinallyStmt * node ) {
+        VISIT_BODY( node );
+        VISIT_START( node );
+        maybeAccept_impl( node->block, *this );
+        VISIT_END( node );
+}
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( FinallyStmt * node ) {
+        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+        maybeMutate_impl( node->block, *this );
+        MUTATE_END( Statement, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( WaitForStmt * node ) {
+        VISIT_BODY( 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_BODY( Statement, node );
+        MUTATE_START( node );
+        for( auto & clause : node->clauses ) {
+                maybeMutate_impl( clause.target.function, *this );
+                maybeMutate_impl( clause.target.arguments, *this );
+                maybeMutate_impl( clause.statement, *this );
+                maybeMutate_impl( clause.condition, *this );
+        }
+        maybeMutate_impl( node->timeout.time, *this );
+        maybeMutate_impl( node->timeout.statement, *this );
+        maybeMutate_impl( node->timeout.condition, *this );
+        maybeMutate_impl( node->orelse.statement, *this );
+        maybeMutate_impl( node->orelse.condition, *this );
+        MUTATE_END( Statement, node );
+}
 …
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 indexerAddWith( node );
+                indexerAddWith( node->exprs, node );
                 maybeAccept_impl( node->stmt, *this );
+        }
 …
                 // catch statements introduce a level of scope (for the caught exception)
                 auto guard = makeFuncGuard( [this]() { indexerScopeEnter(); }, [this]() { indexerScopeLeave(); } );
                 indexerAddWith( node );
+                indexerAddWith( node->exprs, node );
                 maybeMutate_impl( node->stmt, *this );
+        }
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( NullStmt * node ) {
+        VISIT_BODY( node );
+        VISIT_START( node );
+        VISIT_END( node );
+}
 template< typename pass_type >
 NullStmt * PassVisitor< pass_type >::mutate( NullStmt * node ) {
+        MUTATE_BODY( NullStmt, node );
+        MUTATE_START( node );
+        MUTATE_END( NullStmt, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( DeclStmt * node ) {
+        VISIT_BODY( node );
+        VISIT_START( node );
+        maybeAccept_impl( node->decl, *this );
+        VISIT_END( node );
+}
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( DeclStmt * node ) {
+        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+        maybeMutate_impl( node->decl, *this );
+        MUTATE_END( Statement, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ImplicitCtorDtorStmt * node ) {
+        VISIT_BODY( node );
+        VISIT_START( node );
+        maybeAccept_impl( node->callStmt, *this );
+        VISIT_END( node );
+}
 template< typename pass_type >
 Statement * PassVisitor< pass_type >::mutate( ImplicitCtorDtorStmt * node ) {
+        MUTATE_BODY( Statement, node );
+        MUTATE_START( node );
+        maybeMutate_impl( node->callStmt, *this );
+        MUTATE_END( Statement, node );
+}
 …
 template< typename pass_type >
 Expression * PassVisitor< pass_type >::mutate( CastExpr * node ) {
+        MUTATE_START( node );
+        indexerScopedMutate( node->env   , *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl   ( node->arg   , *this );
+        MUTATE_END( Expression, node );
+}
+//--------------------------------------------------------------------------
+// KeywordCastExpr
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( 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->type  , *this );
-        maybeAccept_impl   ( node->member, *this );
         VISIT_END( node );
 …
         indexerScopedMutate( node->result, *this );
         maybeMutate_impl   ( node->type  , *this );
-        maybeMutate_impl   ( node->member, *this );
         MUTATE_END( Expression, node );
 …
+}
+//--------------------------------------------------------------------------
+// UntypedInitExpr
+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 >
+Expression * PassVisitor< pass_type >::mutate( UntypedInitExpr * node ) {
+        MUTATE_START( node );
+        indexerScopedMutate( node->env   , *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl   ( node->expr  , *this );
+        // not currently visiting initAlts, but this doesn't matter since this node is only used in the resolver.
+        MUTATE_END( Expression, node );
+}
+//--------------------------------------------------------------------------
+// InitExpr
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( 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 );
+        indexerScopedMutate( node->env   , *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl   ( node->expr  , *this );
+        maybeMutate_impl   ( node->designation, *this );
+        MUTATE_END( Expression, node );
+}
+//--------------------------------------------------------------------------
+// DeletedExpr
+template< typename pass_type >
+void PassVisitor< pass_type >::visit( 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.
+        VISIT_END( node );
+}
+template< typename pass_type >
+Expression * PassVisitor< pass_type >::mutate( DeletedExpr * node ) {
+        MUTATE_START( node );
+        indexerScopedMutate( node->env, *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl( node->expr, *this );
+        MUTATE_END( Expression, node );
+}
+//--------------------------------------------------------------------------
+// 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 >
+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 >
+void PassVisitor< pass_type >::visit( GenericExpr * node ) {
+        VISIT_START( node );
+        indexerScopedAccept( node->result, *this );
+        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 >
+Expression * PassVisitor< pass_type >::mutate( GenericExpr * node ) {
+        MUTATE_START( node );
+        indexerScopedMutate( node->env, *this );
+        indexerScopedMutate( node->result, *this );
+        maybeMutate_impl( node->control, *this );
+        for ( GenericExpr::Association & assoc : node->associations ) {
+                indexerScopedMutate( assoc.type, *this );
+                maybeMutate_impl( assoc.expr, *this );
+        }
+        MUTATE_END( Expression, node );
+}
+//--------------------------------------------------------------------------
+// VoidType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VoidType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// BasicType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( BasicType * node ) {
+        VISIT_BODY( node );
+}
+        VISIT_START( node );
+        maybeAccept_impl( node->forall, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( BasicType * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->forall, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// PointerType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( PointerType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        // xxx - should PointerType visit/mutate dimension?
+        maybeMutate_impl( node->base, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// ArrayType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ArrayType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->dimension, *this );
+        maybeMutate_impl( node->base, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// ReferenceType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ReferenceType * node ) {
+        VISIT_BODY( 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 >
+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 );
+}
+//--------------------------------------------------------------------------
+// FunctionType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( FunctionType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->returnVals, *this );
+        maybeMutate_impl( node->parameters, *this );
+        MUTATE_END( Type, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( EnumInstType * node ) {
+        VISIT_BODY( 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_BODY( Type, node );
+        MUTATE_START( node );
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->parameters, *this );
+        MUTATE_END( Type, node );
+}
 …
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeInstType * node ) {
+        VISIT_BODY( 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( TypeInstType * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->forall    , *this );
+        maybeMutate_impl( node->parameters, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// TupleType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TupleType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        maybeMutate_impl( node->types, *this );
+        maybeMutate_impl( node->members, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// TypeofType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( TypeofType * node ) {
+        VISIT_BODY( node );
+}
+        VISIT_START( node );
+        assert( node->expr );
+        maybeAccept_impl( node->expr, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( TypeofType * node ) {
+        MUTATE_START( node );
+        assert( node->expr );
+        maybeMutate_impl( node->expr, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// AttrType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( AttrType * node ) {
+        VISIT_BODY( 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 );
+        if ( node->isType ) {
+                assert( node->type );
+                maybeMutate_impl( node->type, *this );
+        } else {
+                assert( node->expr );
+                maybeMutate_impl( node->expr, *this );
+        } // if
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// VarArgsType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VarArgsType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// ZeroType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ZeroType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// OneType
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( OneType * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->forall, *this );
+        MUTATE_END( Type, 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 >
+Type * PassVisitor< pass_type >::mutate( GlobalScopeType * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->forall, *this );
+        MUTATE_END( Type, node );
+}
+//--------------------------------------------------------------------------
+// Designation
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Designation * node ) {
         VISIT_START( node );
         maybeAccept_impl( node->get_designators(), *this );
+        maybeAccept_impl( node->designators, *this );
         VISIT_END( node );
 …
         MUTATE_START( node );
         maybeMutate_impl( node->get_designators(), *this );
+        maybeMutate_impl( node->designators, *this );
         MUTATE_END( Designation, node );
 …
         VISIT_START( node );
         visitExpression( node->get_value() );
+        visitExpression( node->value );
         VISIT_END( node );
 …
         MUTATE_START( node );
         node->set_value( mutateExpression( node->get_value() ) );
+        node->value = mutateExpression( node->value );
         MUTATE_END( Initializer, node );
+}
+//--------------------------------------------------------------------------
+// ListInit
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ListInit * node ) {
+        VISIT_BODY( node );
+}
+        VISIT_START( node );
+        maybeAccept_impl( node->designations, *this );
+        maybeAccept_impl( node->initializers, *this );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Initializer * PassVisitor< pass_type >::mutate( ListInit * node ) {
+        MUTATE_START( node );
+        maybeMutate_impl( node->designations, *this );
+        maybeMutate_impl( node->initializers, *this );
+        MUTATE_END( Initializer, node );
+}
+//--------------------------------------------------------------------------
+// ConstructorInit
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( ConstructorInit * node ) {
+        VISIT_BODY( 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 );
+        maybeMutate_impl( node->ctor, *this );
+        maybeMutate_impl( node->dtor, *this );
+        maybeMutate_impl( node->init, *this );
+        MUTATE_END( Initializer, node );
+}
+//--------------------------------------------------------------------------
+// Subrange
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Subrange * node ) {
+        VISIT_BODY( 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 >
 void PassVisitor< pass_type >::visit( Constant * node ) {
+        VISIT_BODY( node );
+}
+        VISIT_START( node );
+        VISIT_END( node );
+}
+template< typename pass_type >
+Constant * PassVisitor< pass_type >::mutate( Constant * node  )  {
+        MUTATE_START( node );
+        MUTATE_END( Constant, node );
+}
+//--------------------------------------------------------------------------
+// Attribute
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( Attribute * node ) {
+        VISIT_BODY( node );
+}
+//---------------------------------------------------------------------------------------------------------------
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( VoidType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( BasicType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( PointerType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( ArrayType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( ReferenceType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( FunctionType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( TypeInstType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( TupleType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( TypeofType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( AttrType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( VarArgsType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( ZeroType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Type * PassVisitor< pass_type >::mutate( OneType * node ) {
+        MUTATE_BODY( Type, node );
+}
+template< typename pass_type >
+Initializer * PassVisitor< pass_type >::mutate( ListInit * node ) {
+        MUTATE_BODY( Initializer, node );
+}
+template< typename pass_type >
+Initializer * PassVisitor< pass_type >::mutate( ConstructorInit * node ) {
+        MUTATE_BODY( Initializer, node );
+}
+template< typename pass_type >
+Subrange * PassVisitor< pass_type >::mutate( Subrange * node  )  {
+        MUTATE_BODY( Subrange, node );
+}
+template< typename pass_type >
+Constant * PassVisitor< pass_type >::mutate( Constant * node  )  {
+        MUTATE_BODY( Constant, node );
+        VISIT_START( node );
+        maybeAccept_impl( node->parameters, *this );
+        VISIT_END( node );
+}
 template< typename pass_type >
 Attribute * PassVisitor< pass_type >::mutate( Attribute * node  )  {
+        MUTATE_BODY( Attribute, node );
+}
+        MUTATE_START( node );
+        maybeMutate_impl( node->parameters, *this );
+        MUTATE_END( Attribute, node );
+}
+//--------------------------------------------------------------------------
+// TypeSubstitution
 template< typename pass_type >
 TypeSubstitution * PassVisitor< pass_type >::mutate( TypeSubstitution * node ) {

src/Common/PassVisitor.proto.h

-              rf9feab8
+              r90152a4
         operator bool() { return m_ref ? *m_ref : true; }
         bool operator=( bool val ) { return *m_ref = val; }
+        bool operator=( bool val ) { assert(m_ref); return *m_ref = val; }
 private:
 …
         friend class ChildrenGuard;
         bool * set( bool & val ) {
+        bool * set( bool * val ) {
                 bool * prev = m_ref;
                 m_ref = &val;
+                m_ref = val;
                 return prev;
+        }
 …
         ChildrenGuard( bool_ref * ref )
                 : m_val ( true )
                 , m_prev( ref ? ref->set( m_val ) : nullptr )
+                , m_prev( ref ? ref->set( &m_val ) : nullptr )
                 , m_ref ( ref )
         {}
 …
         ~ChildrenGuard() {
                 if( m_ref ) {
                         m_ref->set( *m_prev );
+                        m_ref->set( m_prev );
+                }
+        }
 …
 #define INDEXER_FUNC( func, type )                                                                                             \
+#define INDEXER_FUNC1( func, type )                                                                                             \
 template<typename pass_type>                                                                                                   \
 static inline auto indexer_impl_##func ( pass_type & pass, int, type arg ) -> decltype( pass.indexer.func( arg ), void() ) {   \
 …
 static inline void indexer_impl_##func ( pass_type &, long, type ) { }                                                          \
+INDEXER_FUNC( addId     , DeclarationWithType * );
+INDEXER_FUNC( addType   , NamedTypeDecl *       );
+INDEXER_FUNC( addStruct , StructDecl *          );
+INDEXER_FUNC( addEnum   , EnumDecl *            );
+INDEXER_FUNC( addUnion  , UnionDecl *           );
+INDEXER_FUNC( addTrait  , TraitDecl *           );
+INDEXER_FUNC( addWith   , WithStmt *            );
+#define INDEXER_FUNC2( func, type1, type2 )                                                                                             \
+template<typename pass_type>                                                                                                   \
+static inline auto indexer_impl_##func ( pass_type & pass, int, type1 arg1, type2 arg2 ) -> decltype( pass.indexer.func( arg1, arg2 ), void() ) {   \
+        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 * );

src/Common/ScopedMap.h

-              rf9feab8
+              r90152a4
 // Created On       : Wed Dec 2 11:37:00 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Jul 21 22:18:24 2017
 // Update Count     : 2
+// Last Modified On : Mon May 21 15:22:40 2018
+// Update Count     : 3
 //
 …
 #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 ) );
+        }
+        template< typename value_t >
+        std::pair< iterator, bool > insertAt( size_type scope, const Key& key, value_t&& value ) {
+                return insertAt( scope, std::make_pair( key, std::forward<value_t>( value ) ) );
+        }
 …
         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.cc

-              rf9feab8
+              r90152a4
 // SemanticError.cc --
 //
 // Author           : Richard C. Bilson
+// Author           : Thierry Delisle
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Aug 29 18:17:35 2017
 // Update Count     : 3
+// Last Modified On : Thu Jun  7 08:05:26 2018
+// Update Count     : 10
 //
+#include <cstdarg>
 #include <cstdio>                                                                               // for fileno, stderr
+#include <cstring>
 #include <unistd.h>                                                                             // for isatty
 #include <iostream>                                                                             // for basic_ostream, operator<<, ostream
 #include <list>                                                                                 // for list, _List_iterator
 #include <string>                                                                               // for string, operator<<, operator+, to_string
+#include <vector>
 #include "Common/utility.h"                                                             // for to_string, CodeLocation (ptr only)
 #include "SemanticError.h"
+SemanticError::SemanticError() {
+//-----------------------------------------------------------------------------
+// Severity Handling
+std::vector<Severity> & get_severities() {
+        static std::vector<Severity> severities;
+        if(severities.empty()) {
+                severities.reserve((size_t)Warning::NUMBER_OF_WARNINGS);
+                for ( const auto w : WarningFormats ) {
+                        severities.push_back( w.default_severity );
+                } // for
+        }
+        return severities;
+}
+SemanticError::SemanticError( std::string error ) {
+        append( error );
+void SemanticWarning_SuppressAll() {
+        for( auto & s : get_severities() ) {
+                s = Severity::Suppress;
+        }
+}
+void SemanticError::append( SemanticError &other ) {
+void SemanticWarning_EnableAll() {
+        for( auto & s : get_severities() ) {
+                s = Severity::Warn;
+        }
+}
+void SemanticWarning_WarningAsError() {
+        for( auto & s : get_severities() ) {
+                if(s == Severity::Warn) s = Severity::Error;
+        }
+}
+void SemanticWarning_Set(const char * const name, Severity s) {
+        size_t idx = 0;
+        for ( const auto & w : WarningFormats ) {
+                if ( std::strcmp( name, w.name ) == 0 ) {
+                        get_severities()[idx] = s;
+                        break;
+                }
+                idx++;
+        }
+}
+//-----------------------------------------------------------------------------
+// Semantic Error
+bool SemanticErrorThrow = false;
+SemanticErrorException::SemanticErrorException( CodeLocation location, std::string error ) {
+        append( location, error );
+}
+void SemanticErrorException::append( SemanticErrorException &other ) {
         errors.splice( errors.end(), other.errors );
+}
 void SemanticError::append( const std::string & msg ) {
         errors.emplace_back( error_str() + msg );
+void SemanticErrorException::append( CodeLocation location, const std::string & msg ) {
+        errors.emplace_back( location, msg );
+}
 bool SemanticError::isEmpty() const {
+bool SemanticErrorException::isEmpty() const {
         return errors.empty();
+}
 void SemanticError::print( std::ostream &os ) {
+void SemanticErrorException::print() {
         using std::to_string;
         for( auto err : errors ) {
                 os << err.location << err.description << std::endl;
+                std::cerr << ErrorHelpers::bold() << err.location << ErrorHelpers::error_str() << ErrorHelpers::reset_font() << err.description << std::endl;
+        }
+}
+void SemanticError::set_location( const CodeLocation& location ) {
+        errors.begin()->maybeSet( location );
+void SemanticError( CodeLocation location, std::string error ) {
+        SemanticErrorThrow = true;
+        throw SemanticErrorException( location, error );
+}
+namespace {
+        // convert format string and arguments into a single string
+        std::string fmtToString(const char * fmt, va_list ap) {
+                int size = 128;
+                while ( true ) {
+                        char buf[size];
+                        va_list args;
+                        va_copy( args, ap );
+                        int n = vsnprintf(&buf[0], size, fmt, args);
+                        va_end( args );
+                        if ( n < size && n >= 0 ) return buf;
+                        size *= 2;
+                }
+                assert( false );
+        }
+}
+void SemanticWarningImpl( CodeLocation location, Warning warning, const char * const fmt, ... ) {
+        Severity severity = get_severities()[(int)warning];
+        switch(severity) {
+        case Severity::Suppress :
+                break;
+        case Severity::Warn :
+                {
+                        va_list args;
+                        va_start(args, fmt);
+                        std::string msg = fmtToString( fmt, args );
+                        va_end(args);
+                        std::cerr << ErrorHelpers::bold() << location << ErrorHelpers::warning_str() << ErrorHelpers::reset_font() << msg << std::endl;
+                }
+                break;
+        case Severity::Error :
+                {
+                        va_list args;
+                        va_start(args, fmt);
+                        std::string msg = fmtToString( fmt, args );
+                        va_end(args);
+                        SemanticError(location, msg);
+                }
+                break;
+        case Severity::Critical :
+                assertf(false, "Critical errors not implemented yet");
+                break;
+        }
+}
+//-----------------------------------------------------------------------------
+// Helpers
+namespace ErrorHelpers {
+        const std::string & error_str() {
+                static std::string str = isatty( STDERR_FILENO ) ? "\e[31merror:\e[39m " : "error: ";
+                return str;
+        }
+        const std::string & warning_str() {
+                static std::string str = isatty( STDERR_FILENO ) ? "\e[95mwarning:\e[39m " : "warning: ";
+                return str;
+        }
+        const std::string & bold_ttycode() {
+                static std::string str = isatty( STDERR_FILENO ) ? "\e[1m" : "";
+                return str;
+        }
+        const std::string & reset_font_ttycode() {
+                static std::string str = isatty( STDERR_FILENO ) ? "\e[0m" : "";
+                return str;
+        }
+        std::string make_bold( const std::string & str ) {
+                return bold_ttycode() + str + reset_font_ttycode();
+        }
+        std::ostream & operator<<(std::ostream & os, bold) {
+                os << bold_ttycode();
+                return os;
+        }
+        std::ostream & operator<<(std::ostream & os, reset_font) {
+                os << reset_font_ttycode();
+                return os;
+        }
+}

src/Common/SemanticError.h

-              rf9feab8
+              r90152a4
 // SemanticError.h --
 //
 // Author           : Richard C. Bilson
+// Author           : Thierry Delisle
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Aug 29 22:03:36 2017
 // Update Count     : 17
+// Last Modified On : Thu Jul 19 10:09:17 2018
+// Update Count     : 31
 //
 #pragma once
+#include <exception>                                                                    // for exception
+#include <iostream>                                                                             // for ostream
+#include <list>                                                                                 // for list
+#include <string>                                                                               // for string
+#include <unistd.h>                                                                             // for isatty
+#include "ErrorObjects.h"
+#include <cstring>
+#include "CodeLocation.h"                                                               // for CodeLocation, toString
+//-----------------------------------------------------------------------------
+// Errors
+struct error {
+        std::string description;
+        CodeLocation location;
+extern bool SemanticErrorThrow;
+        error() = default;
+        error( const std::string & str ) : description( str ) {}
+__attribute__((noreturn)) void SemanticError( CodeLocation location, std::string error );
+        void maybeSet( const CodeLocation & location ) {
+                if( this->location.isUnset() ) {
+                        this->location = location;
+                }
+        }
+template< typename T >
+__attribute__((noreturn)) static inline void SemanticError( const T * obj, const std::string & error ) {
+        SemanticError( obj->location, toString( error, obj ) );
+}
+template< typename T >
+__attribute__((noreturn)) static inline void SemanticError( CodeLocation location, const T * obj, const std::string & error ) {
+        SemanticError( location, toString( error, obj ) );
+}
+//-----------------------------------------------------------------------------
+// Warnings
+enum class Severity {
+        Suppress,
+        Warn,
+        Error,
+        Critical
 };
+class SemanticError : public std::exception {
+  public:
+        SemanticError();
+        SemanticError( std::string error );
+        template< typename T > SemanticError( const std::string & error, const T * obj );
+        ~SemanticError() throw() {}
+        static inline const std::string & error_str() {
+                static std::string str = isatty( STDERR_FILENO ) ? "\e[31merror:\e[39m " : "error: ";
+                return str;
+        }
+        void append( SemanticError & other );
+        void append( const std::string & );
+        bool isEmpty() const;
+        void print( std::ostream & os );
+        void set_location( const CodeLocation & location );
+        // constructs an exception using the given message and the printed representation of the obj (T must have a print
+        // method)
+  private:
+        std::list< error > errors;
+struct WarningData {
+        const char * const name;
+        const char * const message;
+        const Severity default_severity;
 };
+template< typename T >
+SemanticError::SemanticError( const std::string & error, const T * obj ) {
+        append( toString( error, obj ) );
+constexpr WarningData WarningFormats[] = {
+        {"self-assign"            , "self assignment of expression: %s"            , Severity::Warn},
+        {"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},
+};
+enum class Warning {
+        SelfAssignment,
+        RvalueToReferenceConversion,
+        BadQualifiersZeroOne,
+        AggrForwardDecl,
+        SuperfluousDecl,
+        GccAttributes,
+        NUMBER_OF_WARNINGS, // This MUST be the last warning
+};
+static_assert(
+        (sizeof(WarningFormats) / sizeof(WarningFormats[0])) == ((unsigned long)Warning::NUMBER_OF_WARNINGS),
+        "Each warning format should have a corresponding warning enum value"
+);
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, __VA_ARGS__)
+void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));
+void SemanticWarning_SuppressAll   ();
+void SemanticWarning_EnableAll     ();
+void SemanticWarning_WarningAsError();
+void SemanticWarning_Set           (const char * const name, Severity s);
+// SKULLDUGGERY: cfa.cc is built before SemanticError.cc but needs this routine.
+static inline bool SemanticWarning_Exist(const char * const name) {
+        for ( const auto & w : WarningFormats ) {
+                if ( std::strcmp( name, w.name ) == 0 ) return true;
+        }
+        return false;
+}
+//-----------------------------------------------------------------------------
+// Helpers
+namespace ErrorHelpers {
+        const std::string & error_str();
+        const std::string & warning_str();
+        const std::string & bold_ttycode();
+        const std::string & reset_font_ttycode();
+        std::string make_bold( const std::string & str );
+        struct bold {};
+        std::ostream & operator<<(std::ostream & os, bold);
+        struct reset_font {};
+        std::ostream & operator<<(std::ostream & os, reset_font);
+}

src/Common/module.mk

-              rf9feab8
+              r90152a4
 ## file "LICENCE" distributed with Cforall.
 ##
 ## module.mk --
+## module.mk --
 ##
 ## Author           : Richard C. Bilson
 …
        Common/UniqueName.cc \
        Common/DebugMalloc.cc \
+       Common/Assert.cc
+       Common/Assert.cc \
+       Common/Heap.cc \
+       Common/Eval.cc

src/Common/utility.h

-              rf9feab8
+              r90152a4
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Thr Aug 17 11:38:00 2017
 // Update Count     : 34
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sun May  6 22:24:16 2018
+// Update Count     : 40
 //
 …
 #include "Common/Indenter.h"
+class Expression;
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
 …
+}
+template< typename SrcContainer, typename DestContainer, typename Predicate >
+void cloneAll_if( const SrcContainer &src, DestContainer &dest, Predicate pred ) {
+        std::back_insert_iterator< DestContainer > out( dest );
+        for ( auto x : src ) {
+                if ( pred(x) ) {
+                        *out++ = x->clone();
+                }
+        } // while
+}
 template< typename Container >
 void assertAll( const Container &container ) {
 …
         return os.str();
+}
+#define toCString( ... ) toString( __VA_ARGS__ ).c_str()
 // replace element of list with all elements of another list
 …
+}
+// -----------------------------------------------------------------------------
+// O(1) polymorphic integer ilog2, using clz, which returns the number of leading 0-bits, starting at the most
+// significant bit (single instruction on x86)
+template<typename T>
+inline
+#if defined(__GNUC__) && __GNUC__ > 4
+constexpr
+#endif
+T ilog2(const T & t) {
+        if(std::is_integral<T>::value) {
+                const constexpr int r = sizeof(t) * __CHAR_BIT__ - 1;
+                if( sizeof(T) == sizeof(unsigned       int) ) return r - __builtin_clz  ( t );
+                if( sizeof(T) == sizeof(unsigned      long) ) return r - __builtin_clzl ( t );
+                if( sizeof(T) == sizeof(unsigned long long) ) return r - __builtin_clzll( t );
+        }
+        assert(false);
+        return -1;
+} // ilog2
+// -----------------------------------------------------------------------------
+/// evaluates expr as a long long int. If second is false, expr could not be evaluated
+std::pair<long long int, bool> eval(Expression * expr);
 // Local Variables: //

src/Concurrency/Keywords.cc

-              rf9feab8
+              r90152a4
 #include "InitTweak/InitTweak.h"   // for getPointerBase
 #include "Parser/LinkageSpec.h"    // for Cforall
-#include "SymTab/AddVisit.h"       // for acceptAndAdd
 #include "SynTree/Constant.h"      // for Constant
 #include "SynTree/Declaration.h"   // for StructDecl, FunctionDecl, ObjectDecl
 …
           public:
                 ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main ) :
                   type_name( type_name ), field_name( field_name ), getter_name( getter_name ), context_error( context_error ), needs_main( needs_main ) {}
+                ConcurrentSueKeyword( std::string&& type_name, std::string&& field_name, std::string&& getter_name, std::string&& context_error, bool needs_main, KeywordCastExpr::Target cast_target ) :
+                  type_name( type_name ), field_name( field_name ), getter_name( getter_name ), context_error( context_error ), needs_main( needs_main ), cast_target( cast_target ) {}
                 virtual ~ConcurrentSueKeyword() {}
                 void postvisit( StructDecl * decl );
+                Declaration * postmutate( StructDecl * decl );
                 void handle( StructDecl * );
 …
                 virtual bool is_target( StructDecl * decl ) = 0;
+                Expression * postmutate( KeywordCastExpr * cast );
           private:
 …
                 const std::string context_error;
                 bool needs_main;
+                KeywordCastExpr::Target cast_target;
                 StructDecl* type_decl = nullptr;
 …
                         "__thrd",
                         "get_thread",
+                        "thread keyword requires threads to be in scope, add #include <thread>",
+                        true
+                        "thread keyword requires threads to be in scope, add #include <thread.hfa>",
+                        true,
+                        KeywordCastExpr::Thread
+                )
                 {}
 …
                 static void implement( std::list< Declaration * > & translationUnit ) {
                         PassVisitor< ThreadKeyword > impl;
                         acceptAll( translationUnit, impl );
+                        mutateAll( translationUnit, impl );
+                }
         };
 …
                         "__cor",
                         "get_coroutine",
+                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine>",
+                        true
+                        "coroutine keyword requires coroutines to be in scope, add #include <coroutine.hfa>",
+                        true,
+                        KeywordCastExpr::Coroutine
+                )
                 {}
 …
                 static void implement( std::list< Declaration * > & translationUnit ) {
                         PassVisitor< CoroutineKeyword > impl;
                         acceptAll( translationUnit, impl );
+                        mutateAll( translationUnit, impl );
+                }
         };
 …
                         "__mon",
                         "get_monitor",
+                        "monitor keyword requires monitors to be in scope, add #include <monitor>",
+                        false
+                        "monitor keyword requires monitors to be in scope, add #include <monitor.hfa>",
+                        false,
+                        KeywordCastExpr::Monitor
+                )
                 {}
 …
                 static void implement( std::list< Declaration * > & translationUnit ) {
                         PassVisitor< MonitorKeyword > impl;
                         acceptAll( translationUnit, impl );
+                        mutateAll( translationUnit, impl );
+                }
         };
 …
                 void postvisit(   StructDecl * decl );
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
+                std::list<DeclarationWithType*> findMutexArgs( FunctionDecl*, bool & first );
                 void validate( DeclarationWithType * );
                 void addDtorStatments( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
 …
         // Generic keyword implementation
         //=============================================================================================
+        void ConcurrentSueKeyword::postvisit(StructDecl * decl) {
+        void fixupGenerics(FunctionType * func, StructDecl * decl) {
+                cloneAll(decl->parameters, func->forall);
+                for ( TypeDecl * td : func->forall ) {
+                        strict_dynamic_cast<StructInstType*>(
+                                func->parameters.front()->get_type()->stripReferences()
+                        )->parameters.push_back(
+                                new TypeExpr( new TypeInstType( noQualifiers, td->name, td ) )
+                        );
+                }
+        }
+        Declaration * ConcurrentSueKeyword::postmutate(StructDecl * decl) {
                 if( decl->name == type_name && decl->body ) {
                         assert( !type_decl );
 …
                         handle( decl );
+                }
+        }
+                return decl;
+        }
+        Expression * ConcurrentSueKeyword::postmutate( KeywordCastExpr * cast ) {
+                if ( cast_target == cast->target ) {
+                        // convert (thread &)t to (thread_desc &)*get_thread(t), etc.
+                        if( !type_decl ) SemanticError( cast, context_error );
+                        Expression * arg = cast->arg;
+                        cast->arg = nullptr;
+                        delete cast;
+                        return new CastExpr(
+                                UntypedExpr::createDeref(
+                                        new UntypedExpr( new NameExpr( getter_name ), { arg } )
+                                ),
+                                new ReferenceType(
+                                        noQualifiers,
+                                        new StructInstType( noQualifiers, type_decl ) )
+                                );
+                }
+                return cast;
+        }
         void ConcurrentSueKeyword::handle( StructDecl * decl ) {
                 if( ! decl->body ) return;
                 if( !type_decl ) throw SemanticError( context_error, decl );
+                if( !type_decl ) SemanticError( decl, context_error );
                 FunctionDecl * func = forwardDeclare( decl );
 …
                 );
                 get_type->get_parameters().push_back( this_decl );
+                get_type->get_parameters().push_back( this_decl->clone() );
                 get_type->get_returnVals().push_back(
                         new ObjectDecl(
 …
+                        )
                 );
+                fixupGenerics(get_type, decl);
                 FunctionDecl * get_decl = new FunctionDecl(
 …
                                 nullptr
                         );
+                }
+                        fixupGenerics(main_type, decl);
+                }
+                delete this_decl;
                 declsToAddBefore.push_back( forward );
 …
                                         new MemberExpr(
                                                 field,
+                                                UntypedExpr::createDeref( new VariableExpr( func->get_functionType()->get_parameters().front() ) )
+                                                new CastExpr(
+                                                        new VariableExpr( func->get_functionType()->get_parameters().front() ),
+                                                        func->get_functionType()->get_parameters().front()->get_type()->stripReferences()->clone()
+                                                )
+                                        )
+                                )
 …
         void MutexKeyword::postvisit(FunctionDecl* decl) {
+                std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl );
+                if( mutexArgs.empty() ) return;
+                if( CodeGen::isConstructor(decl->name) ) throw SemanticError( "constructors cannot have mutex parameters", decl );
+                bool first = false;
+                std::list<DeclarationWithType*> mutexArgs = findMutexArgs( decl, first );
                 bool isDtor = CodeGen::isDestructor( decl->name );
+                if( isDtor && mutexArgs.size() != 1 ) throw SemanticError( "destructors can only have 1 mutex argument", decl );
+                // Is this function relevant to monitors
+                if( mutexArgs.empty() ) {
+                        // If this is the destructor for a monitor it must be mutex
+                        if(isDtor) {
+                                Type* ty = decl->get_functionType()->get_parameters().front()->get_type();
+                                // If it's a copy, it's not a mutex
+                                ReferenceType* rty = dynamic_cast< ReferenceType * >( ty );
+                                if( ! rty ) return;
+                                // If we are not pointing directly to a type, it's not a mutex
+                                Type* base = rty->get_base();
+                                if( dynamic_cast< ReferenceType * >( base ) ) return;
+                                if( dynamic_cast< PointerType * >( base ) ) return;
+                                // Check if its a struct
+                                StructInstType * baseStruct = dynamic_cast< StructInstType * >( base );
+                                if( !baseStruct ) return;
+                                // Check if its a monitor
+                                if(baseStruct->baseStruct->is_monitor() || baseStruct->baseStruct->is_thread())
+                                        SemanticError( decl, "destructors for structures declared as \"monitor\" must use mutex parameters\n" );
+                        }
+                        return;
+                }
+                // Monitors can't be constructed with mutual exclusion
+                if( CodeGen::isConstructor(decl->name) && !first ) SemanticError( decl, "constructors cannot have mutex parameters" );
+                // It makes no sense to have multiple mutex parameters for the destructor
+                if( isDtor && mutexArgs.size() != 1 ) SemanticError( decl, "destructors can only have 1 mutex argument" );
+                // Make sure all the mutex arguments are monitors
                 for(auto arg : mutexArgs) {
                         validate( arg );
+                }
+                // Check if we need to instrument the body
                 CompoundStmt* body = decl->get_statements();
                 if( ! body ) return;
+                if( !monitor_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
+                if( !guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
+                if( !dtor_guard_decl ) throw SemanticError( "mutex keyword requires monitors to be in scope, add #include <monitor>", decl );
+                // 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.hfa>\n" );
+                // Instrument the body
                 if( isDtor ) {
                         addDtorStatments( decl, body, mutexArgs );
 …
         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;
 …
+        }
         std::list<DeclarationWithType*> MutexKeyword::findMutexArgs( FunctionDecl* decl ) {
+        std::list<DeclarationWithType*> MutexKeyword::findMutexArgs( FunctionDecl* decl, bool & first ) {
                 std::list<DeclarationWithType*> mutexArgs;
+                bool once = true;
                 for( auto arg : decl->get_functionType()->get_parameters()) {
                         //Find mutex arguments
 …
                         if( ! ty->get_mutex() ) continue;
+                        if(once) {first = true;}
+                        once = false;
                         //Append it to the list
                         mutexArgs.push_back( arg );
 …
                 //Makes sure it's not a copy
                 ReferenceType* rty = dynamic_cast< ReferenceType * >( ty );
                 if( ! rty ) throw SemanticError( "Mutex argument must be of reference type ", arg );
+                if( ! rty ) SemanticError( arg, "Mutex argument must be of reference type " );
                 //Make sure the we are pointing directly to a type
                 Type* base = rty->get_base();
                 if( dynamic_cast< ReferenceType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg );
                 if( dynamic_cast< PointerType * >( base ) ) throw SemanticError( "Mutex argument have exactly one level of indirection ", arg );
+                if( dynamic_cast< ReferenceType * >( base ) ) SemanticError( arg, "Mutex argument have exactly one level of indirection " );
+                if( dynamic_cast< PointerType * >( base ) ) SemanticError( arg, "Mutex argument have exactly one level of indirection " );
                 //Make sure that typed isn't mutex
                 if( base->get_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
+                if( base->get_mutex() ) SemanticError( arg, "mutex keyword may only appear once per argument " );
+        }
 …
                 if( type && type->get_baseStruct()->is_thread() ) {
                         if( !thread_decl || !thread_ctor_seen ) {
                                 throw SemanticError("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

-              rf9feab8
+              r90152a4
         Statement * GenerateWaitForPass::postmutate( WaitForStmt * waitfor ) {
+                if( !decl_monitor || !decl_acceptable || !decl_mask ) throw SemanticError( "waitfor keyword requires monitors to be in scope, add #include <monitor>", waitfor );
+                if( !decl_monitor || !decl_acceptable || !decl_mask )
+                        SemanticError( waitfor, "waitfor keyword requires monitors to be in scope, add #include <monitor.hfa>" );
                 CompoundStmt * stmt = new CompoundStmt();
 …
                         new ListInit({
                                 new SingleInit( new AddressExpr( new VariableExpr( index ) ) ),
+                                new SingleInit( new VariableExpr( acceptables ) ),
+                                new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                new ListInit({
+                                        new SingleInit( new VariableExpr( acceptables ) ),
+                                        new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                })
                         })
                 );

src/ControlStruct/ExceptTranslate.cc

-              rf9feab8
+              r90152a4
 #include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
 #include "SynTree/Type.h"             // for FunctionType, Type, noQualifiers
 #include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
+#include "SynTree/DeclReplacer.h"     // for DeclReplacer
 #include "SynTree/Visitor.h"          // for acceptAll
 …
                         // Update variables in the body to point to this local copy.
+                        {
+                                VarExprReplacer::DeclMap mapping;
+                                mapping[ handler_decl ] = new VariableExpr( local_except );
+                                VarExprReplacer mapper( mapping );
+                                handler->body->acceptMutator( mapper );
+                                DeclReplacer::DeclMap mapping;
+                                mapping[ handler_decl ] = local_except;
+                                DeclReplacer::replace( handler->body, mapping );
+                        }
 …
                         // Pass.
                 } else if ( CatchStmt::Terminate == catchStmt->get_kind() ) {
                         throw SemanticError("catch must have exception type");
+                        SemanticError(catchStmt->location, "catch must have exception type");
                 } else {
                         throw SemanticError("catchResume must have exception type");
+                        SemanticError(catchStmt->location, "catchResume must have exception type");
+                }

src/ControlStruct/ForExprMutator.cc

-              rf9feab8
+              r90152a4
                 return hoist( forStmt, forStmt->initialization );
+        }
+        Statement *ForExprMutator::postmutate( WhileStmt *whileStmt ) {
+                return hoist( whileStmt, whileStmt->initialization );
+        }
 } // namespace ControlStruct

src/ControlStruct/ForExprMutator.h

-              rf9feab8
+              r90152a4
 class IfStmt;
 class ForStmt;
+class WhileStmt;
 class Statement;
 …
                 Statement *postmutate( IfStmt * );
                 Statement *postmutate( ForStmt * );
+                Statement *postmutate( WhileStmt * );
         };
 } // namespace ControlStruct

src/ControlStruct/LabelFixer.cc

-              rf9feab8
+              r90152a4
         void LabelFixer::postvisit( FunctionDecl * functionDecl ) {
                 MLEMutator mlemut( resolveJumps(), generator );
+                PassVisitor<MLEMutator> mlemut( resolveJumps(), generator );
                 functionDecl->acceptMutator( mlemut );
+        }
 …
                         } else if ( labelTable[ l ]->defined() ) {
                                 // defined twice, error
                                 throw SemanticError( "Duplicate definition of label: " + l.get_name() );
+                                SemanticError( l.get_statement()->location, "Duplicate definition of label: " + l.get_name() );
                         }       else {
                                 // used previously, but undefined until now -> link with this entry
 …
         // Builds a table that maps a label to its defining statement.
         std::map<Label, Statement * > *LabelFixer::resolveJumps() throw ( SemanticError ) {
+        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 ) {
                         if ( ! i->second->defined() ) {
                                 throw SemanticError( "Use of undefined label: " + i->first.get_name() );
+                                SemanticError( i->first.get_statement()->location, "Use of undefined label: " + i->first.get_name() );
+                        }
                         (*ret)[ i->first ] = i->second->get_definition();

src/ControlStruct/LabelFixer.h

rf9feab8	r90152a4
33	33	LabelFixer( LabelGenerator *gen = 0 );
34	34
35		std::map < Label, Statement * > *resolveJumps() throw ( SemanticError );
	35	std::map < Label, Statement * > *resolveJumps() throw ( SemanticErrorException );
36	36
37	37	// Declarations

src/ControlStruct/MLEMutator.cc

-              rf9feab8
+              r90152a4
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Thu Aug  4 11:21:32 2016
 // Update Count     : 202
+// Last Modified On : Thu Mar  8 17:08:25 2018
+// Update Count     : 219
 //
 …
+        }
         namespace {
+                Statement * isLoop( Statement * stmt ) { return dynamic_cast< WhileStmt * >( stmt ) ? stmt : dynamic_cast< ForStmt * >( stmt ) ? stmt : 0; }
+        }
+                bool isLoop( const MLEMutator::Entry & e ) { return dynamic_cast< WhileStmt * >( e.get_controlStructure() ) || dynamic_cast< ForStmt * >( e.get_controlStructure() ); }
+                bool isSwitch( const MLEMutator::Entry & e ) { return dynamic_cast< SwitchStmt *>( e.get_controlStructure() ); }
+                bool isBreakTarget( const MLEMutator::Entry & e ) { return isLoop( e ) || isSwitch( e ) || dynamic_cast< CompoundStmt *>( e.get_controlStructure() ); }
+                bool isContinueTarget( const MLEMutator::Entry & e ) { return isLoop( e ); }
+                bool isFallthroughTarget( const MLEMutator::Entry & e ) { return dynamic_cast< CaseStmt *>( e.get_controlStructure() );; }
+                bool isFallthroughDefaultTarget( const MLEMutator::Entry & e ) { return isSwitch( e ); }
+        } // namespace
         // break labels have to come after the statement they break out of, so mutate a statement, then if they inform us
         // through the breakLabel field tha they need a place to jump to on a break statement, add the break label to the
         // body of statements
+        void MLEMutator::fixBlock( std::list< Statement * > &kids ) {
+        void MLEMutator::fixBlock( std::list< Statement * > &kids, bool caseClause ) {
+                SemanticErrorException errors;
                 for ( std::list< Statement * >::iterator k = kids.begin(); k != kids.end(); k++ ) {
+                        *k = (*k)->acceptMutator(*this);
+                        if ( caseClause ) {
+                                // once a label is seen, it's no longer a valid fallthrough target
+                                for ( Label & l : (*k)->labels ) {
+                                        fallthroughLabels.erase( l );
+                                }
+                        }
+                        // aggregate errors since the PassVisitor mutate loop was unrollled
+                        try {
+                                *k = (*k)->acceptMutator(*visitor);
+                        } catch( SemanticErrorException &e ) {
+                                errors.append( e );
+                        }
                         if ( ! get_breakLabel().empty() ) {
 …
                         } // if
                 } // for
+        }
+        CompoundStmt* MLEMutator::mutate( CompoundStmt *cmpndStmt ) {
+                bool labeledBlock = !(cmpndStmt->get_labels().empty());
+                if ( ! errors.isEmpty() ) {
+                        throw errors;
+                }
+        }
+        void MLEMutator::premutate( CompoundStmt *cmpndStmt ) {
+                visit_children = false;
+                bool labeledBlock = !(cmpndStmt->labels.empty());
                 if ( labeledBlock ) {
                         Label brkLabel = generator->newLabel("blockBreak", cmpndStmt);
                         enclosingControlStructures.push_back( Entry( cmpndStmt, brkLabel ) );
+                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
                 } // if
                 // a child statement may set the break label - if they do, attach it to the next statement
                 std::list< Statement * > &kids = cmpndStmt->get_kids();
+                std::list< Statement * > &kids = cmpndStmt->kids;
                 fixBlock( kids );
 …
                                 set_breakLabel( enclosingControlStructures.back().useBreakExit() );
                         } // if
+                        enclosingControlStructures.pop_back();
+                } // if
+                return cmpndStmt;
+        }
+        template< typename LoopClass >
+        Statement *MLEMutator::handleLoopStmt( LoopClass *loopStmt ) {
+                // remember this as the most recent enclosing loop, then mutate the body of the loop -- this will determine
+                // whether brkLabel and contLabel are used with branch statements and will recursively do the same to nested
+                // loops
+                Label brkLabel = generator->newLabel("loopBreak", loopStmt);
+                Label contLabel = generator->newLabel("loopContinue", loopStmt);
+                enclosingControlStructures.push_back( Entry( loopStmt, brkLabel, contLabel ) );
+                loopStmt->set_body ( loopStmt->get_body()->acceptMutator( *this ) );
+                assert( ! enclosingControlStructures.empty() );
+                Entry &e = enclosingControlStructures.back();
+                // sanity check that the enclosing loops have been popped correctly
+                assert ( e == loopStmt );
+                // this will take the necessary steps to add definitions of the previous two labels, if they are used.
+                loopStmt->set_body( mutateLoop( loopStmt->get_body(), e ) );
+                enclosingControlStructures.pop_back();
+                return loopStmt;
+        }
+        Statement *MLEMutator::mutate( CaseStmt *caseStmt ) {
+                caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
+                fixBlock( caseStmt->get_statements() );
+                return caseStmt;
+        }
+        template< typename IfClass >
+        Statement *MLEMutator::handleIfStmt( IfClass *ifStmt ) {
+                // generate a label for breaking out of a labeled if
+                bool labeledBlock = !(ifStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        Label brkLabel = generator->newLabel("blockBreak", ifStmt);
+                        enclosingControlStructures.push_back( Entry( ifStmt, brkLabel ) );
+                } // if
+                Parent::mutate( ifStmt );
+                if ( labeledBlock ) {
+                        if ( ! enclosingControlStructures.back().useBreakExit().empty() ) {
+                                set_breakLabel( enclosingControlStructures.back().useBreakExit() );
+                        } // if
+                        enclosingControlStructures.pop_back();
+                } // if
+                return ifStmt;
+        }
+        template< typename SwitchClass >
+        Statement *MLEMutator::handleSwitchStmt( SwitchClass *switchStmt ) {
+                // generate a label for breaking out of a labeled switch
+                Label brkLabel = generator->newLabel("switchBreak", switchStmt);
+                enclosingControlStructures.push_back( Entry(switchStmt, brkLabel) );
+                mutateAll( switchStmt->get_statements(), *this );
+                Entry &e = enclosingControlStructures.back();
+                assert ( e == switchStmt );
+                // only generate break label if labeled break is used
+                if ( e.isBreakUsed() ) {
+                        // for the purposes of keeping switch statements uniform (i.e. all statements that are direct children of a
+                        // switch should be CastStmts), append the exit label + break to the last case statement; create a default
+                        // case if there are no cases
+                        std::list< Statement * > &statements = switchStmt->get_statements();
+                        if ( statements.empty() ) {
+                                statements.push_back( CaseStmt::makeDefault() );
+                        } // if
+                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( statements.back() ) ) {
+                                Statement * stmt = new BranchStmt( Label("brkLabel"), BranchStmt::Break );
+                                stmt->labels.push_back( brkLabel );
+                                c->get_statements().push_back( stmt );
+                        } else assert(0); // as of this point, all statements of a switch are still CaseStmts
+                } // if
+                assert ( enclosingControlStructures.back() == switchStmt );
+                enclosingControlStructures.pop_back();
+                return switchStmt;
+        }
+                } // if
+        }
         void addUnused( Statement * stmt, const Label & originalTarget ) {
 …
         Statement *MLEMutator::mutate( BranchStmt *branchStmt ) throw ( SemanticError ) {
                 std::string originalTarget = branchStmt->get_originalTarget();
+        Statement *MLEMutator::postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException ) {
+                std::string originalTarget = branchStmt->originalTarget;
                 std::list< Entry >::reverse_iterator targetEntry;
 …
                                         if ( isContinue ) {
                                                 // continue target is outermost loop
                                                 targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), [](Entry &e) { return isLoop( e.get_controlStructure() ); } );
+                                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isContinueTarget );
                                         } else {
                                                 // break target is outmost control structure
                                                 if ( enclosingControlStructures.empty() ) throw SemanticError( "'break' outside a loop, switch, or labelled block" );
                                                 targetEntry = enclosingControlStructures.rbegin();
+                                                // break target is outermost loop, switch, or block control structure
+                                                if ( enclosingControlStructures.empty() ) SemanticError( branchStmt->location, "'break' outside a loop, 'switch', or labelled block" );
+                                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isBreakTarget );
                                         } // if
                                 } else {
 …
                                 } // if
                                 // ensure that selected target is valid
                                 if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isLoop( targetEntry->get_controlStructure() ) ) ) {
                                         throw SemanticError( toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) );
+                                if ( targetEntry == enclosingControlStructures.rend() || (isContinue && ! isContinueTarget( *targetEntry ) ) ) {
+                                        SemanticError( branchStmt->location, toString( (isContinue ? "'continue'" : "'break'"), " target must be an enclosing ", (isContinue ? "loop: " : "control structure: "), originalTarget ) );
                                 } // if
                                 break;
+                        }
+                        case BranchStmt::FallThrough:
+                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isFallthroughTarget );
+                                // ensure that selected target is valid
+                                if ( targetEntry == enclosingControlStructures.rend() ) {
+                                        SemanticError( branchStmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
+                                } // if
+                                if ( branchStmt->get_target() != "" ) {
+                                        // labelled fallthrough
+                                        // target must be in the set of valid fallthrough labels
+                                        if ( ! fallthroughLabels.count( branchStmt->get_target() ) ) {
+                                                SemanticError( branchStmt->location, toString( "'fallthrough' target must be a later case statement: ", originalTarget ) );
+                                        }
+                                        return new BranchStmt( originalTarget, BranchStmt::Goto );
+                                }
+                                break;
+                        case BranchStmt::FallThroughDefault: {
+                                // fallthrough default
+                                targetEntry = std::find_if( enclosingControlStructures.rbegin(), enclosingControlStructures.rend(), isFallthroughDefaultTarget );
+                                // ensure that fallthrough is within a switch or choose
+                                if ( targetEntry == enclosingControlStructures.rend() ) {
+                                        SemanticError( branchStmt->location, "'fallthrough' must be enclosed in a 'switch' or 'choose'" );
+                                } // if
+                                // ensure that switch or choose has a default clause
+                                SwitchStmt * switchStmt = strict_dynamic_cast< SwitchStmt * >( targetEntry->get_controlStructure() );
+                                bool foundDefault = false;
+                                for ( Statement * stmt : switchStmt->statements ) {
+                                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
+                                        if ( caseStmt->isDefault() ) {
+                                                foundDefault = true;
+                                        } // if
+                                } // for
+                                if ( ! foundDefault ) {
+                                        SemanticError( branchStmt->location, "'fallthrough default' must be enclosed in a 'switch' or 'choose' control structure with a 'default' clause" );
+                                }
+                                break;
+                        }
                         default:
                                 assert( false );
 …
                 // branch error checks, get the appropriate label name and create a goto
                 Label exitLabel;
                 switch ( branchStmt->get_type() ) {
+                switch ( branchStmt->type ) {
                   case BranchStmt::Break:
                                 assert( targetEntry->useBreakExit() != "");
 …
                                 exitLabel = targetEntry->useContExit();
                                 break;
+                  case BranchStmt::FallThrough:
+                                assert( targetEntry->useFallExit() != "");
+                                exitLabel = targetEntry->useFallExit();
+                                break;
+                  case BranchStmt::FallThroughDefault:
+                                assert( targetEntry->useFallDefaultExit() != "");
+                                exitLabel = targetEntry->useFallDefaultExit();
+                                // check that fallthrough default comes before the default clause
+                                if ( ! targetEntry->isFallDefaultValid() ) {
+                                        SemanticError( branchStmt->location, "'fallthrough default' must precede the 'default' clause" );
+                                }
+                                break;
                   default:
                                 assert(0);                                      // shouldn't be here
 …
                 // add unused attribute to label to silence warnings
                 addUnused( targetEntry->get_controlStructure(), branchStmt->get_originalTarget() );
+                addUnused( targetEntry->get_controlStructure(), branchStmt->originalTarget );
                 // transform break/continue statements into goto to simplify later handling of branches
 …
+        }
+        Statement *MLEMutator::mutate( WhileStmt *whileStmt ) {
+                return handleLoopStmt( whileStmt );
+        }
+        Statement *MLEMutator::mutate( ForStmt *forStmt ) {
+                return handleLoopStmt( forStmt );
+        }
+        Statement *MLEMutator::mutate( IfStmt *ifStmt ) {
+                return handleIfStmt( ifStmt );
+        }
+        Statement *MLEMutator::mutate( SwitchStmt *switchStmt ) {
+                return handleSwitchStmt( switchStmt );
+        template< typename LoopClass >
+        void MLEMutator::prehandleLoopStmt( LoopClass * loopStmt ) {
+                // remember this as the most recent enclosing loop, then mutate the body of the loop -- this will determine
+                // whether brkLabel and contLabel are used with branch statements and will recursively do the same to nested
+                // loops
+                Label brkLabel = generator->newLabel("loopBreak", loopStmt);
+                Label contLabel = generator->newLabel("loopContinue", loopStmt);
+                enclosingControlStructures.push_back( Entry( loopStmt, brkLabel, contLabel ) );
+                GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
+        }
+        template< typename LoopClass >
+        Statement * MLEMutator::posthandleLoopStmt( LoopClass * loopStmt ) {
+                assert( ! enclosingControlStructures.empty() );
+                Entry &e = enclosingControlStructures.back();
+                // sanity check that the enclosing loops have been popped correctly
+                assert ( e == loopStmt );
+                // this will take the necessary steps to add definitions of the previous two labels, if they are used.
+                loopStmt->body = mutateLoop( loopStmt->get_body(), e );
+                return loopStmt;
+        }
+        void MLEMutator::premutate( WhileStmt * whileStmt ) {
+                return prehandleLoopStmt( whileStmt );
+        }
+        void MLEMutator::premutate( ForStmt * forStmt ) {
+                return prehandleLoopStmt( forStmt );
+        }
+        Statement * MLEMutator::postmutate( WhileStmt * whileStmt ) {
+                return posthandleLoopStmt( whileStmt );
+        }
+        Statement * MLEMutator::postmutate( ForStmt * forStmt ) {
+                return posthandleLoopStmt( forStmt );
+        }
+        void MLEMutator::premutate( IfStmt * ifStmt ) {
+                // generate a label for breaking out of a labeled if
+                bool labeledBlock = !(ifStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        Label brkLabel = generator->newLabel("blockBreak", ifStmt);
+                        enclosingControlStructures.push_back( Entry( ifStmt, brkLabel ) );
+                        GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
+                } // if
+        }
+        Statement * MLEMutator::postmutate( IfStmt * ifStmt ) {
+                bool labeledBlock = !(ifStmt->get_labels().empty());
+                if ( labeledBlock ) {
+                        if ( ! enclosingControlStructures.back().useBreakExit().empty() ) {
+                                set_breakLabel( enclosingControlStructures.back().useBreakExit() );
+                        } // if
+                } // if
+                return ifStmt;
+        }
+        void MLEMutator::premutate( CaseStmt *caseStmt ) {
+                visit_children = false;
+                // mark default as seen before visiting its statements to catch default loops
+                if ( caseStmt->isDefault() ) {
+                        enclosingControlStructures.back().seenDefault();
+                } // if
+                caseStmt->condition = maybeMutate( caseStmt->condition, *visitor );
+                Label fallLabel = generator->newLabel( "fallThrough", caseStmt );
+                {
+                        // ensure that stack isn't corrupted by exceptions in fixBlock
+                        auto guard = makeFuncGuard( [&]() { enclosingControlStructures.push_back( Entry( caseStmt, fallLabel ) ); }, [this]() { enclosingControlStructures.pop_back(); } );
+                        // empty case statement
+                        if( ! caseStmt->stmts.empty() ) {
+                                // the parser ensures that all statements in a case are grouped into a block
+                                CompoundStmt * block = strict_dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
+                                fixBlock( block->kids, true );
+                                // add fallthrough label if necessary
+                                assert( ! enclosingControlStructures.empty() );
+                                if ( enclosingControlStructures.back().isFallUsed() ) {
+                                        std::list<Label> ls{ enclosingControlStructures.back().useFallExit() };
+                                        caseStmt->stmts.push_back( new NullStmt( ls ) );
+                                } // if
+                        } // if
+                }
+                assert( ! enclosingControlStructures.empty() );
+                assertf( dynamic_cast<SwitchStmt *>( enclosingControlStructures.back().get_controlStructure() ), "Control structure enclosing a case clause must be a switch, but is: %s", toCString( enclosingControlStructures.back().get_controlStructure() ) );
+                if ( caseStmt->isDefault() ) {
+                        if ( enclosingControlStructures.back().isFallDefaultUsed() ) {
+                                // add fallthrough default label if necessary
+                                std::list<Label> ls{ enclosingControlStructures.back().useFallDefaultExit() };
+                                caseStmt->stmts.push_front( new NullStmt( ls ) );
+                        } // if
+                } // if
+        }
+        void MLEMutator::premutate( SwitchStmt *switchStmt ) {
+                // generate a label for breaking out of a labeled switch
+                Label brkLabel = generator->newLabel("switchBreak", switchStmt);
+                auto it = std::find_if( switchStmt->statements.rbegin(), switchStmt->statements.rend(), [](Statement * stmt) {
+                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
+                        return caseStmt->isDefault();
+                });
+                CaseStmt * defaultCase = it != switchStmt->statements.rend() ? strict_dynamic_cast<CaseStmt *>( *it ) : nullptr;
+                Label fallDefaultLabel = defaultCase ? generator->newLabel( "fallThroughDefault", defaultCase ) : "";
+                enclosingControlStructures.push_back( Entry(switchStmt, brkLabel, fallDefaultLabel) );
+                GuardAction( [this]() { enclosingControlStructures.pop_back(); } );
+                // Collect valid labels for fallthrough. This is initially all labels at the same level as a case statement.
+                // As labels are seen during traversal, they are removed, since fallthrough is not allowed to jump backwards.
+                for ( Statement * stmt : switchStmt->statements ) {
+                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
+                        if ( caseStmt->stmts.empty() ) continue;
+                        CompoundStmt * block = dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
+                        for ( Statement * stmt : block->kids ) {
+                                for ( Label & l : stmt->labels ) {
+                                        fallthroughLabels.insert( l );
+                                }
+                        }
+                }
+        }
+        Statement * MLEMutator::postmutate( SwitchStmt * switchStmt ) {
+                Entry &e = enclosingControlStructures.back();
+                assert ( e == switchStmt );
+                // only generate break label if labeled break is used
+                if ( e.isBreakUsed() ) {
+                        // for the purposes of keeping switch statements uniform (i.e. all statements that are direct children of a
+                        // switch should be CastStmts), append the exit label + break to the last case statement; create a default
+                        // case if there are no cases
+                        std::list< Statement * > &statements = switchStmt->statements;
+                        if ( statements.empty() ) {
+                                statements.push_back( CaseStmt::makeDefault() );
+                        } // if
+                        if ( CaseStmt * c = dynamic_cast< CaseStmt * >( statements.back() ) ) {
+                                Statement * stmt = new BranchStmt( Label("brkLabel"), BranchStmt::Break );
+                                stmt->labels.push_back( e.useBreakExit() );
+                                c->stmts.push_back( stmt );
+                        } else assert(0); // as of this point, all statements of a switch are still CaseStmts
+                } // if
+                assert ( enclosingControlStructures.back() == switchStmt );
+                return switchStmt;
+        }
 } // namespace ControlStruct

src/ControlStruct/MLEMutator.h

-              rf9feab8
+              r90152a4
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:19:59 2017
 // Update Count     : 35
+// Last Modified On : Thu Mar  8 16:42:32 2018
+// Update Count     : 41
 //
 …
 #include <map>                     // for map
 #include <string>                  // for string
+#include <set>                     // for unordered_set
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "SynTree/Label.h"         // for Label
 …
 namespace ControlStruct {
 class LabelGenerator;
+        class LabelGenerator;
+        class MLEMutator : public Mutator {
+        class MLEMutator : public WithVisitorRef<MLEMutator>, public WithShortCircuiting, public WithGuards {
+          public:
                 class Entry;
-                typedef Mutator Parent;
-          public:
                 MLEMutator( std::map<Label, Statement *> *t, LabelGenerator *gen = 0 ) : targetTable( t ), breakLabel(std::string("")), generator( gen ) {}
                 ~MLEMutator();
+                virtual CompoundStmt *mutate( CompoundStmt *cmpndStmt ) override;
+                virtual Statement *mutate( WhileStmt *whileStmt ) override;
+                virtual Statement *mutate( ForStmt *forStmt ) override;
+                virtual Statement *mutate( BranchStmt *branchStmt ) throw ( SemanticError ) override;
+                virtual Statement *mutate( CaseStmt *caseStmt ) override;
+                virtual Statement *mutate( IfStmt *ifStmt ) override;
+                virtual Statement *mutate( SwitchStmt *switchStmt ) override;
+                void premutate( CompoundStmt *cmpndStmt );
+                Statement * postmutate( BranchStmt *branchStmt ) throw ( SemanticErrorException );
+                void premutate( WhileStmt *whileStmt );
+                Statement * postmutate( WhileStmt *whileStmt );
+                void premutate( ForStmt *forStmt );
+                Statement * postmutate( ForStmt *forStmt );
+                void premutate( CaseStmt *caseStmt );
+                void premutate( IfStmt *ifStmt );
+                Statement * postmutate( IfStmt *ifStmt );
+                void premutate( SwitchStmt *switchStmt );
+                Statement * postmutate( SwitchStmt *switchStmt );
                 Statement *mutateLoop( Statement *bodyLoop, Entry &e );
 …
                 Label &get_breakLabel() { return breakLabel; }
                 void set_breakLabel( Label newValue ) { breakLabel = newValue; }
+          private:
                 class Entry {
                   public:
+                        explicit Entry( Statement *_loop, Label _breakExit, Label _contExit = Label("") ) :
+                                loop( _loop ), breakExit( _breakExit ), contExit( _contExit ), breakUsed(false), contUsed(false) {}
+                        // specialized constructors for each combination of statement with labelled break/continue/fallthrough that is valid to cleanup the use cases
+                        explicit Entry( ForStmt *stmt, Label breakExit, Label contExit ) :
+                                stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
                         bool operator==( const Statement *stmt ) { return ( loop == stmt ); }
                         bool operator!=( const Statement *stmt ) { return ( loop != stmt ); }
+                        explicit Entry( WhileStmt *stmt, Label breakExit, Label contExit ) :
+                                stmt( stmt ), breakExit( breakExit ), contExit( contExit ) {}
+                        bool operator==( const Entry &other ) { return ( loop == other.get_controlStructure() ); }
+                        explicit Entry( CompoundStmt *stmt, Label breakExit ) :
+                                stmt( stmt ), breakExit( breakExit ) {}
+                        Statement *get_controlStructure() const { return loop; }
+                        explicit Entry( IfStmt *stmt, Label breakExit ) :
+                                stmt( stmt ), breakExit( breakExit ) {}
+                        explicit Entry( CaseStmt *stmt, Label fallExit ) :
+                                stmt( stmt ), fallExit( fallExit ) {}
+                        explicit Entry( SwitchStmt *stmt, Label breakExit, Label fallDefaultExit ) :
+                                stmt( stmt ), breakExit( breakExit ), fallDefaultExit( fallDefaultExit ) {}
+                        bool operator==( const Statement *other ) { return stmt == other; }
+                        bool operator!=( const Statement *other ) { return stmt != other; }
+                        bool operator==( const Entry &other ) { return stmt == other.get_controlStructure(); }
+                        Statement *get_controlStructure() const { return stmt; }
                         Label useContExit() { contUsed = true; return contExit; }
                         Label useBreakExit() { breakUsed = true; return breakExit; }
+                        Label useFallExit() { fallUsed = true; return fallExit; }
+                        Label useFallDefaultExit() { fallDefaultUsed = true; return fallDefaultExit; }
                         bool isContUsed() const { return contUsed; }
                         bool isBreakUsed() const { return breakUsed; }
+                        bool isFallUsed() const { return fallUsed; }
+                        bool isFallDefaultUsed() const { return fallDefaultUsed; }
+                        void seenDefault() { fallDefaultValid = false; }
+                        bool isFallDefaultValid() const { return fallDefaultValid; }
                   private:
+                        Statement *loop;
+                        Label breakExit, contExit;
+                        bool breakUsed, contUsed;
+                        Statement *stmt;
+                        Label breakExit, contExit, fallExit, fallDefaultExit;
+                        bool breakUsed = false, contUsed = false, fallUsed = false, fallDefaultUsed = false;
+                        bool fallDefaultValid = true;
                 };
+          private:
                 std::map< Label, Statement * > *targetTable;
+                std::set< Label > fallthroughLabels;
                 std::list< Entry > enclosingControlStructures;
                 Label breakLabel;
 …
                 template< typename LoopClass >
                 Statement *handleLoopStmt( LoopClass *loopStmt );
+                void prehandleLoopStmt( LoopClass * loopStmt );
                 template< typename IfClass >
                 Statement *handleIfStmt( IfClass *switchStmt );
+                template< typename LoopClass >
+                Statement * posthandleLoopStmt( LoopClass * loopStmt );
+                template< typename SwitchClass >
+                Statement *handleSwitchStmt( SwitchClass *switchStmt );
+                void fixBlock( std::list< Statement * > &kids );
+                void fixBlock( std::list< Statement * > &kids, bool caseClause = false );
         };
 } // namespace ControlStruct

src/ControlStruct/Mutate.cc

-              rf9feab8
+              r90152a4
 #include "Common/PassVisitor.h"    // for mutateAll
-#include "Common/SemanticError.h"  // for SemanticError
 #include "ForExprMutator.h"        // for ForExprMutator
 #include "LabelFixer.h"            // for LabelFixer
 …
 #include "SynTree/Visitor.h"       // for acceptAll
+using namespace std;
+namespace ControlStruct {
+        void fixLabels( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<LabelFixer> lfix;
+                acceptAll( translationUnit, lfix );
+        }
+namespace ControlStruct {
+        void mutate( std::list< Declaration * > translationUnit ) {
+                // hoist initialization out of for statements
+        void hoistControlDecls( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<ForExprMutator> formut;
-                // normalizes label definitions and generates multi-level exit labels
-                PassVisitor<LabelFixer> lfix;
                 mutateAll( translationUnit, formut );
-                acceptAll( translationUnit, lfix );
+        }
 } // namespace CodeGen

src/ControlStruct/Mutate.h

-              rf9feab8
+              r90152a4
 // file "LICENCE" distributed with Cforall.
 //
 // Mutate.h --
+// Mutate.h --
 //
 // Author           : Rodolfo G. Esteves
 …
 class Declaration;
+/// Desugars Cforall control structures
 namespace ControlStruct {
+        /// Desugars Cforall control structures
+        void mutate( std::list< Declaration* > translationUnit );
+        /// normalizes label definitions and generates multi-level exit labels
+        void fixLabels( std::list< Declaration * > & translationUnit );
+        /// hoist initialization out of for statements
+        void hoistControlDecls( std::list< Declaration * > & translationUnit );
 } // namespace ControlStruct

src/GenPoly/Box.cc

-              rf9feab8
+              r90152a4
                         void premutate( DeclStmt *declStmt );
                         Expression *postmutate( MemberExpr *memberExpr );
+                        void premutate( AddressExpr *addrExpr );
+                        Expression *postmutate( AddressExpr *addrExpr );
                         Expression *postmutate( SizeofExpr *sizeofExpr );
                         Expression *postmutate( AlignofExpr *alignofExpr );
 …
                         /// change the type of generic aggregate members to char[]
                         void mutateMembers( AggregateDecl * aggrDecl );
+                        /// returns the calculated sizeof expression for ty, or nullptr for use C sizeof()
+                        Expression* genSizeof( Type* ty );
                         /// Enters a new scope for type-variables, adding the type variables from ty
 …
                         ScopedSet< std::string > knownOffsets;          ///< Set of non-generic types for which the offset array exists in the current scope, indexed by offsetofName
                         UniqueName bufNamer;                           ///< Namer for VLA buffers
+                        Expression * addrMember = nullptr;             ///< AddressExpr argument is MemberExpr?
                 };
 …
         inline void mutateTranslationUnit( std::list< Declaration* > &translationUnit, MutatorType &mutator ) {
                 bool seenIntrinsic = false;
                 SemanticError errors;
+                SemanticErrorException errors;
                 for ( typename std::list< Declaration* >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
                         try {
 …
                                         assert( *i );
                                 } // if
+                        } catch( SemanticError &e ) {
+                                e.set_location( (*i)->location );
+                        } catch( SemanticErrorException &e ) {
                                 errors.append( e );
                         } // try
 …
         Expression *makeOp( const std::string &name, Expression *arg ) {
                 UntypedExpr *expr = new UntypedExpr( new NameExpr( name ) );
                 expr->get_args().push_back( arg );
+                expr->args.push_back( arg );
                 return expr;
+        }
 …
         Expression *makeOp( const std::string &name, Expression *lhs, Expression *rhs ) {
                 UntypedExpr *expr = new UntypedExpr( new NameExpr( name ) );
                 expr->get_args().push_back( lhs );
                 expr->get_args().push_back( rhs );
+                expr->args.push_back( lhs );
+                expr->args.push_back( rhs );
                 return expr;
+        }
 …
         /// Returns the dereference of a local pointer variable
         Expression *derefVar( ObjectDecl *var ) {
                 return makeOp( "*?", new VariableExpr( var ) );
+                return UntypedExpr::createDeref( new VariableExpr( var ) );
+        }
 …
                 unsigned long n_members = 0;
                 bool firstMember = true;
                 for ( std::list< Declaration* >::const_iterator member = structDecl->get_members().begin(); member != structDecl->get_members().end(); ++member ) {
                         DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *member );
+                for ( Declaration* member : structDecl->get_members() ) {
+                        DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( member );
                         assert( dwt );
                         Type *memberType = dwt->get_type();
 …
+                                                }
                                         } else {
                                                 throw SemanticError( "Cannot pass non-struct type for generic struct: ", argBaseType );
+                                                SemanticError( argBaseType, "Cannot pass non-struct type for generic struct: " );
+                                        }
+                                }
 …
                                         } else {
                                                 // xxx - should this be an assertion?
                                                 throw SemanticError( toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ), appExpr );
+                                                SemanticError( appExpr, toString( *env, "\nunbound type variable: ", tyParm->first, " in application " ) );
                                         } // if
                                 } // if
 …
                                 if ( ! isPolyType( arg->get_type() ) ) {
                                         UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
+                                        deref->get_args().push_back( new CastExpr( new VariableExpr( param ), new PointerType( Type::Qualifiers(), arg->get_type()->clone() ) ) );
+                                        deref->set_result( arg->get_type()->clone() );
+                                        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 *Pass1::handleIntrinsics( ApplicationExpr *appExpr ) {
                         if ( VariableExpr *varExpr = dynamic_cast< VariableExpr *>( appExpr->get_function() ) ) {
                                 if ( varExpr->get_var()->get_linkage() == LinkageSpec::Intrinsic ) {
                                         if ( varExpr->get_var()->get_name() == "?[?]" ) {
+                        if ( VariableExpr *varExpr = dynamic_cast< VariableExpr *>( appExpr->function ) ) {
+                                if ( varExpr->var->linkage == LinkageSpec::Intrinsic ) {
+                                        if ( varExpr->var->name == "?[?]" ) {
                                                 assert( appExpr->result );
                                                 assert( appExpr->get_args().size() == 2 );
                                                 Type *baseType1 = isPolyPtr( appExpr->get_args().front()->get_result(), scopeTyVars, env );
                                                 Type *baseType2 = isPolyPtr( appExpr->get_args().back()->get_result(), scopeTyVars, env );
+                                                Type *baseType1 = isPolyPtr( appExpr->args.front()->result, scopeTyVars, env );
+                                                Type *baseType2 = isPolyPtr( appExpr->args.back()->result, scopeTyVars, env );
                                                 assert( ! baseType1 || ! baseType2 ); // the arguments cannot both be polymorphic pointers
                                                 UntypedExpr *ret = 0;
 …
                         if ( expr->result && isPolyType( expr->result, scopeTyVars, env ) ) {
                                 if ( NameExpr *name = dynamic_cast< NameExpr *>( expr->function ) ) {
                                         if ( name->get_name() == "*?" ) {
+                                        if ( name->name == "*?" ) {
                                                 Expression *ret = expr->args.front();
                                                 expr->args.clear();
 …
                 void Pass1::premutate( AddressExpr * ) { visit_children = false; }
                 Expression * Pass1::postmutate( AddressExpr * addrExpr ) {
                         assert( addrExpr->get_arg()->result && ! addrExpr->get_arg()->get_result()->isVoid() );
+                        assert( addrExpr->arg->result && ! addrExpr->arg->result->isVoid() );
                         bool needs = false;
                         if ( UntypedExpr *expr = dynamic_cast< UntypedExpr *>( addrExpr->get_arg() ) ) {
                                 if ( expr->result && isPolyType( expr->get_result(), scopeTyVars, env ) ) {
                                         if ( NameExpr *name = dynamic_cast< NameExpr *>( expr->get_function() ) ) {
                                                 if ( name->get_name() == "*?" ) {
                                                         if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr->get_args().front() ) ) {
                                                                 assert( appExpr->get_function()->result );
                                                                 FunctionType *function = getFunctionType( appExpr->get_function()->get_result() );
+                        if ( UntypedExpr *expr = dynamic_cast< UntypedExpr *>( addrExpr->arg ) ) {
+                                if ( expr->result && isPolyType( expr->result, scopeTyVars, env ) ) {
+                                        if ( NameExpr *name = dynamic_cast< NameExpr *>( expr->function ) ) {
+                                                if ( name->name == "*?" ) {
+                                                        if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr->args.front() ) ) {
+                                                                assert( appExpr->function->result );
+                                                                FunctionType *function = getFunctionType( appExpr->function->result );
                                                                 assert( function );
                                                                 needs = needsAdapter( function, scopeTyVars );
 …
                         // isPolyType check needs to happen before mutating addrExpr arg, so pull it forward
                         // out of the if condition.
                         addrExpr->arg = addrExpr->get_arg()->acceptMutator( *visitor );
+                        addrExpr->arg = addrExpr->arg->acceptMutator( *visitor );
                         // ... but must happen after mutate, since argument might change (e.g. intrinsic *?, ?[?]) - re-evaluate above comment
                         bool polytype = isPolyType( addrExpr->get_arg()->get_result(), scopeTyVars, env );
+                        bool polytype = isPolyType( addrExpr->arg->result, scopeTyVars, env );
                         if ( polytype || needs ) {
                                 Expression *ret = addrExpr->get_arg();
                                 delete ret->get_result();
                                 ret->set_result( addrExpr->get_result()->clone() );
                                 addrExpr->set_arg( 0 );
+                                Expression *ret = addrExpr->arg;
+                                delete ret->result;
+                                ret->result = addrExpr->result->clone();
+                                addrExpr->arg = nullptr;
                                 delete addrExpr;
                                 return ret;
 …
                 void Pass2::addAdapters( FunctionType *functionType ) {
                         std::list< DeclarationWithType *> &paramList = functionType->get_parameters();
+                        std::list< DeclarationWithType *> &paramList = functionType->parameters;
                         std::list< FunctionType *> functions;
                         for ( std::list< DeclarationWithType *>::iterator arg = paramList.begin(); arg != paramList.end(); ++arg ) {
 …
                 DeclarationWithType * Pass2::postmutate( FunctionDecl *functionDecl ) {
                         FunctionType * ftype = functionDecl->get_functionType();
                         if ( ! ftype->get_returnVals().empty() && functionDecl->get_statements() ) {
                                 if ( ! isPrefix( functionDecl->get_name(), "_thunk" ) && ! isPrefix( functionDecl->get_name(), "_adapter" ) ) { // xxx - remove check for prefix once thunks properly use ctor/dtors
                                         assert( ftype->get_returnVals().size() == 1 );
                                         DeclarationWithType * retval = ftype->get_returnVals().front();
                                         if ( retval->get_name() == "" ) {
                                                 retval->set_name( "_retval" );
+                        FunctionType * ftype = functionDecl->type;
+                        if ( ! ftype->returnVals.empty() && functionDecl->statements ) {
+                                if ( ! isPrefix( functionDecl->name, "_thunk" ) && ! isPrefix( functionDecl->name, "_adapter" ) ) { // xxx - remove check for prefix once thunks properly use ctor/dtors
+                                        assert( ftype->returnVals.size() == 1 );
+                                        DeclarationWithType * retval = ftype->returnVals.front();
+                                        if ( retval->name == "" ) {
+                                                retval->name = "_retval";
+                                        }
                                         functionDecl->get_statements()->get_kids().push_front( new DeclStmt( retval ) );
+                                        functionDecl->statements->kids.push_front( new DeclStmt( retval ) );
                                         DeclarationWithType * newRet = retval->clone(); // for ownership purposes
                                         ftype->get_returnVals().front() = newRet;
+                                        ftype->returnVals.front() = newRet;
+                                }
+                        }
                         // errors should have been caught by this point, remove initializers from parameters to allow correct codegen of default arguments
                         for ( Declaration * param : functionDecl->get_functionType()->get_parameters() ) {
+                        for ( Declaration * param : functionDecl->type->parameters ) {
                                 if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( param ) ) {
                                         delete obj->get_init();
                                         obj->set_init( nullptr );
+                                        delete obj->init;
+                                        obj->init = nullptr;
+                                }
+                        }
 …
                         // only mutate member expressions for polymorphic types
                         int tyDepth;
                         Type *objectType = hasPolyBase( memberExpr->get_aggregate()->get_result(), scopeTyVars, &tyDepth );
+                        Type *objectType = hasPolyBase( memberExpr->aggregate->result, scopeTyVars, &tyDepth );
                         if ( ! objectType ) return memberExpr;
                         findGeneric( objectType ); // ensure layout for this type is available
                         // replace member expression with dynamically-computed layout expression
                         Expression *newMemberExpr = 0;
+                        Expression *newMemberExpr = nullptr;
                         if ( StructInstType *structType = dynamic_cast< StructInstType* >( objectType ) ) {
                                 // look up offset index
                                 long i = findMember( memberExpr->get_member(), structType->get_baseStruct()->get_members() );
+                                long i = findMember( memberExpr->member, structType->baseStruct->members );
                                 if ( i == -1 ) return memberExpr;
                                 // replace member expression with pointer to base plus offset
                                 UntypedExpr *fieldLoc = new UntypedExpr( new NameExpr( "?+?" ) );
                                 Expression * aggr = memberExpr->get_aggregate()->clone();
                                 delete aggr->get_env(); // xxx - there's a problem with keeping the env for some reason, so for now just get rid of it
                                 aggr->set_env( nullptr );
+                                Expression * aggr = memberExpr->aggregate->clone();
+                                delete aggr->env; // xxx - there's a problem with keeping the env for some reason, so for now just get rid of it
+                                aggr->env = nullptr;
                                 fieldLoc->get_args().push_back( aggr );
                                 fieldLoc->get_args().push_back( makeOffsetIndex( objectType, i ) );
                                 fieldLoc->set_result( memberExpr->get_result()->clone() );
+                                fieldLoc->set_result( memberExpr->result->clone() );
                                 newMemberExpr = fieldLoc;
                         } else if ( dynamic_cast< UnionInstType* >( objectType ) ) {
                                 // union members are all at offset zero, so just use the aggregate expr
                                 Expression * aggr = memberExpr->get_aggregate()->clone();
                                 delete aggr->get_env(); // xxx - there's a problem with keeping the env for some reason, so for now just get rid of it
                                 aggr->set_env( nullptr );
+                                Expression * aggr = memberExpr->aggregate->clone();
+                                delete aggr->env; // xxx - there's a problem with keeping the env for some reason, so for now just get rid of it
+                                aggr->env= nullptr;
                                 newMemberExpr = aggr;
                                 newMemberExpr->set_result( memberExpr->get_result()->clone() );
+                                newMemberExpr->result = memberExpr->result->clone();
                         } else return memberExpr;
                         assert( newMemberExpr );
+                        Type *memberType = memberExpr->get_member()->get_type();
+                        // Must apply the generic substitution to the member type to handle cases where the member is a generic parameter substituted by a known concrete type, e.g.
+                        //   forall(otype T) struct Box { T x; }
+                        //   forall(otype T) f() {
+                        //     Box(T *) b; b.x;
+                        //   }
+                        // TODO: memberExpr->result should be exactly memberExpr->member->get_type() after substitution, so it doesn't seem like it should be necessary to apply the substitution manually. For some reason this is not currently the case. This requires more investigation.
+                        Type *memberType = memberExpr->member->get_type()->clone();
+                        TypeSubstitution sub = objectType->genericSubstitution();
+                        sub.apply( memberType );
                         if ( ! isPolyType( memberType, scopeTyVars ) ) {
                                 // Not all members of a polymorphic type are themselves of polymorphic type; in this case the member expression should be wrapped and dereferenced to form an lvalue
 …
+                        }
+                        delete memberType;
                         delete memberExpr;
                         return newMemberExpr;
+                }
+                void PolyGenericCalculator::premutate( AddressExpr * addrExpr ) {
+                        GuardValue( addrMember );
+                        // is the argument a MemberExpr before mutating?
+                        addrMember = dynamic_cast< MemberExpr * >( addrExpr->arg );
+                }
+                Expression * PolyGenericCalculator::postmutate( AddressExpr * addrExpr ) {
+                        if ( addrMember && addrMember != addrExpr->arg ) {
+                                // arg was a MemberExpr and has been mutated
+                                if ( UntypedExpr * untyped = dynamic_cast< UntypedExpr * >( addrExpr->arg ) ) {
+                                        if ( InitTweak::getFunctionName( untyped ) == "?+?" ) {
+                                                // MemberExpr was converted to pointer+offset, and it is not valid C to take the address of an addition, so strip the address-of
+                                                // TODO: should  addrExpr->arg->result be changed to addrExpr->result?
+                                                Expression * ret = addrExpr->arg;
+                                                addrExpr->arg = nullptr;
+                                                std::swap( addrExpr->env, ret->env );
+                                                delete addrExpr;
+                                                return ret;
+                                        }
+                                }
+                        }
+                        return addrExpr;
+                }
                 ObjectDecl *PolyGenericCalculator::makeVar( const std::string &name, Type *type, Initializer *init ) {
                         ObjectDecl *newObj = new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, 0, type, init );
+                        ObjectDecl *newObj = new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, nullptr, type, init );
                         stmtsToAddBefore.push_back( new DeclStmt( newObj ) );
                         return newObj;
 …
+                }
+                Expression * PolyGenericCalculator::genSizeof( Type* ty ) {
+                        if ( ArrayType * aty = dynamic_cast<ArrayType *>(ty) ) {
+                                // generate calculated size for possibly generic array
+                                Expression * sizeofBase = genSizeof( aty->get_base() );
+                                if ( ! sizeofBase ) return nullptr;
+                                Expression * dim = aty->get_dimension();
+                                aty->set_dimension( nullptr );
+                                return makeOp( "?*?", sizeofBase, dim );
+                        } else if ( findGeneric( ty ) ) {
+                                // generate calculated size for generic type
+                                return new NameExpr( sizeofName( mangleType( ty ) ) );
+                        } else return nullptr;
+                }
                 Expression *PolyGenericCalculator::postmutate( SizeofExpr *sizeofExpr ) {
+                        Type *ty = sizeofExpr->get_isType() ? sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
+                        if ( findGeneric( ty ) ) {
+                                Expression *ret = new NameExpr( sizeofName( mangleType( ty ) ) );
+                        Type *ty = sizeofExpr->get_isType() ?
+                                sizeofExpr->get_type() : sizeofExpr->get_expr()->get_result();
+                        Expression * gen = genSizeof( ty );
+                        if ( gen ) {
                                 delete sizeofExpr;
+                                return ret;
+                        }
+                        return sizeofExpr;
+                                return gen;
+                        } else return sizeofExpr;
+                }

src/GenPoly/FindFunction.cc

rf9feab8	r90152a4
19	19
20	20	#include "Common/PassVisitor.h" // for PassVisitor
21		~~#include "Common/SemanticError.h" // for SemanticError~~
22	21	#include "GenPoly/ErasableScopedMap.h" // for ErasableScopedMap<>::iterator
23	22	#include "GenPoly/GenPoly.h" // for TyVarMap

src/GenPoly/GenPoly.cc

-              rf9feab8
+              r90152a4
                 if ( dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
+                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
+                        return isPolyType( arrayType->base, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), env ) ) return type;
 …
                                 return type;
+                        }
+                } else if ( ArrayType * arrayType = dynamic_cast< ArrayType * >( type ) ) {
+                        return isPolyType( arrayType->base, tyVars, env );
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {
                         if ( hasPolyParams( structType->get_parameters(), tyVars, env ) ) return type;
 …
                         return is<VoidType>( ap->get_base() ) || is<VoidType>( bp->get_base() )
                                 || typesPolyCompatible( ap->get_base(), bp->get_base() );
+                } else if ( aid == type_index{typeid(ReferenceType)} ) {
+                        ReferenceType *ap = as<ReferenceType>(a), *bp = as<ReferenceType>(b);
+                        return is<VoidType>( ap->get_base() ) || is<VoidType>( bp->get_base() )
+                                || typesPolyCompatible( ap->get_base(), bp->get_base() );
                 } else if ( aid == type_index{typeid(ArrayType)} ) {
                         ArrayType *aa = as<ArrayType>(a), *ba = as<ArrayType>(b);

src/GenPoly/InstantiateGeneric.cc

-              rf9feab8
+              r90152a4
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
-#include "Common/SemanticError.h"      // for SemanticError
 #include "Common/UniqueName.h"         // for UniqueName
 #include "Common/utility.h"            // for deleteAll, cloneAll
 …
                         DeclarationWithType * field = strict_dynamic_cast< DeclarationWithType * >( member );
                         MemberExpr * ret = new MemberExpr( field, memberExpr->aggregate->clone() );
+                        ResolvExpr::adjustExprType( ret->result ); // pointer decay
                         std::swap( ret->env, memberExpr->env );
                         delete memberExpr;
 …
         Expression * FixDtypeStatic::fixMemberExpr( AggrInst * inst, MemberExpr * memberExpr ) {
                 // need to cast dtype-static member expressions to their actual type before that type is erased.
+                // NOTE: the casts here have the third argument (isGenerated) set to false so that these casts persist until Box, where they are needed.
                 auto & baseParams = *inst->get_baseParameters();
                 if ( isDtypeStatic( baseParams ) ) {
 …
                                         // Note: this currently creates more temporaries than is strictly necessary, since it does not check for duplicate uses of the same member expression.
                                         static UniqueName tmpNamer( "_dtype_static_member_" );
                                         Expression * init = new CastExpr( new AddressExpr( memberExpr ), new PointerType( Type::Qualifiers(), concType->clone() ) );
+                                        Expression * init = new CastExpr( new AddressExpr( memberExpr ), new PointerType( Type::Qualifiers(), concType->clone() ), false );
                                         ObjectDecl * tmp = ObjectDecl::newObject( tmpNamer.newName(), new ReferenceType( Type::Qualifiers(), concType ), new SingleInit( init ) );
                                         stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
 …
                                 } else {
                                         // can simply add a cast to actual type
                                         return new CastExpr( memberExpr, concType );
+                                        return new CastExpr( memberExpr, concType, false );
+                                }
+                        }

src/GenPoly/Lvalue.cc

-              rf9feab8
+              r90152a4
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"        // for SemanticError
 #include "GenPoly.h"                     // for isPolyType
 #include "Lvalue.h"
 …
                 Expression * mkDeref( Expression * arg ) {
                         if ( SymTab::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 );
                                 deref->set_result( new PointerType( Type::Qualifiers(), deref->get_result() ) );
                                 Type * base = InitTweak::getPointerBase( arg->get_result() );
                                 assertf( base, "expected pointer type in dereference (type was %s)", toString( arg->get_result() ).c_str() );
+                                deref->result = new PointerType( Type::Qualifiers(), deref->result );
+                                Type * base = InitTweak::getPointerBase( arg->result );
+                                assertf( base, "expected pointer type in dereference (type was %s)", toString( arg->result ).c_str() );
                                 ApplicationExpr * ret = new ApplicationExpr( deref, { arg } );
                                 delete ret->get_result();
                                 ret->set_result( base->clone() );
                                 ret->get_result()->set_lvalue( true );
+                                delete ret->result;
+                                ret->result = base->clone();
+                                ret->result->set_lvalue( true );
                                 return ret;
                         } else {
 …
+                }
                 struct ReferenceConversions final {
+                struct ReferenceConversions final : public WithStmtsToAdd {
                         Expression * postmutate( CastExpr * castExpr );
                         Expression * postmutate( AddressExpr * addrExpr );
 …
                 };
                 struct AddrRef final : public WithGuards {
+                struct AddrRef final : public WithGuards, public WithVisitorRef<AddrRef>, public WithShortCircuiting {
                         void premutate( AddressExpr * addrExpr );
                         Expression * postmutate( AddressExpr * addrExpr );
                         void premutate( Expression * expr );
+                        void premutate( ApplicationExpr * appExpr );
+                        void premutate( SingleInit * init );
+                        void handleNonAddr( Expression * );
                         bool first = true;
                         bool current = false;
                         int refDepth = 0;
+                        bool addCast = false;
                 };
         } // namespace
 …
+        }
         void convertLvalue( std::list< Declaration* >& translationUnit ) {
+        void convertLvalue( std::list< Declaration* > & translationUnit ) {
                 PassVisitor<ReferenceConversions> refCvt;
                 PassVisitor<ReferenceTypeElimination> elim;
 …
         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->get_returnVals().empty() ? nullptr : ftype->get_returnVals().front()->get_type();
+                                        return func->get_linkage() == LinkageSpec::Intrinsic && dynamic_cast<ReferenceType *>( ret );
+                                        return func->linkage == LinkageSpec::Intrinsic && lvalueFunctions.count(func->name);
+                                }
+                        }
 …
                         if ( isIntrinsicReference( appExpr ) ) {
                                 // eliminate reference types from intrinsic applications - now they return lvalues
                                 Type * result = appExpr->get_result();
                                 appExpr->set_result( result->stripReferences()->clone() );
                                 appExpr->get_result()->set_lvalue( true );
+                                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
                                         // don't add cast when in an intrinsic function, since they already have the cast
                                         Expression * ret = new CastExpr( appExpr, result );
+                                        ret->set_env( appExpr->get_env() );
+                                        appExpr->set_env( nullptr );
+                                        std::swap( ret->env, appExpr->env );
                                         return ret;
+                                }
 …
                 void FixIntrinsicResult::premutate( FunctionDecl * funcDecl ) {
                         GuardValue( inIntrinsic );
                         inIntrinsic =  funcDecl->linkage == LinkageSpec::Intrinsic;
+                        inIntrinsic = funcDecl->linkage == LinkageSpec::Intrinsic;
+                }
 …
                                 assertf( ftype, "Function declaration does not have function type." );
                                 // can be of differing lengths only when function is variadic
                                 assertf( ftype->get_parameters().size() == appExpr->get_args().size() || ftype->get_isVarArgs(), "ApplicationExpr args do not match formal parameter type." );
+                                assertf( ftype->parameters.size() == appExpr->args.size() || ftype->isVarArgs, "ApplicationExpr args do not match formal parameter type." );
                                 unsigned int i = 0;
                                 const unsigned int end = ftype->get_parameters().size();
                                 for ( auto p : unsafe_group_iterate( appExpr->get_args(), ftype->get_parameters() ) ) {
+                                const unsigned int end = ftype->parameters.size();
+                                for ( auto p : unsafe_group_iterate( appExpr->args, ftype->parameters ) ) {
                                         if (i == end) break;
                                         Expression *& arg = std::get<0>( p );
 …
                                         PRINT(
                                                 std::cerr << "pair<0>: " << arg << std::endl;
+                                                std::cerr << " -- " << arg->result << std::endl;
                                                 std::cerr << "pair<1>: " << formal << std::endl;
+                                        )
                                         if ( dynamic_cast<ReferenceType*>( formal ) ) {
+                                                if ( isIntrinsicReference( arg ) ) { // do not combine conditions, because that changes the meaning of the else if
+                                                        if ( function->get_linkage() != LinkageSpec::Intrinsic ) { // intrinsic functions that turn pointers into references
+                                                                // if argument is dereference or array subscript, the result isn't REALLY a reference, so it's not necessary to fix the argument
+                                                                PRINT(
+                                                                        std::cerr << "===is intrinsic arg in non-intrinsic call - adding address" << std::endl;
+                                                                )
+                                                                arg = new AddressExpr( arg );
+                                                        }
+                                                } else if ( function->get_linkage() == LinkageSpec::Intrinsic ) {
+                                                        // std::cerr << "===adding deref to arg" << std::endl;
+                                                        // if the parameter is a reference, add a dereference to the reference-typed argument.
+                                                        Type * baseType = InitTweak::getPointerBase( arg->get_result() );
+                                                        assertf( baseType, "parameter is reference, arg must be pointer or reference: %s", toString( arg->get_result() ).c_str() );
+                                                PRINT(
+                                                        std::cerr << "===formal is reference" << std::endl;
+                                                )
+                                                // TODO: it's likely that the second condition should be ... && ! isIntrinsicReference( arg ), but this requires investigation.
+                                                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
+                                                        // NOTE: previously, this condition fixed
+                                                        //   void f(int *&);
+                                                        //   int & x = ...;
+                                                        //   f(&x);
+                                                        // But now this is taken care of by a reference cast added by AddrRef. Need to find a new
+                                                        // example or remove this branch.
+                                                        PRINT(
+                                                                std::cerr << "===is intrinsic arg in non-intrinsic call - adding address" << std::endl;
+                                                        )
+                                                        arg = new AddressExpr( arg );
+                                                // } else if ( function->get_linkage() == LinkageSpec::Intrinsic && InitTweak::getPointerBase( arg->result ) ) {
+                                                } 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(
+                                                                std::cerr << "===is non-intrinsic arg in intrinsic call - adding deref to arg" << std::endl;
+                                                        )
+                                                        Type * baseType = InitTweak::getPointerBase( arg->result );
+                                                        assertf( baseType, "parameter is reference, arg must be pointer or reference: %s", toString( arg->result ).c_str() );
                                                         PointerType * ptrType = new PointerType( Type::Qualifiers(), baseType->clone() );
                                                         delete arg->get_result();
                                                         arg->set_result( ptrType );
+                                                        delete arg->result;
+                                                        arg->result = ptrType;
                                                         arg = mkDeref( arg );
+                                                        // assertf( arg->result->referenceDepth() == 0, "Reference types should have been eliminated from intrinsic function calls, but weren't: %s", toCString( arg->result ) );
+                                                }
+                                        }
 …
                 // idea: &&&E: get outer &, inner &
                 // at inner &, record depth D of reference type
+                // at inner &, record depth D of reference type of argument of &
                 // at outer &, add D derefs.
+                void AddrRef::premutate( Expression * ) {
+                void AddrRef::handleNonAddr( Expression * ) {
+                        // non-address-of: reset status variables:
+                        // * current expr is NOT the first address-of expr in an address-of chain
+                        // * next seen address-of expr IS the first in the chain.
                         GuardValue( current );
                         GuardValue( first );
 …
+                }
+                void AddrRef::premutate( Expression * expr ) {
+                        handleNonAddr( expr );
+                        GuardValue( addCast );
+                        addCast = false;
+                }
                 void AddrRef::premutate( AddressExpr * ) {
                         GuardValue( current );
                         GuardValue( first );
                         current = first;
                         first = false;
                         if ( current ) {
+                        current = first; // is this the first address-of in the chain?
+                        first = false;   // from here out, no longer possible for next address-of to be first in chain
+                        if ( current ) { // this is the outermost address-of in a chain
                                 GuardValue( refDepth );
                                 refDepth = 0;
+                                refDepth = 0;  // set depth to 0 so that postmutate can find the innermost address-of easily
+                        }
+                }
                 Expression * AddrRef::postmutate( AddressExpr * addrExpr ) {
+                        PRINT( std::cerr << "addr ref at " << addrExpr << std::endl; )
                         if ( refDepth == 0 ) {
+                                if ( ! isIntrinsicReference( addrExpr->get_arg() ) ) {
+                                PRINT( std::cerr << "depth 0, get new depth..." << std::endl; )
+                                // this is the innermost address-of in a chain, record depth D
+                                if ( ! isIntrinsicReference( addrExpr->arg ) ) {
                                         // try to avoid ?[?]
+                                        refDepth = addrExpr->get_arg()->get_result()->referenceDepth();
+                                }
+                        }
+                        if ( current ) {
+                                        // xxx - is this condition still necessary? intrinsicReferences should have a cast around them at this point, so I don't think this condition ever fires.
+                                        refDepth = addrExpr->arg->result->referenceDepth();
+                                        PRINT( std::cerr << "arg not intrinsic reference, new depth is: " << refDepth << std::endl; )
+                                } else {
+                                        assertf( false, "AddrRef : address-of should not have intrinsic reference argument: %s", toCString( addrExpr->arg ) );
+                                }
+                        }
+                        if ( current ) { // this is the outermost address-of in a chain
+                                PRINT( std::cerr << "current, depth is: " << refDepth << std::endl; )
                                 Expression * ret = addrExpr;
                                 while ( refDepth ) {
+                                        // add one dereference for each
                                         ret = mkDeref( ret );
                                         refDepth--;
+                                }
+                                // if addrExpr depth is 0, then the result is a pointer because the arg was depth 1 and not lvalue.
+                                // This means the dereference result is not a reference, is lvalue, and one less pointer depth than
+                                // the addrExpr. Thus the cast is meaningless.
+                                // TODO: One thing to double check is whether it is possible for the types to differ outside of the single
+                                // pointer level (i.e. can the base type of addrExpr differ from the type of addrExpr-arg?).
+                                // If so then the cast might need to be added, conditional on a more sophisticated check.
+                                if ( addCast && addrExpr->result->referenceDepth() != 0 ) {
+                                        PRINT( std::cerr << "adding cast to " << addrExpr->result << std::endl; )
+                                        return new CastExpr( ret, addrExpr->result->clone() );
+                                }
                                 return ret;
+                        }
+                        PRINT( std::cerr << "not current..." << std::endl; )
                         return addrExpr;
+                }
+                void AddrRef::premutate( ApplicationExpr * appExpr ) {
+                        visit_children = false;
+                        GuardValue( addCast );
+                        handleNonAddr( appExpr );
+                        for ( Expression *& arg : appExpr->args ) {
+                                // each argument with address-of requires a cast
+                                addCast = true;
+                                arg = arg->acceptMutator( *visitor );
+                        }
+                }
+                void AddrRef::premutate( SingleInit * ) {
+                        GuardValue( addCast );
+                        // each initialization context with address-of requires a cast
+                        addCast = true;
+                }
                 Expression * ReferenceConversions::postmutate( AddressExpr * addrExpr ) {
 …
                         // pointer casts in the right places.
+                        // conversion to reference type
+                        if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( castExpr->get_result() ) ) {
+                                (void)refType;
+                                if ( ReferenceType * otherRef = dynamic_cast< ReferenceType * >( castExpr->get_arg()->get_result() ) ) {
+                                        // nothing to do if casting from reference to reference.
+                                        (void)otherRef;
+                                        PRINT( std::cerr << "convert reference to reference -- nop" << std::endl; )
+                                        if ( isIntrinsicReference( castExpr->get_arg() ) ) {
+                                                Expression * callExpr = castExpr->get_arg();
+                                                PRINT(
+                                                        std::cerr << "but arg is deref -- &" << std::endl;
+                                                        std::cerr << callExpr << std::endl;
+                                                )
+                                                callExpr = new AddressExpr( callExpr ); // this doesn't work properly for multiple casts
+                                                delete callExpr->get_result();
+                                                callExpr->set_result( refType->clone() );
+                                                // move environment out to new top-level
+                                                callExpr->set_env( castExpr->get_env() );
+                                                castExpr->set_arg( nullptr );
+                                                castExpr->set_env( nullptr );
+                                                delete castExpr;
+                                                return callExpr;
+                                        }
+                                        int depth1 = refType->referenceDepth();
+                                        int depth2 = otherRef->referenceDepth();
+                                        int diff = depth1-depth2;
+                                        if ( diff == 0 ) {
+                                                assertf( depth1 == depth2, "non-intrinsic reference with cast of reference to reference not yet supported: %d %d %s", depth1, depth2, toString( castExpr ).c_str() );
+                                                PRINT( std::cerr << castExpr << std::endl; )
+                                                return castExpr;
+                                        } else if ( diff < 0 ) {
+                                                Expression * ret = castExpr->get_arg();
+                                                for ( int i = 0; i < diff; ++i ) {
+                                                        ret = mkDeref( ret );
+                                                }
+                                                ret->set_env( castExpr->get_env() );
+                                                delete ret->get_result();
+                                                ret->set_result( castExpr->get_result() );
+                                                castExpr->set_env( nullptr );
+                                                castExpr->set_arg( nullptr );
+                                                castExpr->set_result( nullptr );
+                                                delete castExpr;
+                                                return ret;
+                                        } else if ( diff > 0 ) {
+                                                Expression * ret = castExpr->get_arg();
+                                                for ( int i = 0; i < diff; ++i ) {
+                                                        ret = new AddressExpr( ret );
+                                                }
+                                                ret->set_env( castExpr->get_env() );
+                                                delete ret->get_result();
+                                                ret->set_result( castExpr->get_result() );
+                                                castExpr->set_env( nullptr );
+                                                castExpr->set_arg( nullptr );
+                                                castExpr->set_result( nullptr );
+                                                delete castExpr;
+                                                return ret;
+                                        }
+                                        assertf( depth1 == depth2, "non-intrinsic reference with cast of reference to reference not yet supported: %d %d %s", depth1, depth2, toString( castExpr ).c_str() );
+                                        PRINT( std::cerr << castExpr << std::endl; )
+                        // Note: reference depth difference is the determining factor in what code is run, rather than whether something is
+                        // reference type or not, since conversion still needs to occur when both types are references that differ in depth.
+                        Type * destType = castExpr->result;
+                        Type * srcType = castExpr->arg->result;
+                        int depth1 = destType->referenceDepth();
+                        int depth2 = srcType->referenceDepth();
+                        int diff = depth1 - depth2;
+                        if ( diff > 0 && ! srcType->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.
+                                //   (int &&&)3;
+                                // becomes
+                                //   int __ref_tmp_0 = 3;
+                                //   int & __ref_tmp_1 = _&_ref_tmp_0;
+                                //   int && __ref_tmp_2 = &__ref_tmp_1;
+                                //   &__ref_tmp_2;
+                                // the last & comes from the remaining reference conversion code
+                                SemanticWarning( castExpr->arg->location, Warning::RvalueToReferenceConversion, toCString( castExpr->arg ) );
+                                static UniqueName tempNamer( "__ref_tmp_" );
+                                ObjectDecl * temp = ObjectDecl::newObject( tempNamer.newName(), castExpr->arg->result->clone(), new SingleInit( castExpr->arg ) );
+                                PRINT( std::cerr << "made temp: " << temp << std::endl; )
+                                stmtsToAddBefore.push_back( new DeclStmt( temp ) );
+                                for ( int i = 0; i < depth1-1; i++ ) { // xxx - maybe this should be diff-1? check how this works with reference type for srcType
+                                        ObjectDecl * newTemp = ObjectDecl::newObject( tempNamer.newName(), new ReferenceType( Type::Qualifiers(), temp->type->clone() ), new SingleInit( new AddressExpr( new VariableExpr( temp ) ) ) );
+                                        PRINT( std::cerr << "made temp" << i << ": " << newTemp << std::endl; )
+                                        stmtsToAddBefore.push_back( new DeclStmt( newTemp ) );
+                                        temp = newTemp;
+                                }
+                                // update diff so that remaining code works out correctly
+                                castExpr->arg = new VariableExpr( temp );
+                                PRINT( std::cerr << "update cast to: " << castExpr << std::endl; )
+                                srcType = castExpr->arg->result;
+                                depth2 = srcType->referenceDepth();
+                                diff = depth1 - depth2;
+                                assert( diff == 1 );
+                        }
+                        // handle conversion between different depths
+                        PRINT (
+                                if ( depth1 || depth2 ) {
+                                        std::cerr << "destType: " << destType << " / srcType: " << srcType << std::endl;
+                                        std::cerr << "depth: " << depth1 << " / " << depth2 << std::endl;
+                                }
+                        )
+                        if ( diff > 0 ) {
+                                // conversion to type with more depth (e.g. int & -> int &&): add address-of for each level of difference
+                                Expression * ret = castExpr->arg;
+                                for ( int i = 0; i < diff; ++i ) {
+                                        ret = new AddressExpr( ret );
+                                }
+                                if ( srcType->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;
                                         return castExpr;
+                                } else if ( castExpr->get_arg()->get_result()->get_lvalue() ) {
+                                        // conversion from lvalue to reference
+                                        // xxx - keep cast, but turn into pointer cast??
+                                        // xxx - memory
+                                }
+                                ret->env = castExpr->env;
+                                delete ret->result;
+                                ret->result = castExpr->result;
+                                castExpr->env = nullptr;
+                                castExpr->arg = nullptr;
+                                castExpr->result = nullptr;
+                                delete castExpr;
+                                return ret;
+                        } else if ( diff < 0 ) {
+                                // conversion to type with less depth (e.g. int && -> int &): add dereferences for each level of difference
+                                diff = -diff; // care only about magnitude now
+                                Expression * ret = castExpr->arg;
+                                for ( int i = 0; i < diff; ++i ) {
+                                        ret = mkDeref( ret );
+                                        // xxx - try removing one reference here? actually, looks like mkDeref already does this, so more closely look at the types generated.
+                                }
+                                if ( ! ResolvExpr::typesCompatibleIgnoreQualifiers( destType->stripReferences(), srcType->stripReferences(), SymTab::Indexer() ) ) {
+                                        // must keep cast if types are different
+                                        castExpr->arg = ret;
+                                        return castExpr;
+                                }
+                                ret->env = castExpr->env;
+                                delete ret->result;
+                                ret->result = castExpr->result;
+                                ret->result->set_lvalue( true ); // ensure result is lvalue
+                                castExpr->env = nullptr;
+                                castExpr->arg = nullptr;
+                                castExpr->result = nullptr;
+                                delete castExpr;
+                                return ret;
+                        } else {
+                                assert( diff == 0 );
+                                // conversion between references of the same depth
+                                if ( ResolvExpr::typesCompatible( castExpr->result, castExpr->arg->result, SymTab::Indexer() ) && castExpr->isGenerated ) {
+                                        // Remove useless generated casts
                                         PRINT(
+                                                std::cerr << "convert lvalue to reference -- &" << std::endl;
+                                                std::cerr << castExpr->get_arg() << std::endl;
+                                                std::cerr << "types are compatible, removing cast: " << castExpr << std::endl;
+                                                std::cerr << "-- " << castExpr->result << std::endl;
+                                                std::cerr << "-- " << castExpr->arg->result << std::endl;
+                                        )
+                                        AddressExpr * ret = new AddressExpr( castExpr->get_arg() );
+                                        if ( refType->get_base()->get_qualifiers() != castExpr->get_arg()->get_result()->get_qualifiers() ) {
+                                                // must keep cast if cast-to type is different from the actual type
+                                                castExpr->set_arg( ret );
+                                                return castExpr;
+                                        }
+                                        ret->set_env( castExpr->get_env() );
+                                        delete ret->get_result();
+                                        ret->set_result( castExpr->get_result() );
+                                        castExpr->set_env( nullptr );
+                                        castExpr->set_arg( nullptr );
+                                        castExpr->set_result( nullptr );
+                                        Expression * ret = castExpr->arg;
+                                        castExpr->arg = nullptr;
+                                        std::swap( castExpr->env, ret->env );
                                         delete castExpr;
                                         return ret;
+                                } else {
+                                        // rvalue to reference conversion -- introduce temporary
+                                }
+                                assertf( false, "Only conversions to reference from lvalue are currently supported: %s", toString( castExpr ).c_str() );
+                        } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( castExpr->get_arg()->get_result() ) ) {
+                                (void)refType;
+                                // conversion from reference to rvalue
+                                PRINT(
+                                        std::cerr << "convert reference to rvalue -- *" << std::endl;
+                                        std::cerr << "was = " << castExpr << std::endl;
+                                )
+                                Expression * ret = castExpr->get_arg();
+                                TypeSubstitution * env = castExpr->get_env();
+                                castExpr->set_env( nullptr );
+                                if ( ! isIntrinsicReference( ret ) ) {
+                                        // dereference if not already dereferenced
+                                        ret = mkDeref( ret );
+                                }
+                                if ( ResolvExpr::typesCompatibleIgnoreQualifiers( castExpr->get_result(), castExpr->get_arg()->get_result()->stripReferences(), SymTab::Indexer() ) ) {
+                                        // can remove cast if types are compatible, changing expression type to value type
+                                        ret->set_result( castExpr->get_result()->clone() );
+                                        castExpr->set_arg( nullptr );
+                                        delete castExpr;
+                                } else {
+                                        // must keep cast if types are different
+                                        castExpr->set_arg( ret );
+                                        ret = castExpr;
+                                }
+                                ret->set_env( env );
+                                PRINT( std::cerr << "now: " << ret << std::endl; )
+                                return ret;
+                        }
+                        return castExpr;
+                                }
+                                return castExpr;
+                        }
+                }
                 Type * ReferenceTypeElimination::postmutate( ReferenceType * refType ) {
                         Type * base = refType->get_base();
+                        Type * base = refType->base;
                         Type::Qualifiers qualifiers = refType->get_qualifiers();
                         refType->set_base( nullptr );
+                        refType->base = nullptr;
                         delete refType;
                         return new PointerType( qualifiers, base );
 …
                 Expression * GeneralizedLvalue::applyTransformation( Expression * expr, Expression * arg, Func mkExpr ) {
                         if ( CommaExpr * commaExpr = dynamic_cast< CommaExpr * >( arg ) ) {
                                 Expression * arg1 = commaExpr->get_arg1()->clone();
                                 Expression * arg2 = commaExpr->get_arg2()->clone();
+                                Expression * arg1 = commaExpr->arg1->clone();
+                                Expression * arg2 = commaExpr->arg2->clone();
                                 Expression * ret = new CommaExpr( arg1, mkExpr( arg2 )->acceptMutator( *visitor ) );
                                 ret->set_env( expr->get_env() );
                                 expr->set_env( nullptr );
+                                ret->env = expr->env;
+                                expr->env = nullptr;
                                 delete expr;
                                 return ret;
                         } else if ( ConditionalExpr * condExpr = dynamic_cast< ConditionalExpr * >( arg ) ) {
                                 Expression * arg1 = condExpr->get_arg1()->clone();
                                 Expression * arg2 = condExpr->get_arg2()->clone();
                                 Expression * arg3 = condExpr->get_arg3()->clone();
+                                Expression * arg1 = condExpr->arg1->clone();
+                                Expression * arg2 = condExpr->arg2->clone();
+                                Expression * arg3 = condExpr->arg3->clone();
                                 ConditionalExpr * ret = new ConditionalExpr( arg1, mkExpr( arg2 )->acceptMutator( *visitor ), mkExpr( arg3 )->acceptMutator( *visitor ) );
                                 ret->set_env( expr->get_env() );
                                 expr->set_env( nullptr );
+                                ret->env = expr->env;
+                                expr->env = nullptr;
                                 delete expr;
 …
                                 AssertionSet needAssertions, haveAssertions;
                                 OpenVarSet openVars;
                                 unify( ret->get_arg2()->get_result(), ret->get_arg3()->get_result(), newEnv, needAssertions, haveAssertions, openVars, SymTab::Indexer(), commonType );
                                 ret->set_result( commonType ? commonType : ret->get_arg2()->get_result()->clone() );
+                                unify( ret->arg2->result, ret->arg3->result, newEnv, needAssertions, haveAssertions, openVars, SymTab::Indexer(), commonType );
+                                ret->result = commonType ? commonType : ret->arg2->result->clone();
                                 return ret;
+                        }
 …
                 Expression * GeneralizedLvalue::postmutate( MemberExpr * memExpr ) {
                         return applyTransformation( memExpr, memExpr->get_aggregate(), [=]( Expression * aggr ) { return new MemberExpr( memExpr->get_member(), aggr ); } );
+                        return applyTransformation( memExpr, memExpr->aggregate, [=]( Expression * aggr ) { return new MemberExpr( memExpr->member, aggr ); } );
+                }
                 Expression * GeneralizedLvalue::postmutate( AddressExpr * addrExpr ) {
                         return applyTransformation( addrExpr, addrExpr->get_arg(), []( Expression * arg ) { return new AddressExpr( arg ); } );
+                        return applyTransformation( addrExpr, addrExpr->arg, []( Expression * arg ) { return new AddressExpr( arg ); } );
+                }
                 Expression * CollapseAddrDeref::postmutate( AddressExpr * addrExpr ) {
                         Expression * arg = addrExpr->get_arg();
+                        Expression * arg = addrExpr->arg;
                         if ( isIntrinsicReference( arg ) ) {
                                 std::string fname = InitTweak::getFunctionName( arg );
 …
                                         Expression *& arg0 = InitTweak::getCallArg( arg, 0 );
                                         Expression * ret = arg0;
                                         ret->set_env( addrExpr->get_env() );
+                                        ret->set_env( addrExpr->env );
                                         arg0 = nullptr;
                                         addrExpr->set_env( nullptr );
+                                        addrExpr->env = nullptr;
                                         delete addrExpr;
                                         return ret;
+                                }
+                        } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * > ( arg ) ) {
+                                // need to move cast to pointer type out a level since address of pointer
+                                // is not valid C code (can be introduced in prior passes, e.g., InstantiateGeneric)
+                                if ( InitTweak::getPointerBase( castExpr->result ) ) {
+                                        addrExpr->arg = castExpr->arg;
+                                        castExpr->arg = addrExpr;
+                                        castExpr->result = new PointerType( Type::Qualifiers(), castExpr->result );
+                                        return castExpr;
+                                }
+                        }
 …
                                         // }
                                         if ( AddressExpr * addrExpr = dynamic_cast< AddressExpr * >( arg ) ) {
                                                 Expression * ret = addrExpr->get_arg();
                                                 ret->set_env( appExpr->get_env() );
                                                 addrExpr->set_arg( nullptr );
                                                 appExpr->set_env( nullptr );
+                                                Expression * ret = addrExpr->arg;
+                                                ret->env = appExpr->env;
+                                                addrExpr->arg = nullptr;
+                                                appExpr->env = nullptr;
                                                 delete appExpr;
                                                 return ret;

src/GenPoly/ScrubTyVars.cc

-              rf9feab8
+              r90152a4
 namespace GenPoly {
         Type * ScrubTyVars::mutate( TypeInstType *typeInst ) {
+        Type * ScrubTyVars::postmutate( TypeInstType * typeInst ) {
                 if ( ! tyVars ) {
                         if ( typeInst->get_isFtype() ) {
 …
                                 return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
                         } else {
                                 PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
+                                PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
                                 delete typeInst;
                                 return ret;
 …
+                }
                 TyVarMap::const_iterator tyVar = tyVars->find( typeInst->get_name() );
+                TyVarMap::const_iterator tyVar = tyVars->find( typeInst->name );
                 if ( tyVar != tyVars->end() ) {
                         switch ( tyVar->second.kind ) {
 …
                           case TypeDecl::Ttype:
+                                {
                                         PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
+                                        PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
                                         delete typeInst;
                                         return ret;
 …
                                 delete typeInst;
                                 return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
+                          default:
+                                assertf(false, "Unhandled tyvar kind: %d", tyVar->second.kind);
                         } // switch
                 } // if
 …
+        }
         Type * ScrubTyVars::mutateAggregateType( Type *ty ) {
+        Type * ScrubTyVars::mutateAggregateType( Type * ty ) {
                 if ( shouldScrub( ty ) ) {
                         PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
+                        PointerType * ret = new PointerType( Type::Qualifiers(), new VoidType( ty->get_qualifiers() ) );
                         delete ty;
                         return ret;
 …
+        }
         Type * ScrubTyVars::mutate( StructInstType *structInst ) {
+        Type * ScrubTyVars::postmutate( StructInstType * structInst ) {
                 return mutateAggregateType( structInst );
+        }
         Type * ScrubTyVars::mutate( UnionInstType *unionInst ) {
+        Type * ScrubTyVars::postmutate( UnionInstType * unionInst ) {
                 return mutateAggregateType( unionInst );
+        }
+        Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) {
+        void ScrubTyVars::primeBaseScrub( Type * type ) {
+                // need to determine whether type needs to be scrubbed to determine whether
+                // automatic recursion is necessary
+                if ( Type * t = shouldScrub( type ) ) {
+                        visit_children = false;
+                        GuardValue( dynType );
+                        dynType = t;
+                }
+        }
+        Expression * ScrubTyVars::postmutate( SizeofExpr * szeof ) {
                 // sizeof( T ) => _sizeof_T parameter, which is the size of T
                 if ( Type *dynType = shouldScrub( szeof->get_type() ) ) {
+                if ( dynType ) {
                         Expression *expr = new NameExpr( sizeofName( mangleType( dynType ) ) );
                         return expr;
-                } else {
-                        return Mutator::mutate( szeof );
                 } // if
+                return szeof;
+        }
         Expression * ScrubTyVars::mutate( AlignofExpr *algnof ) {
+        Expression * ScrubTyVars::postmutate( AlignofExpr * algnof ) {
                 // alignof( T ) => _alignof_T parameter, which is the alignment of T
                 if ( Type *dynType = shouldScrub( algnof->get_type() ) ) {
+                if ( dynType ) {
                         Expression *expr = new NameExpr( alignofName( mangleType( dynType ) ) );
                         return expr;
-                } else {
-                        return Mutator::mutate( algnof );
                 } // if
+                return algnof;
+        }
+        Type * ScrubTyVars::mutate( PointerType *pointer ) {
+//              // special case of shouldScrub that takes all TypeInstType pointer bases, even if they're not dynamic
+//              Type *base = pointer->get_base();
+//              Type *dynType = 0;
+//              if ( dynamicOnly ) {
+//                      if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( base ) ) {
+//                              if ( tyVars.find( typeInst->get_name() ) != tyVars.end() ) { dynType = typeInst; }
+//                      } else {
+//                              dynType = isDynType( base, tyVars );
+//                      }
+//              } else {
+//                      dynType = isPolyType( base, tyVars );
+//              }
+//              if ( dynType ) {
+                if ( Type *dynType = shouldScrub( pointer->get_base() ) ) {
+                        Type *ret = dynType->acceptMutator( *this );
+        Type * ScrubTyVars::postmutate( PointerType * pointer ) {
+                if ( dynType ) {
+                        Type * ret = dynType->acceptMutator( *visitor );
                         ret->get_qualifiers() |= pointer->get_qualifiers();
                         pointer->set_base( 0 );
+                        pointer->base = nullptr;
                         delete pointer;
                         return ret;
+                }
                 return Mutator::mutate( pointer );
+                return pointer;
+        }
 } // namespace GenPoly

src/GenPoly/ScrubTyVars.h

-              rf9feab8
+              r90152a4
 #include <cassert>            // for assert
+#include "Common/PassVisitor.h"
 #include "GenPoly.h"          // for TyVarMap, isPolyType, isDynType
 #include "SynTree/Mutator.h"  // for Mutator
 …
 namespace GenPoly {
         class ScrubTyVars : public Mutator {
+        struct ScrubTyVars : public WithVisitorRef<ScrubTyVars>, public WithShortCircuiting, public WithGuards {
                 /// Whether to scrub all type variables from the provided map, dynamic type variables from the provided map, or all type variables
                 enum ScrubMode { FromMap, DynamicFromMap, All };
 …
                 static SynTreeClass *scrubAll( SynTreeClass *target );
+                virtual Type* mutate( TypeInstType *typeInst );
+                virtual Type* mutate( StructInstType *structInst );
+                virtual Type* mutate( UnionInstType *unionInst );
+                virtual Expression* mutate( SizeofExpr *szeof );
+                virtual Expression* mutate( AlignofExpr *algnof );
+                virtual Type* mutate( PointerType *pointer );
+                /// determine if children should be visited based on whether base type should be scrubbed.
+                void primeBaseScrub( Type * );
+                void premutate( TypeInstType * ) { visit_children = false; }
+                void premutate( StructInstType * ) { visit_children = false; }
+                void premutate( UnionInstType * ) { visit_children = false; }
+                void premutate( SizeofExpr * szeof ) { primeBaseScrub( szeof->type ); }
+                void premutate( AlignofExpr * algnof ) { primeBaseScrub( algnof->type ); }
+                void premutate( PointerType * pointer ) { primeBaseScrub( pointer->base ); }
+                Type * postmutate( TypeInstType * typeInst );
+                Type * postmutate( StructInstType * structInst );
+                Type * postmutate( UnionInstType * unionInst );
+                Expression * postmutate( SizeofExpr * szeof );
+                Expression * postmutate( AlignofExpr * algnof );
+                Type * postmutate( PointerType * pointer );
           private:
 …
                 const TyVarMap *tyVars;  ///< Type variables to scrub
                 ScrubMode mode;          ///< which type variables to scrub? [FromMap]
+                Type * dynType = nullptr; ///< result of shouldScrub
         };
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrub( SynTreeClass *target, const TyVarMap &tyVars ) {
                 ScrubTyVars scrubber( tyVars );
+                PassVisitor<ScrubTyVars> scrubber( tyVars );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
+        }
 …
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrubDynamic( SynTreeClass *target, const TyVarMap &tyVars ) {
                 ScrubTyVars scrubber( tyVars, ScrubTyVars::DynamicFromMap );
+                PassVisitor<ScrubTyVars> scrubber( tyVars, ScrubTyVars::DynamicFromMap );
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
+        }
 …
         template< typename SynTreeClass >
         SynTreeClass * ScrubTyVars::scrubAll( SynTreeClass *target ) {
                 ScrubTyVars scrubber;
+                PassVisitor<ScrubTyVars> scrubber;
                 return static_cast< SynTreeClass * >( target->acceptMutator( scrubber ) );
+        }

src/GenPoly/Specialize.cc

-              rf9feab8
+              r90152a4
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"        // for SemanticError
 #include "Common/UniqueName.h"           // for UniqueName
 #include "Common/utility.h"              // for group_iterate
 …
+        }
-        struct EnvTrimmer {
-                TypeSubstitution * env, * newEnv;
-                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
-                void previsit( TypeDecl * tyDecl ) {
-                        // transfer known bindings for seen type variables
-                        if ( Type * t = env->lookup( tyDecl->name ) ) {
-                                newEnv->add( tyDecl->name, t );
+                        }
+                }
-        };
-        /// reduce environment to just the parts that are referenced in a given expression
-        TypeSubstitution * trimEnv( ApplicationExpr * expr, TypeSubstitution * env ) {
-                if ( env ) {
-                        TypeSubstitution * newEnv = new TypeSubstitution();
-                        PassVisitor<EnvTrimmer> trimmer( env, newEnv );
-                        expr->accept( trimmer );
-                        return newEnv;
+                }
-                return nullptr;
+        }
         /// Generates a thunk that calls `actual` with type `funType` and returns its address
         Expression * Specialize::createThunkFunction( FunctionType *funType, Expression *actual, InferredParams *inferParams ) {
 …
+                }
                 appExpr->set_env( trimEnv( appExpr, env ) );
+                appExpr->env = TypeSubstitution::newFromExpr( appExpr, env );
                 if ( inferParams ) {
                         appExpr->get_inferParams() = *inferParams;

src/InitTweak/FixGlobalInit.cc

-              rf9feab8
+              r90152a4
 #include "Common/PassVisitor.h"
-#include "Common/SemanticError.h"  // for SemanticError
 #include "Common/UniqueName.h"     // for UniqueName
 #include "InitTweak.h"             // for isIntrinsicSingleArgCallStmt
 …
         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

-              rf9feab8
+              r90152a4
 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

-              rf9feab8
+              r90152a4
 // file "LICENCE" distributed with Cforall.
 //
 // FixInit.h --
+// FixInit.cc --
 //
 // Author           : Rob Schluntz
 …
 #include "SynTree/Type.h"              // for Type, Type::StorageClasses
 #include "SynTree/TypeSubstitution.h"  // for TypeSubstitution, operator<<
 #include "SynTree/VarExprReplacer.h"   // for VarExprReplacer
+#include "SynTree/DeclReplacer.h"      // for DeclReplacer
 #include "SynTree/Visitor.h"           // for acceptAll, maybeAccept
 …
         namespace {
                 typedef std::unordered_map< int, int > UnqCount;
+                struct SelfAssignChecker {
+                        void previsit( ApplicationExpr * appExpr );
+                };
                 struct InsertImplicitCalls : public WithTypeSubstitution {
 …
                 };
                 class FixCopyCtors final : public WithStmtsToAdd, public WithShortCircuiting, public WithVisitorRef<FixCopyCtors> {
+                class FixCopyCtors final : public WithStmtsToAdd, public WithShortCircuiting, public WithVisitorRef<FixCopyCtors>, public WithTypeSubstitution {
                   public:
                         FixCopyCtors( UnqCount & unqCount ) : unqCount( unqCount ){}
 …
                 };
                 struct GenStructMemberCalls final : public WithGuards, public WithShortCircuiting, public WithIndexer {
+                struct GenStructMemberCalls final : public WithGuards, public WithShortCircuiting, public WithIndexer, public WithVisitorRef<GenStructMemberCalls> {
                         /// generate default/copy ctor and dtor calls for user-defined struct ctor/dtors
                         /// for any member that is missing a corresponding ctor/dtor call.
 …
                         static void generate( std::list< Declaration * > & translationUnit );
+                        void previsit( StructDecl * structDecl );
+                        void previsit( FunctionDecl * funcDecl );
+                        void postvisit( FunctionDecl * funcDecl );
+                        void previsit( MemberExpr * memberExpr );
+                        void previsit( ApplicationExpr * appExpr );
+                        SemanticError errors;
+                        void premutate( StructDecl * structDecl );
+                        void premutate( FunctionDecl * funcDecl );
+                        DeclarationWithType * postmutate( FunctionDecl * funcDecl );
+                        void premutate( MemberExpr * memberExpr );
+                        void premutate( ApplicationExpr * appExpr );
+                        /// Note: this post mutate used to be in a separate visitor. If this pass breaks, one place to examine is whether it is
+                        /// okay for this part of the recursion to occur alongside the rest.
+                        Expression * postmutate( UntypedExpr * expr );
+                        SemanticErrorException errors;
                   private:
                         template< typename... Params >
 …
                 };
-                // very simple resolver-like mutator class - used to
-                // resolve UntypedExprs that are found within newly
-                // generated constructor/destructor calls
-                class MutatingResolver final : public Mutator {
-                  public:
-                        MutatingResolver( SymTab::Indexer & indexer ) : indexer( indexer ) {}
-                        using Mutator::mutate;
-                        virtual DeclarationWithType* mutate( ObjectDecl *objectDecl ) override;
-                        virtual Expression* mutate( UntypedExpr *untypedExpr ) override;
-                  private:
-                        SymTab::Indexer & indexer;
-                };
                 struct FixCtorExprs final : public WithDeclsToAdd, public WithIndexer {
                         /// expands ConstructorExpr nodes into comma expressions, using a temporary for the first argument
 …
         } // namespace
+        void fix( std::list< Declaration * > & translationUnit, const std::string & filename, bool inLibrary ) {
+        void fix( std::list< Declaration * > & translationUnit, bool inLibrary ) {
+                PassVisitor<SelfAssignChecker> checker;
+                acceptAll( translationUnit, checker );
                 // fixes ConstructorInit for global variables. should happen before fixInitializers.
                 InitTweak::fixGlobalInit( translationUnit, filename, inLibrary );
+                InitTweak::fixGlobalInit( translationUnit, inLibrary );
                 UnqCount unqCount;
 …
                         // can't use mutateAll, because need to insert declarations at top-level
                         // can't use DeclMutator, because sometimes need to insert IfStmt, etc.
                         SemanticError errors;
+                        SemanticErrorException errors;
                         for ( std::list< Declaration * >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
                                 try {
                                         maybeMutate( *i, fixer );
                                         translationUnit.splice( i, fixer.pass.staticDtorDecls );
+                                } catch( SemanticError &e ) {
+                                        e.set_location( (*i)->location );
+                                } catch( SemanticErrorException &e ) {
                                         errors.append( e );
                                 } // try
 …
                 void GenStructMemberCalls::generate( std::list< Declaration * > & translationUnit ) {
                         PassVisitor<GenStructMemberCalls> warner;
                         acceptAll( translationUnit, warner );
+                        mutateAll( translationUnit, warner );
+                }
 …
                         PassVisitor<FixCtorExprs> fixer;
                         mutateAll( translationUnit, fixer );
+                }
+                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;
+                                                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;
+                        }
+                }
+                void SelfAssignChecker::previsit( ApplicationExpr * appExpr ) {
+                        DeclarationWithType * function = getFunction( appExpr );
+                        if ( function->name == "?=?" ) { // doesn't use isAssignment, because ?+=?, etc. should not count as self-assignment
+                                if ( appExpr->args.size() == 2 ) {
+                                        // check for structural similarity (same variable use, ignore casts, etc. - but does not look too deeply, anything looking like a function is off limits)
+                                        if ( structurallySimilar( appExpr->args.front(), appExpr->args.back() ) ) {
+                                                SemanticWarning( appExpr->location, Warning::SelfAssignment, toCString( appExpr->args.front() ) );
+                                        }
+                                }
+                        }
+                }
 …
                         // arrays are not copy constructed, so this should always be an ExprStmt
                         ImplicitCtorDtorStmt * stmt = genCtorDtor( fname, var, cpArg );
+                        ExprStmt * exprStmt = strict_dynamic_cast< ExprStmt * >( stmt->get_callStmt() );
+                        assertf( stmt, "ResolveCopyCtors: genCtorDtor returned nullptr: %s / %s / %s", fname.c_str(), toString( var ).c_str(), toString( cpArg ).c_str() );
+                        ExprStmt * exprStmt = strict_dynamic_cast< ExprStmt * >( stmt->callStmt );
                         Expression * resolved = exprStmt->expr;
                         exprStmt->expr = nullptr; // take ownership of expr
 …
                         ResolvExpr::findVoidExpression( resolved, indexer );
                         assert( resolved );
                         if ( resolved->get_env() ) {
+                        if ( resolved->env ) {
                                 // Extract useful information and discard new environments. Keeping them causes problems in PolyMutator passes.
                                 env->add( *resolved->get_env() );
                                 delete resolved->get_env();
                                 resolved->set_env( nullptr );
+                                env->add( *resolved->env );
+                                delete resolved->env;
+                                resolved->env = nullptr;
                         } // if
                         delete stmt;
+                        if ( TupleAssignExpr * assign = dynamic_cast< TupleAssignExpr * >( resolved ) ) {
+                                // fix newly generated StmtExpr
+                                postvisit( assign->stmtExpr );
+                        }
                         return resolved;
+                }
 …
                                 static UniqueName retNamer("_tmp_stmtexpr_ret");
-                                // create variable that will hold the result of the stmt expr
                                 result = result->clone();
                                 env->apply( result );
+                                if ( ! InitTweak::isConstructable( result ) ) {
+                                        delete result;
+                                        return;
+                                }
+                                // create variable that will hold the result of the stmt expr
                                 ObjectDecl * ret = ObjectDecl::newObject( retNamer.newName(), result, nullptr );
                                 ret->get_type()->set_const( false );
                                 stmtExpr->get_returnDecls().push_front( ret );
+                                ret->type->set_const( false );
+                                stmtExpr->returnDecls.push_front( ret );
                                 // must have a non-empty body, otherwise it wouldn't have a result
                                 CompoundStmt * body = stmtExpr->get_statements();
+                                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->set_expr( makeCtorDtor( "?{}", ret, last->get_expr() ) );
                                 stmtExpr->get_dtors().push_front( makeCtorDtor( "^?{}", ret ) );
+                                last->expr = makeCtorDtor( "?{}", ret, last->get_expr() );
+                                stmtExpr->dtors.push_front( makeCtorDtor( "^?{}", ret ) );
                         } // if
+                }
 …
                         // 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
 …
                         // to the outer context, rather than inside of the statement expression.
                         visit_children = false;
                         std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                        std::list< Statement * > & stmts = stmtExpr->statements->get_kids();
                         for ( Statement *& stmt : stmts ) {
                                 stmt = stmt->acceptMutator( *visitor );
                         } // for
                         assert( stmtExpr->get_result() );
                         Type * result = stmtExpr->get_result();
+                        assert( stmtExpr->result );
+                        Type * result = stmtExpr->result;
                         if ( ! result->isVoid() ) {
                                 for ( ObjectDecl * obj : stmtExpr->get_returnDecls() ) {
+                                for ( ObjectDecl * obj : stmtExpr->returnDecls ) {
                                         stmtsToAddBefore.push_back( new DeclStmt( obj ) );
                                 } // for
                                 // add destructors after current statement
                                 for ( Expression * dtor : stmtExpr->get_dtors() ) {
+                                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() );
+                                assert( ! stmtExpr->get_returnDecls().empty() );
+                                stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
+                                stmtExpr->get_returnDecls().clear();
+                                stmtExpr->get_dtors().clear();
+                        }
+                        assert( stmtExpr->get_returnDecls().empty() );
+                        assert( stmtExpr->get_dtors().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() );
+                }
 …
                                 replacement = new CastExpr( replacement, base->clone() );
+                        }
                         VarExprReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
                         dtorFunc->statements->push_back( dtor );
+                        DeclReplacer::replace( dtor, { std::make_pair( objDecl, replacement ) } );
+                        dtorFunc->statements->push_back( strict_dynamic_cast<Statement *>( dtor ) );
                         return dtorFunc;
 …
+                        )
                         if ( ! diff.empty() ) {
                                 throw SemanticError( std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " ", stmt );
+                                SemanticError( stmt, std::string("jump to label '") + stmt->get_target().get_name() + "' crosses initialization of " + (*diff.begin())->get_name() + " " );
                         } // if
+                }
 …
+                }
                 void GenStructMemberCalls::previsit( StructDecl * structDecl ) {
+                void GenStructMemberCalls::premutate( StructDecl * structDecl ) {
                         if ( ! dtorStruct && structDecl->name == "__Destructor" ) {
                                 dtorStruct = structDecl;
 …
+                }
                 void GenStructMemberCalls::previsit( FunctionDecl * funcDecl ) {
+                void GenStructMemberCalls::premutate( FunctionDecl * funcDecl ) {
                         GuardValue( function );
                         GuardValue( unhandled );
 …
                         GuardValue( isCtor );
                         GuardValue( structDecl );
                         errors = SemanticError();  // clear previous errors
+                        errors = SemanticErrorException();  // clear previous errors
                         // need to start with fresh sets
 …
+                }
                 void GenStructMemberCalls::postvisit( FunctionDecl * funcDecl ) {
+                DeclarationWithType * GenStructMemberCalls::postmutate( FunctionDecl * funcDecl ) {
                         // remove the unhandled objects from usedUninit, because a call is inserted
                         // to handle them - only objects that are later constructed are used uninitialized.
 …
                                                 Statement * callStmt = stmt.front();
-                                                MutatingResolver resolver( indexer );
                                                 try {
                                                         callStmt->acceptMutator( resolver );
+                                                        callStmt->acceptMutator( *visitor );
                                                         if ( isCtor ) {
                                                                 function->statements->push_front( callStmt );
 …
                                                                 function->statements->kids.splice( function->statements->kids.begin(), stmtsToAdd );
+                                                        }
                                                 } catch ( SemanticError & error ) {
+                                                } catch ( SemanticErrorException & error ) {
                                                         emit( funcDecl->location, "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
+                                                }
 …
                                 throw errors;
+                        }
+                        return funcDecl;
+                }
 …
+                }
                 void GenStructMemberCalls::previsit( ApplicationExpr * appExpr ) {
+                void GenStructMemberCalls::premutate( ApplicationExpr * appExpr ) {
                         if ( ! checkWarnings( function ) ) {
                                 visit_children = false;
 …
                         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 );
+                                        }
+                                }
 …
+                }
                 void GenStructMemberCalls::previsit( MemberExpr * memberExpr ) {
+                void GenStructMemberCalls::premutate( MemberExpr * memberExpr ) {
                         if ( ! checkWarnings( function ) || ! isCtor ) {
                                 visit_children = false;
 …
                 template< typename Visitor, typename... Params >
                 void error( Visitor & v, CodeLocation loc, const Params &... params ) {
+                        SemanticError err( toString( params... ) );
+                        err.set_location( loc );
+                        SemanticErrorException err( loc, toString( params... ) );
                         v.errors.append( err );
+                }
 …
+                }
+                DeclarationWithType * MutatingResolver::mutate( ObjectDecl * objectDecl ) {
+                        // add object to the indexer assumes that there will be no name collisions
+                        // in generated code. If this changes, add mutate methods for entities with
+                        // scope and call {enter,leave}Scope explicitly.
+                        indexer.addId( objectDecl );
+                        return objectDecl;
+                }
+                Expression * MutatingResolver::mutate( UntypedExpr * untypedExpr ) {
+                Expression * GenStructMemberCalls::postmutate( UntypedExpr * untypedExpr ) {
                         Expression * newExpr = untypedExpr;
                         ResolvExpr::findVoidExpression( newExpr, indexer );

src/InitTweak/FixInit.h

rf9feab8	r90152a4
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

-              rf9feab8
+              r90152a4
 #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/Type.h"          // for Type, ArrayType, Type::Qualifiers
 #include "SynTree/Visitor.h"       // for acceptAll, maybeAccept
+#include "Tuples/Tuples.h"         // for maybeImpure
 namespace InitTweak {
 …
         };
         struct HoistArrayDimension final : public WithDeclsToAdd, public WithShortCircuiting, public WithGuards {
+        struct HoistArrayDimension final : public WithDeclsToAdd, public WithShortCircuiting, public WithGuards, public WithIndexer {
                 /// hoist dimension from array types in object declaration so that it uses a single
                 /// const variable of type size_t, so that side effecting array dimensions are only
 …
                 void premutate( FunctionType * ) { visit_children = false; }
+                // need this so that enumerators are added to the indexer, due to premutate(AggregateDecl *)
+                void premutate( EnumDecl * ) {}
                 void hoist( Type * type );
 …
                                 if ( varExpr->var == retVal ) return;
+                        }
+                        stmtsToAddBefore.push_back( genCtorDtor( "?{}", retVal, returnStmt->get_expr() ) );
+                        Statement * stmt = genCtorDtor( "?{}", retVal, returnStmt->expr );
+                        assertf( stmt, "ReturnFixer: genCtorDtor returned nullptr: %s / %s", toString( retVal ).c_str(), toString( returnStmt->expr ).c_str() );
+                        stmtsToAddBefore.push_back( stmt );
                         // return the retVal object
 …
                         if ( ! arrayType->get_dimension() ) return; // xxx - recursive call to hoist?
+                        // don't need to hoist dimension if it's a constexpr - only need to if there's potential for side effects.
+                        if ( isConstExpr( arrayType->get_dimension() ) ) return;
+                        // need to resolve array dimensions in order to accurately determine if constexpr
+                        ResolvExpr::findSingleExpression( arrayType->dimension, SymTab::SizeType->clone(), indexer );
+                        // array is variable-length when the dimension is not constexpr
+                        arrayType->isVarLen = ! isConstExpr( arrayType->dimension );
+                        // don't need to hoist dimension if it's definitely pure - only need to if there's potential for side effects.
+                        if ( ! Tuples::maybeImpure( arrayType->dimension ) ) return;
                         ObjectDecl * arrayDimension = new ObjectDecl( dimensionName.newName(), storageClasses, LinkageSpec::C, 0, SymTab::SizeType->clone(), new SingleInit( arrayType->get_dimension() ) );
 …
         void HoistArrayDimension::premutate( FunctionDecl * ) {
                 GuardValue( inFunction );
+                inFunction = true;
+        }
 …
                 Type * type = objDecl->get_type();
                 while ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
+                        // must always construct VLAs with an initializer, since this is an error in C
+                        if ( at->isVarLen && objDecl->init ) return true;
                         type = at->get_base();
+                }
 …
                 if ( tryConstruct( objDecl ) && ( managedTypes.isManaged( objDecl ) || ((! inFunction || objDecl->get_storageClasses().is_static ) && ! isConstExpr( objDecl->get_init() ) ) ) ) {
                         // constructed objects cannot be designated
                         if ( isDesignated( objDecl->get_init() ) ) throw SemanticError( "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n", objDecl );
+                        if ( isDesignated( objDecl->get_init() ) ) SemanticError( objDecl, "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n" );
                         // constructed objects should not have initializers nested too deeply
                         if ( ! checkInitDepth( objDecl ) ) throw SemanticError( "Managed object's initializer is too deep ", objDecl );
+                        if ( ! checkInitDepth( objDecl ) ) SemanticError( objDecl, "Managed object's initializer is too deep " );
                         objDecl->set_init( genCtorInit( objDecl ) );

src/InitTweak/InitTweak.cc

-              rf9feab8
+              r90152a4
                                         // xxx - this shouldn't be an error, but need a way to
                                         // terminate without creating output, so should catch this error
                                         throw SemanticError( "unbalanced list initializers" );
+                                        SemanticError( init->location, "unbalanced list initializers" );
+                                }
 …
                 ObjectDecl * objDecl = dynamic_cast< ObjectDecl * >( dwt );
                 if ( ! objDecl ) return false;
+                return ! LinkageSpec::isBuiltin( objDecl->get_linkage() ) &&
+                        (objDecl->get_init() == nullptr ||
+                return (objDecl->get_init() == nullptr ||
                                 ( objDecl->get_init() != nullptr && objDecl->get_init()->get_maybeConstructed() ))
                         && ! objDecl->get_storageClasses().is_extern
 …
                 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;
 …
+                }
                 if ( dynamic_cast< ReferenceType * >( dst->result ) ) {
+                        dst = new AddressExpr( dst );
+                        for (int depth = dst->result->referenceDepth(); depth > 0; depth--) {
+                                dst = new AddressExpr( dst );
+                        }
                 } else {
                         dst = new CastExpr( dst, new ReferenceType( noQualifiers, dst->result->clone() ) );
+                }
                 if ( dynamic_cast< ReferenceType * >( src->result ) ) {
+                        src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
+                        for (int depth = src->result->referenceDepth(); depth > 0; depth--) {
+                                src = new AddressExpr( src );
+                        }
+                        // src = new CastExpr( src, new ReferenceType( noQualifiers, src->result->stripReferences()->clone() ) );
+                }
                 return new ApplicationExpr( VariableExpr::functionPointer( assign ), { dst, src } );
 …
                 void previsit( ConstantExpr * ) {}
+                void previsit( VariableExpr * varExpr ) {
+                        visit_children = false;
+                        if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( varExpr->result ) ) {
+                                long long int value;
+                                if ( inst->baseEnum->valueOf( varExpr->var, value ) ) {
+                                        // enumerators are const expr
+                                        return;
+                                }
+                        }
+                        isConstExpr = false;
+                }
                 bool isConstExpr = true;
         };

src/Makefile.am

-              rf9feab8
+              r90152a4
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = foreign subdir-objects
 SRC = main.cc \
+      MakeLibCfa.cc
+      MakeLibCfa.cc \
+      CompilationState.cc
 MAINTAINERCLEANFILES =
+MOSTLYCLEANFILES =
 # Is there a way to use a variable for the directory names?
 …
 include SynTree/module.mk
 include Tuples/module.mk
+include Validate/module.mk
 include Virtual/module.mk
 # 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
+___driver_cfa_cpp_SOURCES = $(SRC)
+___driver_cfa_cpp_LDADD = -ldl                  # yywrap
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
+AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
+demangler_SOURCES = SymTab/demangler.cc
+demangler_LDADD = libdemangle.a     # yywrap
+noinst_LIBRARIES = libdemangle.a
+libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.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 \
+  CompilationState.cc \
+  CodeGen/CodeGenerator.cc \
+  CodeGen/FixMain.cc \
+  CodeGen/GenType.cc \
+  CodeGen/OperatorTable.cc \
+  Common/Assert.cc \
+  Common/Eval.cc \
+  Common/SemanticError.cc \
+  Common/UniqueName.cc \
+  Concurrency/Keywords.cc \
+  ControlStruct/ForExprMutator.cc \
+  ControlStruct/LabelFixer.cc \
+  ControlStruct/LabelGenerator.cc \
+  ControlStruct/MLEMutator.cc \
+  ControlStruct/Mutate.cc \
+  GenPoly/GenPoly.cc \
+  GenPoly/Lvalue.cc \
+  InitTweak/GenInit.cc \
+  InitTweak/InitTweak.cc \
+  Parser/LinkageSpec.cc \
+  ResolvExpr/AdjustExprType.cc \
+  ResolvExpr/Alternative.cc \
+  ResolvExpr/AlternativeFinder.cc \
+  ResolvExpr/ExplodedActual.cc \
+  ResolvExpr/CastCost.cc \
+  ResolvExpr/CommonType.cc \
+  ResolvExpr/ConversionCost.cc \
+  ResolvExpr/CurrentObject.cc \
+  ResolvExpr/FindOpenVars.cc \
+  ResolvExpr/Occurs.cc \
+  ResolvExpr/PolyCost.cc \
+  ResolvExpr/PtrsAssignable.cc \
+  ResolvExpr/PtrsCastable.cc \
+  ResolvExpr/RenameVars.cc \
+  ResolvExpr/Resolver.cc \
+  ResolvExpr/ResolveTypeof.cc \
+  ResolvExpr/TypeEnvironment.cc \
+  ResolvExpr/Unify.cc \
+  SymTab/Autogen.cc \
+  SymTab/FixFunction.cc \
+  SymTab/Indexer.cc \
+  SymTab/Mangler.cc \
+  SymTab/Validate.cc \
+  Tuples/Explode.cc \
+  Tuples/TupleAssignment.cc \
+  Tuples/TupleExpansion.cc \
+  Validate/HandleAttributes.cc
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

src/Makefile.in

-              rf9feab8
+              r90152a4
 ######################### -*- 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$(EXEEXT)
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(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)
+AR = ar
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo "  AR      " $@;
+am__v_AR_1 =
+libdemangle_a_AR = $(AR) $(ARFLAGS)
+libdemangle_a_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libdemangle_a_OBJECTS = SymTab/Demangle.$(OBJEXT) \
+        SymTab/ManglerCommon.$(OBJEXT) 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) CompilationState.$(OBJEXT) \
+        CodeGen/CodeGenerator.$(OBJEXT) CodeGen/FixMain.$(OBJEXT) \
+        CodeGen/GenType.$(OBJEXT) CodeGen/OperatorTable.$(OBJEXT) \
+        Common/Assert.$(OBJEXT) Common/Eval.$(OBJEXT) \
+        Common/SemanticError.$(OBJEXT) Common/UniqueName.$(OBJEXT) \
+        Concurrency/Keywords.$(OBJEXT) \
+        ControlStruct/ForExprMutator.$(OBJEXT) \
+        ControlStruct/LabelFixer.$(OBJEXT) \
+        ControlStruct/LabelGenerator.$(OBJEXT) \
+        ControlStruct/MLEMutator.$(OBJEXT) \
+        ControlStruct/Mutate.$(OBJEXT) GenPoly/GenPoly.$(OBJEXT) \
+        GenPoly/Lvalue.$(OBJEXT) InitTweak/GenInit.$(OBJEXT) \
+        InitTweak/InitTweak.$(OBJEXT) Parser/LinkageSpec.$(OBJEXT) \
+        ResolvExpr/AdjustExprType.$(OBJEXT) \
+        ResolvExpr/Alternative.$(OBJEXT) \
+        ResolvExpr/AlternativeFinder.$(OBJEXT) \
+        ResolvExpr/ExplodedActual.$(OBJEXT) \
+        ResolvExpr/CastCost.$(OBJEXT) ResolvExpr/CommonType.$(OBJEXT) \
+        ResolvExpr/ConversionCost.$(OBJEXT) \
+        ResolvExpr/CurrentObject.$(OBJEXT) \
+        ResolvExpr/FindOpenVars.$(OBJEXT) ResolvExpr/Occurs.$(OBJEXT) \
+        ResolvExpr/PolyCost.$(OBJEXT) \
+        ResolvExpr/PtrsAssignable.$(OBJEXT) \
+        ResolvExpr/PtrsCastable.$(OBJEXT) \
+        ResolvExpr/RenameVars.$(OBJEXT) ResolvExpr/Resolver.$(OBJEXT) \
+        ResolvExpr/ResolveTypeof.$(OBJEXT) \
+        ResolvExpr/TypeEnvironment.$(OBJEXT) \
+        ResolvExpr/Unify.$(OBJEXT) SymTab/Autogen.$(OBJEXT) \
+        SymTab/FixFunction.$(OBJEXT) SymTab/Indexer.$(OBJEXT) \
+        SymTab/Mangler.$(OBJEXT) SymTab/Validate.$(OBJEXT) \
+        Tuples/Explode.$(OBJEXT) Tuples/TupleAssignment.$(OBJEXT) \
+        Tuples/TupleExpansion.$(OBJEXT) \
+        Validate/HandleAttributes.$(OBJEXT)
+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) \
+        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-Visitor.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Mutator.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) \
+        SynTree/driver_cfa_cpp-VarExprReplacer.$(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_1 = main.$(OBJEXT) MakeLibCfa.$(OBJEXT) \
+        CompilationState.$(OBJEXT) CodeGen/Generate.$(OBJEXT) \
+        CodeGen/CodeGenerator.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
+        CodeGen/FixNames.$(OBJEXT) CodeGen/FixMain.$(OBJEXT) \
+        CodeGen/OperatorTable.$(OBJEXT) CodeTools/DeclStats.$(OBJEXT) \
+        CodeTools/TrackLoc.$(OBJEXT) Concurrency/Keywords.$(OBJEXT) \
+        Concurrency/Waitfor.$(OBJEXT) Common/SemanticError.$(OBJEXT) \
+        Common/UniqueName.$(OBJEXT) Common/DebugMalloc.$(OBJEXT) \
+        Common/Assert.$(OBJEXT) Common/Heap.$(OBJEXT) \
+        Common/Eval.$(OBJEXT) ControlStruct/LabelGenerator.$(OBJEXT) \
+        ControlStruct/LabelFixer.$(OBJEXT) \
+        ControlStruct/MLEMutator.$(OBJEXT) \
+        ControlStruct/Mutate.$(OBJEXT) \
+        ControlStruct/ForExprMutator.$(OBJEXT) \
+        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) \
+        ResolvExpr/AlternativeFinder.$(OBJEXT) \
+        ResolvExpr/Alternative.$(OBJEXT) ResolvExpr/Unify.$(OBJEXT) \
+        ResolvExpr/PtrsAssignable.$(OBJEXT) \
+        ResolvExpr/CommonType.$(OBJEXT) \
+        ResolvExpr/ConversionCost.$(OBJEXT) \
+        ResolvExpr/CastCost.$(OBJEXT) \
+        ResolvExpr/PtrsCastable.$(OBJEXT) \
+        ResolvExpr/AdjustExprType.$(OBJEXT) \
+        ResolvExpr/AlternativePrinter.$(OBJEXT) \
+        ResolvExpr/Resolver.$(OBJEXT) \
+        ResolvExpr/ResolveTypeof.$(OBJEXT) \
+        ResolvExpr/RenameVars.$(OBJEXT) \
+        ResolvExpr/FindOpenVars.$(OBJEXT) \
+        ResolvExpr/PolyCost.$(OBJEXT) ResolvExpr/Occurs.$(OBJEXT) \
+        ResolvExpr/TypeEnvironment.$(OBJEXT) \
+        ResolvExpr/CurrentObject.$(OBJEXT) \
+        ResolvExpr/ExplodedActual.$(OBJEXT) SymTab/Indexer.$(OBJEXT) \
+        SymTab/Mangler.$(OBJEXT) SymTab/ManglerCommon.$(OBJEXT) \
+        SymTab/Validate.$(OBJEXT) SymTab/FixFunction.$(OBJEXT) \
+        SymTab/Autogen.$(OBJEXT) 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) \
+        Tuples/TupleAssignment.$(OBJEXT) \
+        Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
+        Validate/HandleAttributes.$(OBJEXT) \
+        Virtual/ExpandCasts.$(OBJEXT)
+am____driver_cfa_cpp_OBJECTS = $(am__objects_1)
+___driver_cfa_cpp_OBJECTS = $(am____driver_cfa_cpp_OBJECTS)
+___driver_cfa_cpp_DEPENDENCIES =
+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)
 …
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 =
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
 AM_V_LEX = $(am__v_LEX_@AM_V@)
 …
 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/
 …
 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
 …
         $(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@
 …
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CC@
 CCAS = @CCAS@
 …
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 …
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 …
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 # create object files in directory with source files
 AUTOMAKE_OPTIONS = subdir-objects
 SRC = main.cc MakeLibCfa.cc CodeGen/Generate.cc \
+AUTOMAKE_OPTIONS = foreign subdir-objects
+SRC = main.cc MakeLibCfa.cc CompilationState.cc CodeGen/Generate.cc \
         CodeGen/CodeGenerator.cc CodeGen/GenType.cc \
         CodeGen/FixNames.cc CodeGen/FixMain.cc \
 …
         Concurrency/Waitfor.cc Common/SemanticError.cc \
         Common/UniqueName.cc Common/DebugMalloc.cc Common/Assert.cc \
         ControlStruct/LabelGenerator.cc ControlStruct/LabelFixer.cc \
         ControlStruct/MLEMutator.cc ControlStruct/Mutate.cc \
         ControlStruct/ForExprMutator.cc \
+        Common/Heap.cc Common/Eval.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 \
 …
         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 \
+        SymTab/Indexer.cc SymTab/Mangler.cc SymTab/ManglerCommon.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/FunctionDecl.cc SynTree/AggregateDecl.cc \
         SynTree/NamedTypeDecl.cc SynTree/TypeDecl.cc \
         SynTree/Initializer.cc SynTree/Visitor.cc SynTree/Mutator.cc \
         SynTree/TypeSubstitution.cc SynTree/Attribute.cc \
         SynTree/VarExprReplacer.cc Tuples/TupleAssignment.cc \
         Tuples/TupleExpansion.cc Tuples/Explode.cc \
+        SynTree/Initializer.cc SynTree/TypeSubstitution.cc \
+        SynTree/Attribute.cc SynTree/DeclReplacer.cc \
+        Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
+        Tuples/Explode.cc Validate/HandleAttributes.cc \
         Virtual/ExpandCasts.cc
 MAINTAINERCLEANFILES = Parser/parser.output ${libdir}/${notdir \
+        ${cfa_cpplib_PROGRAMS}}
+MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
+MOSTLYCLEANFILES = Parser/parser.hh Parser/parser.output
 BUILT_SOURCES = Parser/parser.hh
 AM_YFLAGS = -d -t -v
 …
 # 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                  # yywrap
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
+AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
+demangler_SOURCES = SymTab/demangler.cc
+demangler_LDADD = libdemangle.a     # yywrap
+noinst_LIBRARIES = libdemangle.a
+libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.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 \
+  CompilationState.cc \
+  CodeGen/CodeGenerator.cc \
+  CodeGen/FixMain.cc \
+  CodeGen/GenType.cc \
+  CodeGen/OperatorTable.cc \
+  Common/Assert.cc \
+  Common/Eval.cc \
+  Common/SemanticError.cc \
+  Common/UniqueName.cc \
+  Concurrency/Keywords.cc \
+  ControlStruct/ForExprMutator.cc \
+  ControlStruct/LabelFixer.cc \
+  ControlStruct/LabelGenerator.cc \
+  ControlStruct/MLEMutator.cc \
+  ControlStruct/Mutate.cc \
+  GenPoly/GenPoly.cc \
+  GenPoly/Lvalue.cc \
+  InitTweak/GenInit.cc \
+  InitTweak/InitTweak.cc \
+  Parser/LinkageSpec.cc \
+  ResolvExpr/AdjustExprType.cc \
+  ResolvExpr/Alternative.cc \
+  ResolvExpr/AlternativeFinder.cc \
+  ResolvExpr/ExplodedActual.cc \
+  ResolvExpr/CastCost.cc \
+  ResolvExpr/CommonType.cc \
+  ResolvExpr/ConversionCost.cc \
+  ResolvExpr/CurrentObject.cc \
+  ResolvExpr/FindOpenVars.cc \
+  ResolvExpr/Occurs.cc \
+  ResolvExpr/PolyCost.cc \
+  ResolvExpr/PtrsAssignable.cc \
+  ResolvExpr/PtrsCastable.cc \
+  ResolvExpr/RenameVars.cc \
+  ResolvExpr/Resolver.cc \
+  ResolvExpr/ResolveTypeof.cc \
+  ResolvExpr/TypeEnvironment.cc \
+  ResolvExpr/Unify.cc \
+  SymTab/Autogen.cc \
+  SymTab/FixFunction.cc \
+  SymTab/Indexer.cc \
+  SymTab/Mangler.cc \
+  SymTab/Validate.cc \
+  Tuples/Explode.cc \
+  Tuples/TupleAssignment.cc \
+  Tuples/TupleExpansion.cc \
+  Validate/HandleAttributes.cc
 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)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__configure_deps)
         @for dep in $?; do \
           case '$(am__configure_deps)' in \
 …
             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
         esac;
 $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Virtual/module.mk $(am__empty):
+$(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__empty):
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
         cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+clean-noinstLIBRARIES:
+        -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+SymTab/$(am__dirstamp):
+        @$(MKDIR_P) SymTab
+        @: > SymTab/$(am__dirstamp)
+SymTab/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) SymTab/$(DEPDIR)
+        @: > SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/Demangle.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(DEPDIR)/$(am__dirstamp)
+SymTab/ManglerCommon.$(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)
+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)
+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/SemanticError.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(DEPDIR)/$(am__dirstamp)
+Common/UniqueName.$(OBJEXT): Common/$(am__dirstamp) \
+        Common/$(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)
+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/ExplodedActual.$(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/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/Resolver.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/ResolveTypeof.$(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/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/Validate.$(OBJEXT): SymTab/$(am__dirstamp) \
+        SymTab/$(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/Explode.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/TupleAssignment.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Tuples/TupleExpansion.$(OBJEXT): Tuples/$(am__dirstamp) \
+        Tuples/$(DEPDIR)/$(am__dirstamp)
+Validate/$(am__dirstamp):
+        @$(MKDIR_P) Validate
+        @: > Validate/$(am__dirstamp)
+Validate/$(DEPDIR)/$(am__dirstamp):
+        @$(MKDIR_P) Validate/$(DEPDIR)
+        @: > Validate/$(DEPDIR)/$(am__dirstamp)
+Validate/HandleAttributes.$(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)
 …
 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) \
+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/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/Heap.$(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)
+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-Visitor.$(OBJEXT): SynTree/$(am__dirstamp) \
+        SynTree/$(DEPDIR)/$(am__dirstamp)
+SynTree/driver_cfa_cpp-Mutator.$(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-VarExprReplacer.$(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 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-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-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-Mutator.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-VarExprReplacer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.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@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)/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)/Heap.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@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)/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)/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)/ResolveTypeof.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Resolver.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@Validate/$(DEPDIR)/HandleAttributes.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Virtual/$(DEPDIR)/ExpandCasts.Po@am__quote@
 .cc.o:
 …
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @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@
-@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@
-@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@
-@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@
-@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`
-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-Visitor.o: SynTree/Visitor.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-Visitor.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Tpo -c -o SynTree/driver_cfa_cpp-Visitor.o `test -f 'SynTree/Visitor.cc' || echo '$(srcdir)/'`SynTree/Visitor.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Visitor.cc' object='SynTree/driver_cfa_cpp-Visitor.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-Visitor.o `test -f 'SynTree/Visitor.cc' || echo '$(srcdir)/'`SynTree/Visitor.cc
-SynTree/driver_cfa_cpp-Visitor.obj: SynTree/Visitor.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-Visitor.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Tpo -c -o SynTree/driver_cfa_cpp-Visitor.obj `if test -f 'SynTree/Visitor.cc'; then $(CYGPATH_W) 'SynTree/Visitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Visitor.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Visitor.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Visitor.cc' object='SynTree/driver_cfa_cpp-Visitor.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-Visitor.obj `if test -f 'SynTree/Visitor.cc'; then $(CYGPATH_W) 'SynTree/Visitor.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Visitor.cc'; fi`
-SynTree/driver_cfa_cpp-Mutator.o: SynTree/Mutator.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-Mutator.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Mutator.Tpo -c -o SynTree/driver_cfa_cpp-Mutator.o `test -f 'SynTree/Mutator.cc' || echo '$(srcdir)/'`SynTree/Mutator.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Mutator.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Mutator.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Mutator.cc' object='SynTree/driver_cfa_cpp-Mutator.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-Mutator.o `test -f 'SynTree/Mutator.cc' || echo '$(srcdir)/'`SynTree/Mutator.cc
-SynTree/driver_cfa_cpp-Mutator.obj: SynTree/Mutator.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-Mutator.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-Mutator.Tpo -c -o SynTree/driver_cfa_cpp-Mutator.obj `if test -f 'SynTree/Mutator.cc'; then $(CYGPATH_W) 'SynTree/Mutator.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Mutator.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Mutator.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Mutator.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/Mutator.cc' object='SynTree/driver_cfa_cpp-Mutator.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-Mutator.obj `if test -f 'SynTree/Mutator.cc'; then $(CYGPATH_W) 'SynTree/Mutator.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/Mutator.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-VarExprReplacer.o: SynTree/VarExprReplacer.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-VarExprReplacer.o -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo -c -o SynTree/driver_cfa_cpp-VarExprReplacer.o `test -f 'SynTree/VarExprReplacer.cc' || echo '$(srcdir)/'`SynTree/VarExprReplacer.cc
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VarExprReplacer.cc' object='SynTree/driver_cfa_cpp-VarExprReplacer.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-VarExprReplacer.o `test -f 'SynTree/VarExprReplacer.cc' || echo '$(srcdir)/'`SynTree/VarExprReplacer.cc
-SynTree/driver_cfa_cpp-VarExprReplacer.obj: SynTree/VarExprReplacer.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-VarExprReplacer.obj -MD -MP -MF SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo -c -o SynTree/driver_cfa_cpp-VarExprReplacer.obj `if test -f 'SynTree/VarExprReplacer.cc'; then $(CYGPATH_W) 'SynTree/VarExprReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VarExprReplacer.cc'; fi`
-@am__fastdepCXX_TRUE@   $(AM_V_at)$(am__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-VarExprReplacer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='SynTree/VarExprReplacer.cc' object='SynTree/driver_cfa_cpp-VarExprReplacer.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-VarExprReplacer.obj `if test -f 'SynTree/VarExprReplacer.cc'; then $(CYGPATH_W) 'SynTree/VarExprReplacer.cc'; else $(CYGPATH_W) '$(srcdir)/SynTree/VarExprReplacer.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`
 .ll.cc:
 …
 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 CodeGen/$(DEPDIR)/$(am__dirstamp)
         -rm -f CodeGen/$(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-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) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Validate/$(DEPDIR) Virtual/$(DEPDIR)
         -rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 …
 maintainer-clean: maintainer-clean-am
         -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Virtual/$(DEPDIR)
+        -rm -rf ./$(DEPDIR) CodeGen/$(DEPDIR) CodeTools/$(DEPDIR) Common/$(DEPDIR) Concurrency/$(DEPDIR) ControlStruct/$(DEPDIR) GenPoly/$(DEPDIR) InitTweak/$(DEPDIR) Parser/$(DEPDIR) ResolvExpr/$(DEPDIR) SymTab/$(DEPDIR) SynTree/$(DEPDIR) Tuples/$(DEPDIR) Validate/$(DEPDIR) Virtual/$(DEPDIR)
         -rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 …
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+        clean-cfa_cpplibPROGRAMS clean-generic cscopelist-am ctags \
+        ctags-am distclean distclean-compile distclean-generic \
+        distclean-tags distdir dvi dvi-am html html-am info info-am \
+        install install-am install-cfa_cpplibPROGRAMS install-data \
+        install-data-am install-dvi install-dvi-am install-exec \
+        install-exec-am install-html install-html-am install-info \
+        install-info-am install-man install-pdf install-pdf-am \
+        install-ps install-ps-am install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
+        maintainer-clean-generic mostlyclean mostlyclean-compile \
+        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+        uninstall-am uninstall-cfa_cpplibPROGRAMS
+        clean-cfa_cpplibPROGRAMS clean-generic clean-noinstLIBRARIES \
+        cscopelist-am ctags ctags-am distclean distclean-compile \
+        distclean-generic distclean-tags distdir dvi dvi-am html \
+        html-am info info-am install install-am \
+        install-cfa_cpplibPROGRAMS install-data install-data-am \
+        install-dvi install-dvi-am install-exec install-exec-am \
+        install-html install-html-am install-info install-info-am \
+        install-man install-pdf install-pdf-am install-ps \
+        install-ps-am install-strip installcheck installcheck-am \
+        installdirs maintainer-clean maintainer-clean-generic \
+        mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+        ps ps-am tags tags-am uninstall uninstall-am \
+        uninstall-cfa_cpplibPROGRAMS
 .PRECIOUS: Makefile

src/Parser/DeclarationNode.cc

-              rf9feab8
+              r90152a4
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Nov 20 09:21:52 2017
 // Update Count     : 1031
+// Last Modified On : Fri Jul 20 14:56:54 2018
+// Update Count     : 1107
 //
 …
 #include "SynTree/Type.h"          // for Type, Type::StorageClasses, Type::...
 #include "TypeData.h"              // for TypeData, TypeData::Aggregate_t
 #include "TypedefTable.h"          // for TypedefTable, TypedefTable::kind_t...
+#include "TypedefTable.h"          // for TypedefTable
 class Initializer;
 …
 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", "NoBuiltinTypeNames" };
+const char * DeclarationNode::builtinTypeNames[] = { "__builtin_va_list", "zero_t", "one_t", "NoBuiltinTypeNames" };
 UniqueName DeclarationNode::anonymous( "__anonymous" );
 …
 DeclarationNode::DeclarationNode() :
+                type( nullptr ),
+                bitfieldWidth( nullptr ),
+                hasEllipsis( false ),
+                linkage( ::linkage ),
+                asmName( nullptr ),
+                initializer( nullptr ),
+                extension( false ),
+                asmStmt( nullptr ) {
+        linkage( ::linkage ) {
 //      variable.name = nullptr;
 …
         attr.expr = nullptr;
         attr.type = nullptr;
+        assert.condition = nullptr;
+        assert.message = nullptr;
+}
 …
         // asmName, no delete, passed to next stage
         delete initializer;
+        delete assert.condition;
+        delete assert.message;
+}
 …
         newnode->name = name ? new string( *name ) : nullptr;
+        newnode->builtin = NoBuiltinType;
         newnode->type = maybeClone( type );
+        newnode->inLine = inLine;
         newnode->storageClasses = storageClasses;
         newnode->funcSpecs = funcSpecs;
 …
         newnode->attr.expr = maybeClone( attr.expr );
         newnode->attr.type = maybeClone( attr.type );
+        newnode->assert.condition = maybeClone( assert.condition );
+        newnode->assert.message = maybeClone( assert.message );
         return newnode;
 } // DeclarationNode::clone
+bool DeclarationNode::get_hasEllipsis() const {
+        return hasEllipsis;
+}
+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 * DeclarationNode::newFunction( string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body, bool newStyle ) {
+DeclarationNode * DeclarationNode::newFunction( const string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->name = name;
         newnode->type = new TypeData( TypeData::Function );
         newnode->type->function.params = param;
-        newnode->type->function.newStyle = newStyle;
         newnode->type->function.body = body;
-        // ignore unnamed routine declarations: void p( int (*)(int) );
-        if ( newnode->name ) {
-                typedefTable.addToEnclosingScope( *newnode->name, TypedefTable::ID );
-        } // if
         if ( ret ) {
 …
 } // DeclarationNode::newForall
 DeclarationNode * DeclarationNode::newFromTypedef( string * name ) {
+DeclarationNode * DeclarationNode::newFromTypedef( const string * name ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::SymbolicInst );
 …
 } // 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( string * name, DeclarationNode * constants, bool body ) {
+        assert( name );
+DeclarationNode * DeclarationNode::newEnum( const string * name, DeclarationNode * constants, bool body ) {
         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::newEnumConstant( string * name, ExpressionNode * constant ) {
+DeclarationNode * DeclarationNode::newEnumConstant( const string * name, ExpressionNode * constant ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->name = name;
         newnode->enumeratorValue.reset( constant );
-        typedefTable.addToEnclosingScope( *newnode->name, TypedefTable::ID );
         return newnode;
 } // DeclarationNode::newEnumConstant
 DeclarationNode * DeclarationNode::newName( string * name ) {
+DeclarationNode * DeclarationNode::newName( const string * name ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->name = name;
 …
 } // DeclarationNode::newName
 DeclarationNode * DeclarationNode::newFromTypeGen( string * name, ExpressionNode * params ) {
+DeclarationNode * DeclarationNode::newFromTypeGen( const string * name, ExpressionNode * params ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::SymbolicInst );
 …
 } // DeclarationNode::newFromTypeGen
 DeclarationNode * DeclarationNode::newTypeParam( TypeClass tc, string * name ) {
+DeclarationNode * DeclarationNode::newTypeParam( TypeClass tc, const string * name ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
 …
 } // DeclarationNode::newTraitUse
 DeclarationNode * DeclarationNode::newTypeDecl( string * name, DeclarationNode * typeParams ) {
+DeclarationNode * DeclarationNode::newTypeDecl( const string * name, DeclarationNode * typeParams ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->name = name;
 …
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = new TypeData( kind == OperKinds::PointTo ? TypeData::Pointer : TypeData::Reference );
+        if ( kind == OperKinds::And ) {
+                // T && is parsed as 'And' operator rather than two references => add a second reference type
+                TypeData * td = new TypeData( TypeData::Reference );
+                td->base = newnode->type;
+                newnode->type = td;
+        }
         if ( qualifiers ) {
                 return newnode->addQualifiers( qualifiers );
 …
 } // DeclarationNode::newBuiltinType
 DeclarationNode * DeclarationNode::newAttr( string * name, ExpressionNode * expr ) {
+DeclarationNode * DeclarationNode::newAttr( const string * name, ExpressionNode * expr ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
 …
+}
 DeclarationNode * DeclarationNode::newAttr( string * name, DeclarationNode * type ) {
+DeclarationNode * DeclarationNode::newAttr( const string * name, DeclarationNode * type ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
 …
+}
 DeclarationNode * DeclarationNode::newAttribute( string * name, ExpressionNode * expr ) {
+DeclarationNode * DeclarationNode::newAttribute( const string * name, ExpressionNode * expr ) {
         DeclarationNode * newnode = new DeclarationNode;
         newnode->type = nullptr;
 …
         return newnode;
+}
+DeclarationNode * DeclarationNode::newStaticAssert( ExpressionNode * condition, Expression * message ) {
+        DeclarationNode * newnode = new DeclarationNode;
+        newnode->assert.condition = condition;
+        newnode->assert.message = message;
+        return newnode;
+}
 void appendError( string & dst, const string & src ) {
 …
 } // 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 );
 …
 DeclarationNode * DeclarationNode::addQualifiers( DeclarationNode * q ) {
         if ( ! q ) { delete q; return this; }                           // empty qualifier
+        if ( ! q ) { return this; }                                                     // empty qualifier
         checkSpecifiers( q );
 …
                                         type->aggregate.params->appendList( q->type->forall ); // augment forall qualifier
                                 } else {                                                                // not polymorphic
+                                        type->aggregate.params = q->type->forall; // make polymorphic type
+                                        // change implicit typedef from TYPEDEFname to TYPEGENname
+                                        typedefTable.changeKind( *type->aggregate.name, TypedefTable::TG );
+                                        type->aggregate.params = q->type->forall; // set forall qualifier
                                 } // if
                         } else {                                                                        // not polymorphic
 …
         checkQualifiers( type, q->type );
+        if ( (builtin == Zero || builtin == One) && q->type->qualifiers.val != 0 && error.length() == 0 ) {
+                SemanticWarning( yylloc, Warning::BadQualifiersZeroOne, Type::QualifiersNames[ilog2( q->type->qualifiers.val )], builtinTypeNames[builtin] );
+        } // if
         addQualifiersToType( q->type, type );
 …
 } // 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 ) {
 …
                                         dst->basictype = src->basictype;
                                 } else if ( src->basictype != DeclarationNode::NoBasicType )
                                         throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::basicTypeNames[ src->basictype ] + " in type: ", src );
+                                        SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::basicTypeNames[ src->basictype ] + " in type: " );
                                 if ( dst->complextype == DeclarationNode::NoComplexType ) {
                                         dst->complextype = src->complextype;
                                 } else if ( src->complextype != DeclarationNode::NoComplexType )
                                         throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::complexTypeNames[ src->complextype ] + " in type: ", src );
+                                        SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::complexTypeNames[ src->complextype ] + " in type: " );
                                 if ( dst->signedness == DeclarationNode::NoSignedness ) {
                                         dst->signedness = src->signedness;
                                 } else if ( src->signedness != DeclarationNode::NoSignedness )
                                         throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::signednessNames[ src->signedness ] + " in type: ", src );
+                                        SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::signednessNames[ src->signedness ] + " in type: " );
                                 if ( dst->length == DeclarationNode::NoLength ) {
 …
                                         dst->length = DeclarationNode::LongLong;
                                 } else if ( src->length != DeclarationNode::NoLength )
                                         throw SemanticError( string( "conflicting type specifier " ) + DeclarationNode::lengthNames[ src->length ] + " in type: ", src );
+                                        SemanticError( yylloc, src, string( "conflicting type specifier " ) + DeclarationNode::lengthNames[ src->length ] + " in type: " );
                         } // if
                         break;
 …
+}
 DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body, StatementNode * with ) {
+DeclarationNode * DeclarationNode::addFunctionBody( StatementNode * body, ExpressionNode * withExprs ) {
         assert( type );
         assert( type->kind == TypeData::Function );
         assert( ! type->function.body );
-        if ( with ) {
-                // convert
-                //  void f(S s) with (s) { x = 0; }
-                // to
-                //  void f(S s) { with(s) { x = 0; } }
-                WithStmt * withStmt = strict_dynamic_cast< WithStmt * >( with->build() );
-                withStmt->stmt = body->build();
-                delete body;
-                delete with;
-                body = new StatementNode( new CompoundStmt( { withStmt } ) );
+        }
         type->function.body = body;
+        type->function.withExprs = withExprs;
         return this;
+}
 …
 DeclarationNode * DeclarationNode::addPointer( DeclarationNode * p ) {
         if ( p ) {
                 assert( p->type->kind == TypeData::Pointer || TypeData::Reference );
+                assert( p->type->kind == TypeData::Pointer || p->type->kind == TypeData::Reference );
                 setBase( p->type );
                 p->type = nullptr;
 …
                                 delete newType->aggInst.aggregate->enumeration.constants;
                                 newType->aggInst.aggregate->enumeration.constants = nullptr;
+                                newType->aggInst.aggregate->enumeration.body = false;
                         } else {
                                 assert( newType->aggInst.aggregate->kind == TypeData::Aggregate );
                                 delete newType->aggInst.aggregate->aggregate.fields;
                                 newType->aggInst.aggregate->aggregate.fields = nullptr;
+                                newType->aggInst.aggregate->aggregate.body = false;
                         } // if
                         // don't hoist twice
 …
+}
 void buildList( const DeclarationNode * firstNode, std::list< Declaration * > &outputList ) {
         SemanticError errors;
+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( SemanticError &e ) {
+                        e.set_location( cur->location );
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
         } // while
+        } // for
         if ( ! errors.isEmpty() ) {
 …
 } // buildList
+void buildList( const DeclarationNode * firstNode, std::list< DeclarationWithType * > &outputList ) {
+        SemanticError errors;
+// 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( SemanticError &e ) {
+                        e.set_location( cur->location );
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
 …
 } // buildList
 void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > &outputList ) {
         SemanticError errors;
+void buildTypeList( const DeclarationNode * firstNode, std::list< Type * > & outputList ) {
+        SemanticErrorException errors;
         std::back_insert_iterator< std::list< Type * > > out( outputList );
         const DeclarationNode * cur = firstNode;
 …
                 try {
                         * out++ = cur->buildType();
+                } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
+                } catch( SemanticErrorException & e ) {
                         errors.append( e );
                 } // try
 …
 Declaration * DeclarationNode::build() const {
         if ( ! error.empty() ) throw SemanticError( error + " in declaration of ", this );
+        if ( ! error.empty() ) SemanticError( this, error + " in declaration of " );
         if ( asmStmt ) {
 …
                 //    inline _Noreturn int i;                   // disallowed
                 if ( type->kind != TypeData::Function && funcSpecs.any() ) {
+                        throw SemanticError( "invalid function specifier for ", this );
+                } // if
+                return buildDecl( type, name ? *name : string( "" ), storageClasses, maybeBuild< Expression >( bitfieldWidth ), funcSpecs, linkage, asmName, maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );
+        } // if
+                        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();
+                Declaration * decl = buildDecl( type, name ? *name : string( "" ), storageClasses, maybeBuild< Expression >( bitfieldWidth ), funcSpecs, linkage, asmName, isDelete ? nullptr : maybeBuild< Initializer >(initializer), attributes )->set_extension( extension );
+                if ( isDelete ) {
+                        DeclarationWithType * dwt = strict_dynamic_cast<DeclarationWithType *>( decl );
+                        dwt->isDeleted = true;
+                }
+                return decl;
+        } // if
+        if ( assert.condition ) {
+                return new StaticAssertDecl( maybeBuild< Expression >( assert.condition ), strict_dynamic_cast< ConstantExpr * >( maybeClone( assert.message ) ) );
+        }
         // SUE's cannot have function specifiers, either
 …
         //    inlne _Noreturn enum   E { ... };         // disallowed
         if ( funcSpecs.any() ) {
                 throw SemanticError( "invalid function specifier for ", this );
+                SemanticError( this, "invalid function specifier for " );
         } // if
         assertf( name, "ObjectDecl must a have name\n" );

src/Parser/ExpressionNode.cc

-              rf9feab8
+              r90152a4
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Wed Sep 27 22:51:55 2017
 // Update Count     : 781
+// Last Modified On : Mon Jun  4 21:24:45 2018
+// Update Count     : 802
 //
 …
 static inline bool checkD( char c ) { return c == 'd' || c == 'D'; }
 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'; }
 …
 } // checkLNInt
-static void sepNumeric( string & str, string & units ) {
-        string::size_type posn = str.find_first_of( "`" );
-        if ( posn != string::npos ) {
-                units = "?" + str.substr( posn );                               // extract units
-                str.erase( posn );                                                              // remove units
-        } // if
-} // sepNumeric
 Expression * build_constantInteger( string & str ) {
         static const BasicType::Kind kind[2][6] = {
 …
         };
-        string units;
-        sepNumeric( str, units );                                                       // separate constant from units
         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
 …
         unsigned long long int v;                                                       // converted integral value
         size_t last = str.length() - 1;                                         // last character of constant
+        size_t last = str.length() - 1;                                         // last subscript of constant
         Expression * ret;
 …
         } // if
+        if ( str[0] == '0' ) {                                                          // octal/hex constant ?
+        // Cannot be "0"
+        if ( str[0] == '0' ) {                                                          // radix character ?
                 dec = false;
                 if ( last != 0 && checkX( str[1] ) ) {                  // hex constant ?
+                if ( checkX( str[1] ) ) {                                               // hex constant ?
                         sscanf( (char *)str.c_str(), "%llx", &v );
+                        //printf( "%llx %llu\n", v, v );
+                } else if ( checkB( str[1] ) ) {                                // binary constant ?
+                        v = 0;
+                        for ( unsigned int i = 2;; i += 1 ) {           // compute value
+                                if ( str[i] == '1' ) v |= 1;
+                          if ( i == last ) break;
+                                v <<= 1;
+                        } // for
                         //printf( "%llx %llu\n", v, v );
                 } else {                                                                                // octal constant
 …
         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] ) );
+                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] ) );
+                        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 ) );
+                        ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][lnth], false ), false );
                 } // if
         } // if
   CLEANUP:
-        if ( units.length() != 0 ) {
-                ret = new UntypedExpr( new NameExpr( units ), { ret } );
-        } // if
         delete &str;                                                                            // created by lex
 …
         };
-        string units;
-        sepNumeric( str, units );                                                       // separate constant from units
         bool complx = false;                                                            // real, complex
         int size = 1;                                                                           // 0 => float, 1 => double, 2 => long double
 …
         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] ) );
+        } // if
+        if ( units.length() != 0 ) {
+                ret = new UntypedExpr( new NameExpr( units ), { ret } );
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ), false );
         } // if
 …
 Expression * build_constantStr( string & str ) {
+        assert( str.length() > 0 );
         string units;                                                                           // units
         sepString( str, units, '"' );                                           // separate constant from units
 …
 Expression * build_field_name_FLOATING_FRACTIONconstant( const string & str ) {
         if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) throw SemanticError( "invalid tuple index " + str );
+        if ( str.find_first_not_of( "0123456789", 1 ) != string::npos ) SemanticError( yylloc, "invalid tuple index " + str );
         Expression * ret = build_constantInteger( *new string( str.substr(1) ) );
         delete &str;
 …
 Expression * build_field_name_FLOATING_DECIMALconstant( const string & str ) {
         if ( str[str.size()-1] != '.' ) throw SemanticError( "invalid tuple index " + str );
+        if ( str[str.size()-1] != '.' ) SemanticError( yylloc, "invalid tuple index " + str );
         Expression * ret = build_constantInteger( *new string( str.substr( 0, str.size()-1 ) ) );
         delete &str;
 …
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
                 return new CastExpr( maybeMoveBuild< Expression >(expr_node) );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node), false );
         } else {
                 return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType, false );
         } // if
 } // build_cast
+Expression * build_keyword_cast( KeywordCastExpr::Target target, ExpressionNode * expr_node ) {
+        return new KeywordCastExpr( maybeMoveBuild< Expression >(expr_node), target );
+}
 Expression * build_virtual_cast( DeclarationNode * decl_node, ExpressionNode * expr_node ) {

src/Parser/InitializerNode.cc

-              rf9feab8
+              r90152a4
 InitializerNode::InitializerNode( ExpressionNode * _expr, bool aggrp, ExpressionNode * des )
                 : expr( _expr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ) {
+                : expr( _expr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ), isDelete( false ) {
         if ( aggrp )
                 kids = dynamic_cast< InitializerNode * >( get_next() );
 …
 InitializerNode::InitializerNode( InitializerNode * init, bool aggrp, ExpressionNode * des )
                 : expr( nullptr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ) {
+                : expr( nullptr ), aggregate( aggrp ), designator( des ), kids( nullptr ), maybeConstructed( true ), isDelete( false ) {
         if ( init )
                 set_last( init );
 …
                 set_next( nullptr );
 } // InitializerNode::InitializerNode
+InitializerNode::InitializerNode( bool isDelete ) : expr( nullptr ), aggregate( false ), designator( nullptr ), kids( nullptr ), maybeConstructed( false ), isDelete( isDelete ) {}
 InitializerNode::~InitializerNode() {
 …
 Initializer * InitializerNode::build() const {
+        assertf( ! isDelete, "Should not build delete stmt InitializerNode" );
         if ( aggregate ) {
                 // steal designators from children

src/Parser/LinkageSpec.cc

-              rf9feab8
+              r90152a4
 namespace LinkageSpec {
 Spec linkageCheck( const string * spec ) {
+Spec linkageCheck( CodeLocation location, const string * spec ) {
         assert( spec );
         unique_ptr<const string> guard( spec ); // allocated by lexer
 …
                 return BuiltinC;
         } else {
                 throw SemanticError( "Invalid linkage specifier " + *spec );
+                SemanticError( location, "Invalid linkage specifier " + *spec );
         } // if
+}
 Spec linkageUpdate( Spec old_spec, const string * cmd ) {
+Spec linkageUpdate( CodeLocation location, Spec old_spec, const string * cmd ) {
         assert( cmd );
         unique_ptr<const string> guard( cmd ); // allocated by lexer
 …
                 return old_spec;
         } else {
                 throw SemanticError( "Invalid linkage specifier " + *cmd );
+                SemanticError( location, "Invalid linkage specifier " + *cmd );
         } // if
+}

src/Parser/LinkageSpec.h

-              rf9feab8
+              r90152a4
 // 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 : Mon Jul  2 07:46:49 2018
+// Update Count     : 16
 //
 …
 #include <string>
+#include "Common/CodeLocation.h"
 namespace LinkageSpec {
         // All linkage specs are some combination of these flags:
+        enum {
+                Mangle = 1 << 0,
+                Generate = 1 << 1,
+                Overrideable = 1 << 2,
+                Builtin = 1 << 3,
+                NoOfSpecs = 1 << 4,
+        };
+        enum { Mangle = 1 << 0, Generate = 1 << 1, Overrideable = 1 << 2, Builtin = 1 << 3, GccBuiltin = 1 << 4, NoOfSpecs = 1 << 5, };
         union Spec {
 …
                         bool is_overridable : 1;
                         bool is_builtin : 1;
+                        bool is_gcc_builtin : 1;
                 };
                 constexpr Spec( unsigned int val ) : val( val ) {}
                 constexpr Spec( Spec const &other ) : val( other.val ) {}
+                constexpr Spec( Spec const & other ) : val( other.val ) {}
                 // Operators may go here.
                 // Supports == and !=
                 constexpr operator unsigned int () const { return val; }
+                constexpr operator unsigned int() const { return val; }
         };
         Spec linkageCheck( const std::string * );
+        Spec linkageCheck( CodeLocation location, const std::string * );
         // Returns the Spec with the given name (limited to C, Cforall & BuiltinC)
         Spec linkageUpdate( Spec old_spec, const std::string * cmd );
+        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
          * If cmd = "Cforall" returns old_spec Spec with is_mangled = true
 …
         inline bool isOverridable( Spec spec ) { return spec.is_overridable; }
         inline bool isBuiltin( Spec spec ) { return spec.is_builtin; }
+        inline bool isGccBuiltin( Spec spec ) { return spec.is_gcc_builtin; }
         // Pre-defined flag combinations:
 …
         constexpr Spec const AutoGen = { Mangle | Generate | Overrideable };
         // gcc internal
         constexpr Spec const Compiler = { Builtin };
+        constexpr Spec const Compiler = { Mangle | Builtin | GccBuiltin };
         // mangled builtins
         constexpr Spec const BuiltinCFA = { Mangle | Generate | Builtin };

src/Parser/ParseNode.h

-              rf9feab8
+              r90152a4
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Nov 27 17:33:35 2017
 // Update Count     : 824
+// Last Modified On : Sat Aug  4 09:39:40 2018
+// Update Count     : 853
 //
 …
+        }
         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 );
 …
         ParseNode * next = nullptr;
         std::string * name = nullptr;
+        const std::string * name = nullptr;
         CodeLocation location = yylloc;
 }; // ParseNode
 …
         InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode * des = nullptr );
         InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode * des = nullptr );
+        InitializerNode( bool isDelete );
         ~InitializerNode();
         virtual InitializerNode * clone() const { assert( false ); return nullptr; }
 …
         bool get_maybeConstructed() const { return maybeConstructed; }
+        bool get_isDelete() const { return isDelete; }
         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;
 …
         InitializerNode * kids;
         bool maybeConstructed;
+        bool isDelete;
 }; // InitializerNode
 …
         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 {}
+        Expression *get_expr() const { return expr.get(); }
         template<typename T>
         bool isExpressionType() const { return nullptr != dynamic_cast<T>(expr.get()); }
 …
 };
 Expression * build_constantInteger( std::string &str );
 Expression * build_constantFloat( std::string &str );
 Expression * build_constantChar( std::string &str );
 Expression * build_constantStr( std::string &str );
+Expression * build_constantInteger( std::string & str ); // these 4 routines modify the string
+Expression * build_constantFloat( std::string & str );
+Expression * build_constantChar( std::string & str );
+Expression * build_constantStr( std::string & str );
 Expression * build_field_name_FLOATING_FRACTIONconstant( const std::string & str );
 Expression * build_field_name_FLOATING_DECIMALconstant( const std::string & str );
 …
 Expression * build_cast( DeclarationNode * decl_node, ExpressionNode * expr_node );
+Expression * build_keyword_cast( KeywordCastExpr::Target target, ExpressionNode * expr_node );
 Expression * build_virtual_cast( DeclarationNode * decl_node, ExpressionNode * expr_node );
 Expression * build_fieldSel( ExpressionNode * expr_node, Expression * member );
 …
         enum Length { Short, Long, LongLong, NoLength };
         static const char * lengthNames[];
         enum Aggregate { Struct, Union, Trait, Coroutine, Monitor, Thread, NoAggregate };
+        enum Aggregate { Struct, Union, Exception, Trait, Coroutine, Monitor, Thread, NoAggregate };
         static const char * aggregateNames[];
         enum TypeClass { Otype, Dtype, Ftype, Ttype, NoTypeClass };
 …
         static DeclarationNode * newBuiltinType( BuiltinType );
         static DeclarationNode * newForall( DeclarationNode * );
+        static DeclarationNode * newFromTypedef( std::string * );
+        static DeclarationNode * newFunction( std::string * name, DeclarationNode * ret, DeclarationNode * param, StatementNode * body, bool newStyle = false );
+        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 * newEnum( std::string * name, DeclarationNode * constants, bool body );
         static DeclarationNode * newEnumConstant( std::string * name, ExpressionNode * constant );
         static DeclarationNode * newName( std::string * );
         static DeclarationNode * newFromTypeGen( std::string *, ExpressionNode * params );
         static DeclarationNode * newTypeParam( TypeClass, std::string * );
+        static DeclarationNode * newEnum( const std::string * name, DeclarationNode * constants, bool body );
+        static DeclarationNode * newEnumConstant( const std::string * name, ExpressionNode * constant );
+        static DeclarationNode * newName( const std::string * );
+        static DeclarationNode * newFromTypeGen( const std::string *, ExpressionNode * params );
+        static DeclarationNode * newTypeParam( TypeClass, const std::string * );
         static DeclarationNode * newTrait( const std::string * name, DeclarationNode * params, DeclarationNode * asserts );
         static DeclarationNode * newTraitUse( const std::string * name, ExpressionNode * params );
         static DeclarationNode * newTypeDecl( std::string * name, DeclarationNode * typeParams );
+        static DeclarationNode * newTypeDecl( const std::string * name, DeclarationNode * typeParams );
         static DeclarationNode * newPointer( DeclarationNode * qualifiers, OperKinds kind );
         static DeclarationNode * newArray( ExpressionNode * size, DeclarationNode * qualifiers, bool isStatic );
 …
         static DeclarationNode * newTuple( DeclarationNode * members );
         static DeclarationNode * newTypeof( ExpressionNode * expr );
         static DeclarationNode * newAttr( std::string *, ExpressionNode * expr ); // @ attributes
         static DeclarationNode * newAttr( std::string *, DeclarationNode * type ); // @ attributes
         static DeclarationNode * newAttribute( std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
+        static DeclarationNode * newAttr( const std::string *, ExpressionNode * expr ); // @ attributes
+        static DeclarationNode * newAttr( const std::string *, DeclarationNode * type ); // @ attributes
+        static DeclarationNode * newAttribute( const std::string *, ExpressionNode * expr = nullptr ); // gcc attributes
         static DeclarationNode * newAsmStmt( StatementNode * stmt ); // gcc external asm statement
+        static DeclarationNode * newStaticAssert( ExpressionNode * condition, Expression * message );
         DeclarationNode();
 …
         DeclarationNode * addBitfield( ExpressionNode * size );
         DeclarationNode * addVarArgs();
         DeclarationNode * addFunctionBody( StatementNode * body, StatementNode * with = nullptr );
+        DeclarationNode * addFunctionBody( StatementNode * body, ExpressionNode * with = nullptr );
         DeclarationNode * addOldDeclList( DeclarationNode * list );
         DeclarationNode * setBase( TypeData * newType );
 …
+        }
         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;
         Type * buildType() const;
-        bool get_hasEllipsis() const;
         LinkageSpec::Spec get_linkage() const { return linkage; }
         DeclarationNode * extractAggregate() 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(); }
 …
         Attr_t attr;
+        BuiltinType builtin;
+        TypeData * type;
+        struct StaticAssert_t {
+                ExpressionNode * condition;
+                Expression * message;
+        };
+        StaticAssert_t assert;
+        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 ) {}
 …
 };
+Statement * build_if( IfCtl * ctl, StatementNode * then_stmt, StatementNode * else_stmt );
+Statement * build_switch( ExpressionNode * ctl, StatementNode * 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( ExpressionNode * ctl, StatementNode * stmt, bool kind = false );
+Statement * build_for( ForCtl * forctl, StatementNode * stmt );
+Statement * build_while( IfCtrl * ctl, StatementNode * stmt );
+Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt );
+Statement * build_for( ForCtrl * forctl, StatementNode * stmt );
 Statement * build_branch( BranchStmt::Type kind );
 Statement * build_branch( std::string * identifier, BranchStmt::Type kind );
 …
 Statement * build_finally( StatementNode * stmt );
 Statement * build_compound( StatementNode * first );
+Statement * build_asmstmt( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
+Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
+Statement * build_directive( std::string * directive );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when, WaitForStmt * existing );
 …
 template< typename SynTreeType, typename NodeType, template< typename, typename...> class Container, typename... Args >
 void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > &outputList ) {
         SemanticError errors;
+void buildList( const NodeType * firstNode, Container< SynTreeType *, Args... > & outputList ) {
+        SemanticErrorException errors;
         std::back_insert_iterator< Container< SynTreeType *, Args... > > out( outputList );
         const NodeType * cur = firstNode;
 …
                                 assertf(false, "buildList unknown type");
                         } // if
+                } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
+                } 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

-              rf9feab8
+              r90152a4
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Sep  1 23:25:23 2017
 // Update Count     : 346
+// Last Modified On : Sat Aug  4 09:39:25 2018
+// Update Count     : 363
 //
 …
 StatementNode::StatementNode( DeclarationNode *decl ) {
+StatementNode::StatementNode( DeclarationNode * decl ) {
         assert( decl );
         DeclarationNode *agg = decl->extractAggregate();
+        DeclarationNode * agg = decl->extractAggregate();
         if ( agg ) {
                 StatementNode *nextStmt = new StatementNode( new DeclStmt( maybeBuild< Declaration >( decl ) ) );
+                StatementNode * nextStmt = new StatementNode( new DeclStmt( maybeBuild< Declaration >( decl ) ) );
                 set_next( nextStmt );
                 if ( decl->get_next() ) {
 …
 } // StatementNode::StatementNode
 StatementNode *StatementNode::append_last_case( StatementNode *stmt ) {
         StatementNode *prev = this;
+StatementNode * StatementNode::append_last_case( StatementNode * stmt ) {
+        StatementNode * prev = this;
         // find end of list and maintain previous pointer
         for ( StatementNode * curr = prev; curr != nullptr; curr = (StatementNode *)curr->get_next() ) {
                 StatementNode *node = strict_dynamic_cast< StatementNode * >(curr);
+                StatementNode * node = strict_dynamic_cast< StatementNode * >(curr);
                 assert( dynamic_cast< CaseStmt * >(node->stmt.get()) );
                 prev = curr;
         } // for
         // convert from StatementNode list to Statement list
         StatementNode *node = dynamic_cast< StatementNode * >(prev);
+        StatementNode * node = dynamic_cast< StatementNode * >(prev);
         std::list< Statement * > stmts;
         buildMoveList( stmt, stmts );
 …
         caseStmt->get_statements().splice( caseStmt->get_statements().end(), stmts );
         return this;
+}
+Statement *build_expr( ExpressionNode *ctl ) {
+        Expression *e = maybeMoveBuild< Expression >( ctl );
+        if ( e )
+                return new ExprStmt( e );
+        else
+                return new NullStmt();
+}
+Statement *build_if( IfCtl * ctl, StatementNode *then_stmt, StatementNode *else_stmt ) {
+        Statement *thenb, *elseb = 0;
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( then_stmt, branches );
+        assert( branches.size() == 1 );
+        thenb = branches.front();
+        if ( else_stmt ) {
+                std::list< Statement * > branches;
+                buildMoveList< Statement, StatementNode >( else_stmt, branches );
+                assert( branches.size() == 1 );
+                elseb = branches.front();
+        } // if
+        std::list< Statement * > init;
+} // StatementNode::append_last_case
+Statement * build_expr( ExpressionNode * ctl ) {
+        Expression * e = maybeMoveBuild< Expression >( ctl );
+        if ( e ) return new ExprStmt( e );
+        else return new NullStmt();
+} // build_expr
+Expression * build_if_control( IfCtrl * ctl, std::list< Statement * > & init ) {
         if ( ctl->init != 0 ) {
                 buildMoveList( ctl->init, init );
 …
         if ( ctl->condition ) {
                 // compare the provided condition against 0
                 cond =  notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
+                cond = notZeroExpr( maybeMoveBuild< Expression >(ctl->condition) );
         } else {
                 for ( Statement * stmt : init ) {
 …
+        }
         delete ctl;
+        return cond;
+} // build_if_control
+Statement * build_if( IfCtrl * ctl, StatementNode * then_stmt, StatementNode * else_stmt ) {
+        Statement * thenb, * elseb = nullptr;
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( then_stmt, branches );
+        assert( branches.size() == 1 );
+        thenb = branches.front();
+        if ( else_stmt ) {
+                std::list< Statement * > branches;
+                buildMoveList< Statement, StatementNode >( else_stmt, branches );
+                assert( branches.size() == 1 );
+                elseb = branches.front();
+        } // if
+        std::list< Statement * > init;
+        Expression * cond = build_if_control( ctl, init );
         return new IfStmt( cond, thenb, elseb, init );
+}
+Statement *build_switch( ExpressionNode *ctl, StatementNode *stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+} // build_if
+Statement * build_switch( bool isSwitch, ExpressionNode * ctl, StatementNode * stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        if ( ! isSwitch ) {                                                                             // choose statement
+                for ( Statement * stmt : branches ) {
+                        CaseStmt * caseStmt = strict_dynamic_cast< CaseStmt * >( stmt );
+                        if ( ! caseStmt->stmts.empty() ) {                      // code after "case" => end of case list
+                                CompoundStmt * block = strict_dynamic_cast< CompoundStmt * >( caseStmt->stmts.front() );
+                                block->kids.push_back( new BranchStmt( "", BranchStmt::Break ) );
+                        } // if
+                } // for
+        } // if
         // branches.size() == 0 for switch (...) {}, i.e., no declaration or statements
         return new SwitchStmt( maybeMoveBuild< Expression >(ctl), branches );
+}
+Statement *build_case( ExpressionNode *ctl ) {
+} // build_switch
+Statement * build_case( ExpressionNode * ctl ) {
         std::list< Statement * > branches;
         return new CaseStmt( maybeMoveBuild< Expression >(ctl), branches );
+}
+Statement *build_default() {
+} // build_case
+Statement * build_default() {
         std::list< Statement * > branches;
         return new CaseStmt( nullptr, branches, true );
+}
+Statement *build_while( ExpressionNode *ctl, StatementNode *stmt, bool kind ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), kind );
+}
+Statement *build_for( ForCtl *forctl, StatementNode *stmt ) {
+} // build_default
+Statement * build_while( IfCtrl * ctl, StatementNode * stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+        std::list< Statement * > init;
+        Expression * cond = build_if_control( ctl, init );
+        return new WhileStmt( cond, branches.front(), init, false );
+} // build_while
+Statement * build_do_while( ExpressionNode * ctl, StatementNode * stmt ) {
+        std::list< Statement * > branches;
+        buildMoveList< Statement, StatementNode >( stmt, branches );
+        assert( branches.size() == 1 );
+        std::list< Statement * > init;
+        return new WhileStmt( notZeroExpr( maybeMoveBuild< Expression >(ctl) ), branches.front(), init, true );
+} // build_do_while
+Statement * build_for( ForCtrl * forctl, StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
 …
         } // if
         Expression *cond = 0;
+        Expression * cond = 0;
         if ( forctl->condition != 0 )
                 cond = notZeroExpr( maybeMoveBuild< Expression >(forctl->condition) );
         Expression *incr = 0;
+        Expression * incr = 0;
         if ( forctl->change != 0 )
                 incr = maybeMoveBuild< Expression >(forctl->change);
 …
         delete forctl;
         return new ForStmt( init, cond, incr, branches.front() );
+}
 Statement *build_branch( BranchStmt::Type kind ) {
+} // build_for
+Statement * build_branch( BranchStmt::Type kind ) {
         Statement * ret = new BranchStmt( "", kind );
         return ret;
+}
+Statement *build_branch( std::string *identifier, BranchStmt::Type kind ) {
+        Statement * ret = new BranchStmt( *identifier, kind );
+} // build_branch
+Statement * build_branch( std::string * identifier, BranchStmt::Type kind ) {
+        Statement * ret = new BranchStmt( * identifier, kind );
         delete identifier;                                                                      // allocated by lexer
         return ret;
+}
+Statement *build_computedgoto( ExpressionNode *ctl ) {
+} // build_branch
+Statement * build_computedgoto( ExpressionNode * ctl ) {
         return new BranchStmt( maybeMoveBuild< Expression >(ctl), BranchStmt::Goto );
+}
 Statement *build_return( ExpressionNode *ctl ) {
+} // build_computedgoto
+Statement * build_return( ExpressionNode * ctl ) {
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
         return new ReturnStmt( exps.size() > 0 ? exps.back() : nullptr );
+}
 Statement *build_throw( ExpressionNode *ctl ) {
+} // build_return
+Statement * build_throw( ExpressionNode * ctl ) {
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
         assertf( exps.size() < 2, "This means we are leaking memory");
         return new ThrowStmt( ThrowStmt::Terminate, !exps.empty() ? exps.back() : nullptr );
+}
 Statement *build_resume( ExpressionNode *ctl ) {
+} // build_throw
+Statement * build_resume( ExpressionNode * ctl ) {
         std::list< Expression * > exps;
         buildMoveList( ctl, exps );
         assertf( exps.size() < 2, "This means we are leaking memory");
         return new ThrowStmt( ThrowStmt::Resume, !exps.empty() ? exps.back() : nullptr );
+}
 Statement *build_resume_at( ExpressionNode *ctl, ExpressionNode *target ) {
+} // build_resume
+Statement * build_resume_at( ExpressionNode * ctl, ExpressionNode * target ) {
         (void)ctl;
         (void)target;
         assertf( false, "resume at (non-local throw) is not yet supported," );
+}
 Statement *build_try( StatementNode *try_stmt, StatementNode *catch_stmt, StatementNode *finally_stmt ) {
+} // build_resume_at
+Statement * build_try( StatementNode * try_stmt, StatementNode * catch_stmt, StatementNode * finally_stmt ) {
         std::list< CatchStmt * > branches;
         buildMoveList< CatchStmt, StatementNode >( catch_stmt, branches );
         CompoundStmt *tryBlock = strict_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
         FinallyStmt *finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
+        CompoundStmt * tryBlock = strict_dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >(try_stmt));
+        FinallyStmt * finallyBlock = dynamic_cast< FinallyStmt * >(maybeMoveBuild< Statement >(finally_stmt) );
         return new TryStmt( tryBlock, branches, finallyBlock );
+}
+Statement *build_catch( CatchStmt::Kind kind, DeclarationNode *decl, ExpressionNode *cond, StatementNode *body ) {
+} // build_try
+Statement * build_catch( CatchStmt::Kind kind, DeclarationNode * decl, ExpressionNode * cond, StatementNode * body ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( body, branches );
         assert( branches.size() == 1 );
         return new CatchStmt( kind, maybeMoveBuild< Declaration >(decl), maybeMoveBuild< Expression >(cond), branches.front() );
+}
+Statement *build_finally( StatementNode *stmt ) {
+} // build_catch
+Statement * build_finally( StatementNode * stmt ) {
         std::list< Statement * > branches;
         buildMoveList< Statement, StatementNode >( stmt, branches );
         assert( branches.size() == 1 );
         return new FinallyStmt( dynamic_cast< CompoundStmt * >( branches.front() ) );
+}
+} // build_finally
 WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when ) {
 …
         return node;
+}
+} // build_waitfor
 WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when, WaitForStmt * node ) {
 …
         return node;
+}
+} // build_waitfor
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when ) {
 …
                 node->timeout.statement = maybeMoveBuild<Statement >( stmt    );
                 node->timeout.condition = notZeroExpr( maybeMoveBuild<Expression>( when ) );
+        }
+        else {
+        } else {
                 node->orelse.statement  = maybeMoveBuild<Statement >( stmt );
                 node->orelse.condition  = notZeroExpr( maybeMoveBuild<Expression>( when ) );
+        }
+        } // if
         return node;
+}
+} // build_waitfor_timeout
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when,  StatementNode * else_stmt, ExpressionNode * else_when ) {
 …
         return node;
+}
+} // build_waitfor_timeout
 WithStmt * build_with( ExpressionNode * exprs, StatementNode * stmt ) {
 …
         Statement * s = maybeMoveBuild<Statement>( stmt );
         return new WithStmt( e, s );
+}
 Statement *build_compound( StatementNode *first ) {
         CompoundStmt *cs = new CompoundStmt();
+} // build_with
+Statement * build_compound( StatementNode * first ) {
+        CompoundStmt * cs = new CompoundStmt();
         buildMoveList( first, cs->get_kids() );
         return cs;
+}
 Statement *build_asmstmt( bool voltile, Expression *instruction, ExpressionNode *output, ExpressionNode *input, ExpressionNode *clobber, LabelNode *gotolabels ) {
+} // build_compound
+Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output, ExpressionNode * input, ExpressionNode * clobber, LabelNode * gotolabels ) {
         std::list< Expression * > out, in;
         std::list< ConstantExpr * > clob;
 …
         buildMoveList( clobber, clob );
         return new AsmStmt( voltile, instruction, out, in, clob, gotolabels ? gotolabels->labels : noLabels );
+}
+} // build_asm
+Statement * build_directive( string * directive ) {
+        return new DirectiveStmt( *directive );
+} // build_directive
 // Local Variables: //

src/Parser/TypeData.cc

-              rf9feab8
+              r90152a4
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Sep 25 18:33:41 2017
 // Update Count     : 587
+// Last Modified On : Fri Jul 20 14:39:31 2018
+// Update Count     : 622
 //
 …
 using namespace std;
 TypeData::TypeData( Kind k ) : kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ {
+TypeData::TypeData( Kind k ) : location( yylloc ), kind( k ), base( nullptr ), forall( nullptr ) /*, PTR1( (void*)(0xdeadbeefdeadbeef)), PTR2( (void*)(0xdeadbeefdeadbeef) ) */ {
         switch ( kind ) {
           case Unknown:
 …
           case Reference:
           case EnumConstant:
+          case GlobalScope:
                 // nothing else to initialize
                 break;
 …
                 function.oldDeclList = nullptr;
                 function.body = nullptr;
                 function.newStyle = false;
+                function.withExprs = nullptr;
                 break;
                 // Enum is an Aggregate, so both structures are initialized together.
 …
                 enumeration.constants = nullptr;
                 enumeration.body = false;
+                enumeration.anon = false;
+                break;
           case Aggregate:
                 // aggregate = new Aggregate_t;
+                aggregate.kind = DeclarationNode::NoAggregate;
                 aggregate.name = nullptr;
                 aggregate.params = nullptr;
 …
                 aggregate.fields = nullptr;
                 aggregate.body = false;
+                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:
 …
           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;
 …
                 delete function.oldDeclList;
                 delete function.body;
+                delete function.withExprs;
                 // delete function;
                 break;
 …
                 // 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->function.oldDeclList = maybeClone( function.oldDeclList );
                 newtype->function.body = maybeClone( function.body );
                 newtype->function.newStyle = function.newStyle;
+                newtype->function.withExprs = maybeClone( function.withExprs );
                 break;
           case Aggregate:
+                newtype->aggregate.kind = aggregate.kind;
                 newtype->aggregate.name = aggregate.name ? new string( *aggregate.name ) : nullptr;
                 newtype->aggregate.params = maybeClone( aggregate.params );
                 newtype->aggregate.actuals = maybeClone( aggregate.actuals );
                 newtype->aggregate.fields = maybeClone( aggregate.fields );
-                newtype->aggregate.kind = aggregate.kind;
                 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:
 …
                 newtype->builtintype = builtintype;
                 break;
+                case Qualified:
+                newtype->qualified.parent = maybeClone( qualified.parent );
+                newtype->qualified.child = maybeClone( qualified.child );
+                break;
         } // switch
         return newtype;
 …
         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:
 …
                 } // if
                 break;
+          case SymbolicInst:
+                os << "instance of type " << *symbolic.name;
+                if ( symbolic.actuals ) {
+                        os << " with parameters" << endl;
+                        symbolic.actuals->printList( os, indent + 2 );
+                } // if
+          case EnumConstant:
+                os << "enumeration constant ";
                 break;
           case Symbolic:
 …
                 } // if
                 break;
+          case SymbolicInst:
+                os << *symbolic.name;
+                if ( symbolic.actuals ) {
+                        os << "(";
+                        symbolic.actuals->printList( os, indent + 2 );
+                        os << ")";
+                } // if
+                break;
           case Tuple:
                 os << "tuple ";
 …
                 break;
           case Builtin:
+                os << "gcc builtin type";
+                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 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);
+}
 …
                 return new EnumInstType( buildQualifiers( td ), "" );
           case TypeData::SymbolicInst:
                 return buildSymbolicInst( td );;
+                return buildSymbolicInst( td );
           case TypeData::Tuple:
                 return buildTuple( td );
 …
                         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:
 …
                 assert( false );
         } // switch
         return nullptr;
 } // typebuild
 …
         switch ( td->kind ) {
           case TypeData::Aggregate:
                 if ( ! toplevel && td->aggregate.fields ) {
+                if ( ! toplevel && td->aggregate.body ) {
                         ret = td->clone();
                 } // if
                 break;
           case TypeData::Enum:
                 if ( ! toplevel && td->enumeration.constants ) {
+                if ( ! toplevel && td->enumeration.body ) {
                         ret = td->clone();
                 } // if
 …
 static string genTSError( string msg, DeclarationNode::BasicType basictype ) {
         throw SemanticError( string( "invalid type specifier \"" ) + msg + "\" for type \"" + DeclarationNode::basicTypeNames[basictype] + "\"." );
+        SemanticError( yylloc, string( "invalid type specifier \"" ) + msg + "\" for type \"" + DeclarationNode::basicTypeNames[basictype] + "\"." );
 } // genTSError
 …
           case DeclarationNode::Int128:
                 ret = td->signedness == 1 ? BasicType::UnsignedInt128 : BasicType::SignedInt128;
+                ret = td->signedness == DeclarationNode::Unsigned ? BasicType::UnsignedInt128 : BasicType::SignedInt128;
                 if ( td->length != DeclarationNode::NoLength ) {
                         genTSError( DeclarationNode::lengthNames[ td->length ], td->basictype );
 …
                         genTSError( DeclarationNode::lengthNames[ td->length ], td->basictype );
                 } // if
                 if ( td->basictype == DeclarationNode::Float && td->length == DeclarationNode::Long ) {
+                if ( td->basictype != DeclarationNode::Double && td->length == DeclarationNode::Long ) {
                         genTSError( DeclarationNode::lengthNames[ td->length ], td->basictype );
                 } // if
 …
                         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 ];
 …
         assert( td->base );
         if ( td->symbolic.isTypedef ) {
                 ret = new TypedefDecl( name, scs, typebuild( td->base ), linkage );
+                ret = new TypedefDecl( name, td->location, scs, typebuild( td->base ), linkage );
         } else {
                 ret = new TypeDecl( name, scs, typebuild( td->base ), TypeDecl::Dtype, true );
 …
                 CompoundStmt * body = dynamic_cast< CompoundStmt * >( stmt );
                 decl = new FunctionDecl( name, scs, linkage, buildFunction( td ), body, attributes, funcSpec );
+                buildList( td->function.withExprs, decl->withExprs );
                 return decl->set_asmName( asmName );
         } else if ( td->kind == TypeData::Aggregate ) {
 …
 FunctionType * buildFunction( const TypeData * td ) {
         assert( td->kind == TypeData::Function );
+        bool hasEllipsis = td->function.params ? td->function.params->get_hasEllipsis() : true;
+        if ( ! td->function.params ) hasEllipsis = ! td->function.newStyle;
+        FunctionType * ft = new FunctionType( buildQualifiers( td ), hasEllipsis );
+        buildList( td->function.params, ft->get_parameters() );
+        buildForall( td->forall, ft->get_forall() );
+        FunctionType * ft = new FunctionType( buildQualifiers( td ), ! td->function.params || td->function.params->hasEllipsis );
+        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:
 …
                                 // type set => parameter name already transformed by a declaration names so there is a duplicate
                                 // declaration name attempting a second transformation
                                 if ( param->type ) throw SemanticError( string( "duplicate declaration name " ) + *param->name );
+                                if ( param->type ) SemanticError( param->location, string( "duplicate declaration name " ) + *param->name );
                                 // declaration type reset => declaration already transformed by a parameter name so there is a duplicate
                                 // parameter name attempting a second transformation
                                 if ( ! decl->type ) throw SemanticError( string( "duplicate parameter name " ) + *param->name );
+                                if ( ! decl->type ) SemanticError( param->location, string( "duplicate parameter name " ) + *param->name );
                                 param->type = decl->type;                               // set copy declaration type to parameter type
                                 decl->type = nullptr;                                   // reset declaration type
 …
                 } // for
                 // declaration type still set => type not moved to a matching parameter so there is a missing parameter name
                 if ( decl->type ) throw SemanticError( string( "missing name in parameter list " ) + *decl->name );
+                if ( decl->type ) SemanticError( decl->location, string( "missing name in parameter list " ) + *decl->name );
         } // for

src/Parser/TypeData.h

-              rf9feab8
+              r90152a4
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Fri Sep  1 23:33:45 2017
 // Update Count     : 190
+// Last Modified On : Fri Jul 20 13:56:40 2018
+// Update Count     : 195
 //
 …
 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, Builtin, GlobalScope, Qualified, Unknown };
         struct Aggregate_t {
 …
                 DeclarationNode * fields;
                 bool body;
+                bool anon;
                 bool tagged;
 …
                 DeclarationNode * constants;
                 bool body;
+                bool anon;
         };
 …
                 mutable DeclarationNode * oldDeclList;
                 StatementNode * body;
                 bool newStyle;
+                ExpressionNode * withExprs;                                             // expressions from function's with_clause
         };
 …
                 DeclarationNode * assertions;
         };
+        struct Qualified_t {                                                            // qualified type S.T
+                TypeData * parent;
+                TypeData * child;
+        };
+        CodeLocation location;
         Kind kind;
 …
         DeclarationNode * forall;
-        // Basic_t basic;
         Aggregate_t aggregate;
         AggInst_t aggInst;
         Array_t array;
         Enumeration_t enumeration;
-        // Variable_t variable;
         Function_t function;
         Symbolic_t symbolic;
+        Qualified_t qualified;
         DeclarationNode * tuple;
         ExpressionNode * typeexpr;
 …
         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

-              rf9feab8
+              r90152a4
 // file "LICENCE" distributed with Cforall.
 //
 // TypedefTable.cc --
+// TypedefTable.cc --
 //
 // Author           : Rodolfo G. Esteves
+// Author           : Peter A. Buhr
 // Created On       : Sat May 16 15:20:13 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Aug 15 18:24:42 2016
 // Update Count     : 25
+// Last Modified On : Wed Jul 25 15:32:35 2018
+// Update Count     : 258
 //
-#include <ext/alloc_traits.h>    // for __alloc_traits<>::value_type
-#include <cassert>               // for assert
-#include <list>                  // for list, _List_iterator, list<>::iterator
-#include <map>                   // for _Rb_tree_iterator, _Rb_tree_const_it...
-#include <memory>                // for allocator_traits<>::value_type
-#include <utility>               // for pair
-#include "Parser/ParserTypes.h"  // for typedefTable
-#include "Parser/parser.hh"      // for IDENTIFIER
 #include "TypedefTable.h"
+using namespace std;
+#include <cassert>                                                                              // for assert
+#include <iostream>
 #if 0
+#include <iostream>
+#define debugPrint( x ) cerr << x
+#define debugPrint( code ) code
 #else
 #define debugPrint( x )
+#define debugPrint( code )
 #endif
+TypedefTable::TypedefTable() : currentScope( 0 ) {}
+using namespace std;                                                                    // string, iostream
+bool TypedefTable::exists( const string &identifier ) {
+        return table.count( identifier ) > 0;
+}
+debugPrint(
+static const char *kindName( int kind ) {
+        switch ( kind ) {
+          case IDENTIFIER: return "identifier";
+          case TYPEDEFname: return "typedef";
+          case TYPEGENname: return "typegen";
+          default:
+                cerr << "Error: cfa-cpp internal error, invalid kind of identifier" << endl;
+                abort();
+        } // switch
+} // kindName
+)
+int TypedefTable::isKind( const string &identifier ) const {
+        tableType::const_iterator id_pos = table.find( identifier );
+TypedefTable::~TypedefTable() {
+        if ( ! SemanticErrorThrow && kindTable.currentScope() != 0 ) {
+                cerr << "Error: cfa-cpp internal error, scope failure " << kindTable.currentScope() << endl;
+                abort();
+        } // if
+} // TypedefTable::~TypedefTable
+bool TypedefTable::exists( const string & identifier ) {
+        return kindTable.find( identifier ) != kindTable.end();
+} // TypedefTable::exists
+bool TypedefTable::existsCurr( const string & identifier ) {
+        return kindTable.findAt( kindTable.currentScope() - 1, identifier ) != kindTable.end();
+} // TypedefTable::exists
+int TypedefTable::isKind( const string & identifier ) const {
+        KindTable::const_iterator posn = kindTable.find( identifier );
         // Name lookup defaults to identifier, and then the identifier's kind is set by the parser.
+        if ( id_pos == table.end() ) return IDENTIFIER;
+        return id_pos->second.begin()->kind;
+}
+void TypedefTable::changeKind( const string &identifier, kind_t kind ) {
+        tableType::iterator id_pos = table.find( identifier );
+        if ( id_pos == table.end() ) return;
+        id_pos->second.begin()->kind = kind;
+}
+        if ( posn == kindTable.end() ) return IDENTIFIER;
+        return posn->second;
+} // TypedefTable::isKind
 // SKULLDUGGERY: Generate a typedef for the aggregate name so the aggregate does not have to be qualified by
+// "struct". Only generate the typedef, if the name is not in use. The typedef is implicitly (silently) removed
+// if the name is explicitly used.
+void TypedefTable::makeTypedef( const string &name ) {
+// "struct". Only generate the typedef, if the name is not in use. The typedef is implicitly (silently) removed if the
+// name is explicitly used.
+void TypedefTable::makeTypedef( const string & name, int kind ) {
+//    Check for existence is necessary to handle:
+//        struct Fred {};
+//        void Fred();
+//        void fred() {
+//           struct Fred act; // do not add as type in this scope
+//           Fred();
+//        }
         if ( ! typedefTable.exists( name ) ) {
                 typedefTable.addToEnclosingScope( name, TypedefTable::TD );
+                typedefTable.addToEnclosingScope( name, kind, "MTD" );
         } // if
+}
+} // TypedefTable::makeTypedef
+void TypedefTable::addToScope( const std::string &identifier, kind_t kind, int scope ) {
+        if ( currentTrait != "" && scope == contextScope ) {
+                DeferredEntry entry = { identifier, kind };
+                contexts[currentTrait].push_back( entry );
+        } else {
+                debugPrint( "Adding " << identifier << " as kind " << kind << " scope " << scope << " from scope " << currentScope << endl );
+                Entry newEntry = { scope, kind };
+                tableType::iterator curPos = table.find( identifier );
+                if ( curPos == table.end()) {
+                        list< Entry > newList;
+                        newList.push_front( newEntry );
+                        table[identifier] = newList;
+                } else {
+                        list< Entry >::iterator listPos = (*curPos ).second.begin();
+                        while ( listPos != (*curPos ).second.end() && listPos->scope > scope ) {
+                                listPos++;
+                        } // while
+                        (*curPos ).second.insert( listPos, newEntry );
+                } // if
+        } // if
+}
+void TypedefTable::addToScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
+        auto scope = kindTable.currentScope();
+        debugPrint( cerr << "Adding current at " << locn << " " << identifier << " as " << kindName( kind ) << " scope " << scope << endl );
+        kindTable.insertAt( scope, identifier, kind );
+} // TypedefTable::addToScope
+void TypedefTable::addToCurrentScope( const std::string &identifier, kind_t kind ) {
+        addToScope( identifier, kind, currentScope );
+}
+void TypedefTable::addToCurrentScope( kind_t kind ) {
+        addToCurrentScope( nextIdentifiers.top(), kind );
+}
+void TypedefTable::addToEnclosingScope( const std::string &identifier, kind_t kind ) {
+        assert( currentScope >= 1 );
+        addToScope( identifier, kind, currentScope - 1 );
+}
+void TypedefTable::addToEnclosingScope( kind_t kind ) {
+        addToEnclosingScope( nextIdentifiers.top(), kind );
+}
+void TypedefTable::addToEnclosingScope2( const std::string &identifier, kind_t kind ) {
+        assert( currentScope >= 2 );
+        addToScope( identifier, kind, currentScope - 2 );
+}
+void TypedefTable::addToEnclosingScope2( kind_t kind ) {
+        addToEnclosingScope2( nextIdentifiers.top(), kind );
+}
+void TypedefTable::setNextIdentifier( const std::string &identifier ) {
+        nextIdentifiers.top() = identifier;
+}
+void TypedefTable::openTrait( const std::string &contextName ) {
+        map< string, deferListType >::iterator i = contexts.find( contextName );
+        if ( i != contexts.end() ) {
+                deferListType &entries = i->second;
+                for ( deferListType::iterator i = entries.begin(); i != entries.end(); i++) {
+                        addToEnclosingScope( i->identifier, i->kind );
+                } // for
+        } // if
+}
+void TypedefTable::addToEnclosingScope( const string & identifier, int kind, const char * locn __attribute__((unused)) ) {
+        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
+} // TypedefTable::addToEnclosingScope
 void TypedefTable::enterScope() {
+        currentScope += 1;
+        deferListStack.push( deferListType() );
+        nextIdentifiers.push( "" );
+        debugPrint( "Entering scope " << currentScope << ", nextIdentifiers size is " << nextIdentifiers.size() << endl );
+}
+        kindTable.beginScope( (Note){ 0, false } );
+        debugPrint( cerr << "Entering scope " << kindTable.currentScope() << " level " << level << endl; print() );
+} // TypedefTable::enterScope
 void TypedefTable::leaveScope() {
+        debugPrint( "Leaving scope " << currentScope << endl );
+        for ( tableType::iterator i = table.begin(); i != table.end(); ) {
+                list< Entry > &declList = (*i).second;
+                while ( ! declList.empty() && declList.front().scope == currentScope ) {
+                        declList.pop_front();
+                }
+                if ( declList.empty() ) {                                               // standard idom for erasing during traversal
+                        table.erase( i++ );
+                } else
+                        ++i;
+        } // for
+        currentScope -= 1;
+        for ( deferListType::iterator i = deferListStack.top().begin(); i != deferListStack.top().end(); i++ ) {
+                addToCurrentScope( i->identifier, i->kind );
+        } // for
+        deferListStack.pop();
+        debugPrint( "nextIdentifiers size is " << nextIdentifiers.size() << " top is " << nextIdentifiers.top() << endl );
+        nextIdentifiers.pop();
+}
+        debugPrint( cerr << "Leaving scope " << kindTable.currentScope() << endl; print() );
+        kindTable.endScope();
+} // TypedefTable::leaveScope
+void TypedefTable::enterTrait( const std::string &contextName ) {
+        currentTrait = contextName;
+        contextScope = currentScope;
+}
+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::leaveTrait() {
+        currentTrait = "";
+}
+void TypedefTable::down() {
+        level -= 1;
+        debugPrint( cerr << "Down " << " level " << level << " note " << kindTable.getNote( level ).level << endl; );
+} // TypedefTable::down
 void TypedefTable::print( void ) const {
+        for ( tableType::const_iterator i = table.begin(); i != table.end(); i++) {
+                debugPrint( (*i ).first << ": " );
+                list< Entry > declList = (*i).second;
+                for ( list< Entry >::const_iterator j = declList.begin(); j != declList.end(); j++ ) {
+                        debugPrint( "(" << (*j).scope << " " << (*j).kind << ") " );
+                }
+                debugPrint( endl );
+        KindTable::size_type scope = kindTable.currentScope();
+        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 << "] " << kindTable.getNote( scope ).level << ", " << kindTable.getNote( scope ).forall << ":" );
+                } // while
+                debugPrint( cerr << " " << (*i).first << ":" << kindName( (*i).second ) );
         } // for
+}
+        while ( scope > 0 ) {
+                --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

-              rf9feab8
+              r90152a4
 // TypedefTable.h --
 //
 // Author           : Rodolfo G. Esteves
+// Author           : Peter A. Buhr
 // Created On       : Sat May 16 15:24:36 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sat Jul 22 09:33:14 2017
 // Update Count     : 34
+// Last Modified On : Wed Jul 25 15:33:55 2018
+// Update Count     : 114
 //
 #pragma once
+#include <list>       // for list
+#include <map>        // for map, map<>::value_compare
+#include <stack>      // for stack
+#include <string>     // for string
+#include <string>                                                                               // for string
+#include "Common/ScopedMap.h"                                                   // for ScopedMap
 #include "ParserTypes.h"
 #include "parser.hh"  // for IDENTIFIER, TYPEDEFname, TYPEGENname
+#include "parser.hh"                                                                    // for IDENTIFIER, TYPEDEFname, TYPEGENname
 class TypedefTable {
+        struct Note { size_t level; bool forall; };
+        typedef ScopedMap< std::string, int, Note > KindTable;
+        KindTable kindTable;
+        unsigned int level = 0;
   public:
+        enum kind_t { ID = IDENTIFIER, TD = TYPEDEFname, TG = TYPEGENname };
+  private:
+        struct Entry {
+                int scope;
+                kind_t kind;
+        };
+        ~TypedefTable();
+        struct DeferredEntry {
+                std::string identifier;
+                kind_t kind;
+        };
+        typedef std::map< std::string, std::list< Entry > > tableType;
+        tableType table;
+        int currentScope;
+        std::string currentTrait;
+        int contextScope;
+        typedef std::list< DeferredEntry > deferListType;
+        std::stack< deferListType > deferListStack;
+        std::map< std::string, deferListType > contexts;
+        std::stack< std::string > nextIdentifiers;
+        void addToScope( const std::string &identifier, kind_t kind, int scope );
+  public:
+        TypedefTable();
+        bool exists( const std::string &identifier );
+        int isKind( const std::string &identifier ) const;
+        void changeKind( const std::string &identifier, kind_t kind );
+        void makeTypedef( const std::string &name );
+        // "addToCurrentScope" adds the identifier/type pair to the current scope. This does less than you think it does,
+        // since each declaration is within its own scope.  Mostly useful for type parameters.
+        void addToCurrentScope( const std::string &identifier, kind_t kind );
+        void addToCurrentScope( kind_t kind );                  // use nextIdentifiers.top()
+        // "addToEnclosingScope" adds the identifier/type pair to the scope that encloses the current one.  This is the
+        // right way to handle type and typedef names
+        void addToEnclosingScope( const std::string &identifier, kind_t kind );
+        void addToEnclosingScope( kind_t kind );                // use nextIdentifiers.top()
+        // "addToEnclosingScope2" adds the identifier/type pair to the scope that encloses the scope enclosing the the
+        // current one.  This is the right way to handle assertion names
+        void addToEnclosingScope2( const std::string &identifier, kind_t kind );
+        void addToEnclosingScope2( kind_t kind );               // use nextIdentifiers.top()
+        // set the next identifier to be used by an "add" operation without an identifier parameter within the current scope
+        void setNextIdentifier( const std::string &identifier );
+        // dump the definitions from a pre-defined context into the current scope
+        void openTrait( const std::string &contextName );
+        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 enterTrait( const std::string &contextName );
-        void leaveTrait();
+        void print() const;
+};
+        void up( bool );
+        void down();
+        void print( void ) const;
+}; // TypedefTable
 // Local Variables: //

src/Parser/lex.ll

-              rf9feab8
+              r90152a4
  * Created On       : Sat Sep 22 08:58:10 2001
  * Last Modified By : Peter A. Buhr
  * Last Modified On : Wed Oct 25 13:53:56 2017
  * Update Count     : 634
+ * Last Modified On : Wed Aug  8 17:23:17 2018
+ * Update Count     : 685
  */
 …
 //**************************** 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>
 …
 #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 )
 void rm_underscore() {
         // Remove underscores in numeric constant by copying the non-underscore characters to the front of the string.
+        // SKULLDUGGERY: remove underscores (ok to shorten?)
         yyleng = 0;
+        for ( int i = 0; yytext[i] != '\0'; i += 1 ) {
+                if ( yytext[i] == '`' ) {
+                        // copy user suffix
+                        for ( ; yytext[i] != '\0'; i += 1 ) {
+                                yytext[yyleng] = yytext[i];
+                                yyleng += 1;
+                        } // for
+                        break;
+                } // if
+        for ( int i = 0; yytext[i] != '\0'; i += 1 ) {          // copying non-underscore characters to front of string
                 if ( yytext[i] != '_' ) {
                         yytext[yyleng] = yytext[i];
 …
         } // for
         yytext[yyleng] = '\0';
+}
+} // rm_underscore
 // Stop warning due to incorrectly generated flex code.
 …
 %}
+binary [0-1]
 octal [0-7]
 nonzero [1-9]
 …
 attr_identifier "@"{identifier}
-user_suffix_opt ("`"{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]))?{user_suffix_opt}
+integer_suffix_opt ("_"?(([uU]({length}?[iI]?)|([iI]{length}))|([iI]({length}?[uU]?)|([uU]{length}))|({length}([iI]?[uU]?)|([uU][iI]))|[zZ]))?
 octal_digits ({octal})|({octal}({octal}|"_")*{octal})
 …
 nonzero_digits ({nonzero})|({nonzero}({decimal}|"_")*{decimal})
 decimal_constant {nonzero_digits}{integer_suffix_opt}
+binary_digits ({binary})|({binary}({binary}|"_")*{binary})
+binary_prefix "0"[bB]"_"?
+binary_constant {binary_prefix}{binary_digits}{integer_suffix_opt}
 hex_digits ({hex})|({hex}({hex}|"_")*{hex})
 …
 floating_length ([fFdDlL]|[lL]{floating_size})
 floating_suffix ({floating_length}?[iI]?)|([iI]{floating_length})
 floating_suffix_opt ("_"?({floating_suffix}|"DL"))?{user_suffix_opt}
+floating_suffix_opt ("_"?({floating_suffix}|"DL"))?
 decimal_digits ({decimal})|({decimal}({decimal}|"_")*{decimal})
 floating_decimal {decimal_digits}"."{exponent}?{floating_suffix_opt}
 …
 binary_exponent "_"?[pP]"_"?[+-]?{decimal_digits}
 hex_floating_suffix_opt ("_"?({floating_suffix}))?{user_suffix_opt}
+hex_floating_suffix_opt ("_"?({floating_suffix}))?
 hex_floating_fraction ({hex_digits}?"."{hex_digits})|({hex_digits}".")
 hex_floating_constant {hex_prefix}(({hex_floating_fraction}{binary_exponent})|({hex_digits}{binary_exponent})){hex_floating_suffix_opt}
 …
+}
                                 /* ignore preprocessor directives (for now) */
 ^{h_white}*"#"[^\n]*"\n" ;
+                                /* preprocessor-style directives */
+^{h_white}*"#"[^\n]*"\n" { RETURN_VAL( DIRECTIVE ); }
                                 /* ignore C style comments (ALSO HANDLED BY CPP) */
 …
 __asm                   { KEYWORD_RETURN(ASM); }                                // GCC
 __asm__                 { KEYWORD_RETURN(ASM); }                                // GCC
-_At                             { KEYWORD_RETURN(AT); }                                 // CFA
 _Atomic                 { KEYWORD_RETURN(ATOMIC); }                             // C11
 __attribute             { KEYWORD_RETURN(ATTRIBUTE); }                  // GCC
 …
 enum                    { KEYWORD_RETURN(ENUM); }
 __extension__   { KEYWORD_RETURN(EXTENSION); }                  // GCC
+exception               { KEYWORD_RETURN(EXCEPTION); }                  // CFA
 extern                  { KEYWORD_RETURN(EXTERN); }
+fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
 fallthru                { KEYWORD_RETURN(FALLTHRU); }                   // CFA
-fallthrough             { KEYWORD_RETURN(FALLTHROUGH); }                // CFA
 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
 …
 __builtin_offsetof { KEYWORD_RETURN(OFFSETOF); }                // GCC
 one_t                   { NUMERIC_RETURN(ONE_T); }                              // CFA
+or                              { QKEYWORD_RETURN(WOR); }                               // CFA
 otype                   { KEYWORD_RETURN(OTYPE); }                              // CFA
 register                { KEYWORD_RETURN(REGISTER); }
 …
 __volatile__    { KEYWORD_RETURN(VOLATILE); }                   // GCC
 waitfor                 { KEYWORD_RETURN(WAITFOR); }
-or                              { QKEYWORD_RETURN(WOR); }                               // CFA
 when                    { KEYWORD_RETURN(WHEN); }
 while                   { KEYWORD_RETURN(WHILE); }
 …
                                 /* identifier */
 {identifier}    { IDENTIFIER_RETURN(); }
+"`"{identifier}"`" {                                                                    // CFA
+        yytext[yyleng - 1] = '\0'; yytext += 1;                         // SKULLDUGGERY: remove backquotes (ok to shorten?)
+        IDENTIFIER_RETURN();
+}
 {attr_identifier} { ATTRIBUTE_RETURN(); }
-"`"                             { BEGIN BKQUOTE; }
-<BKQUOTE>{identifier} { IDENTIFIER_RETURN(); }
-<BKQUOTE>"`"    { BEGIN 0; }
                                 /* numeric constants */
+{binary_constant} { NUMERIC_RETURN(INTEGERconstant); }
+{octal_constant} { NUMERIC_RETURN(INTEGERconstant); }
 {decimal_constant} { NUMERIC_RETURN(INTEGERconstant); }
-{octal_constant} { NUMERIC_RETURN(INTEGERconstant); }
 {hex_constant}  { NUMERIC_RETURN(INTEGERconstant); }
 {floating_decimal}      { NUMERIC_RETURN(FLOATING_DECIMALconstant); } // must appear before floating_constant
 …
 ({cwide_prefix}[_]?)?['] { BEGIN QUOTE; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <QUOTE>[^'\\\n]* { strtext->append( yytext, yyleng ); }
 <QUOTE>['\n]{user_suffix_opt}   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
+<QUOTE>['\n]    { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(CHARACTERconstant); }
                                 /* ' stop editor highlighting */
 …
 ({swide_prefix}[_]?)?["] { BEGIN STRING; rm_underscore(); strtext = new string( yytext, yyleng ); }
 <STRING>[^"\\\n]* { strtext->append( yytext, yyleng ); }
 <STRING>["\n]{user_suffix_opt}  { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
+<STRING>["\n]   { BEGIN 0; strtext->append( yytext, yyleng ); RETURN_STR(STRINGliteral); }
                                 /* " stop editor highlighting */
 …
                                 /* punctuation */
 "@"                             { ASCIIOP_RETURN(); }
+"`"                             { ASCIIOP_RETURN(); }
 "["                             { ASCIIOP_RETURN(); }
 "]"                             { ASCIIOP_RETURN(); }
 …
 ">>="                   { NAMEDOP_RETURN(RSassign); }
+"~="                    { NAMEDOP_RETURN(Erange); }                             // CFA
 "@="                    { NAMEDOP_RETURN(ATassign); }                   // CFA
 …
 "?"({op_unary_pre_post}|"()"|"[?]"|"{}") { IDENTIFIER_RETURN(); }
 "^?{}"                  { IDENTIFIER_RETURN(); }
 "?`"{identifier} { IDENTIFIER_RETURN(); }                               // unit operator
+"?`"{identifier} { IDENTIFIER_RETURN(); }                               // postfix operator
 "?"{op_binary_over}"?"  { IDENTIFIER_RETURN(); }                // binary
         /*
 …
 %%
 // ----end of lexer----
 void yyerror( const char * errmsg ) {
+        cout << (yyfilename ? yyfilename : "*unknown file*") << ':' << yylineno << ':' << column - yyleng + 1
+                 << ": " << SemanticError::error_str() << errmsg << " at token \"" << (yytext[0] == '\0' ? "EOF" : yytext) << '"' << endl;
+        SemanticErrorThrow = true;
+        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

-              rf9feab8
+              r90152a4
 ## file "LICENCE" distributed with Cforall.
 ##
 ## module.mk --
+## module.mk --
 ##
 ## Author           : Peter A. Buhr
 …
        Parser/parserutility.cc
 MAINTAINERCLEANFILES += Parser/parser.output
+MOSTLYCLEANFILES += Parser/parser.hh Parser/parser.output

src/Parser/parser.yy

-              rf9feab8
+              r90152a4
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Nov 27 17:23:35 2017
 // Update Count     : 2992
+// Last Modified On : Wed Aug  8 17:50:07 2018
+// Update Count     : 3998
 //
 …
 } // 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.
 //   forall( otype T ) struct S { int i; } bar( T ) {}
 // Does the forall bind to the struct or the routine, and how would it be possible to explicitly specify the binding.
 //   forall( otype T ) struct S { int T; } forall( otype W ) bar( W ) {}
+// Currently, the forall is associated with the routine, and the generic type has to be separately defined:
+//   forall( otype T ) struct S { int T; };
+//   forall( otype W ) bar( W ) {}
 void rebindForall( DeclarationNode * declSpec, DeclarationNode * funcDecl ) {
         if ( declSpec->type->kind == TypeData::Aggregate ) { // return is aggregate definition
+        if ( declSpec->type->kind == TypeData::Aggregate ) { // ignore aggregate definition
                 funcDecl->type->forall = declSpec->type->aggregate.params; // move forall from aggregate to function type
                 declSpec->type->aggregate.params = nullptr;
 …
 } // rebindForall
+bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
+NameExpr * build_postfix_name( const string * name ) {
+        NameExpr * new_name = build_varref( new string( "?`" + *name ) );
+        delete name;
+        return new_name;
+} // build_postfix_name
+DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) {
+        if ( ! fieldList ) {                                                            // field declarator ?
+                if ( ! ( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) {
+                        stringstream ss;
+                        typeSpec->type->print( ss );
+                        SemanticWarning( yylloc, Warning::SuperfluousDecl, ss.str().c_str() );
+                        return nullptr;
+                } // if
+                fieldList = DeclarationNode::newName( nullptr );
+        } // if
+        return distAttr( typeSpec, fieldList );                         // mark all fields in list
+} // fieldDecl
+ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
+        return new ForCtrl(
+                distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
+                new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
+                new ExpressionNode( build_binary_val( OperKinds::PlusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
+} // forCtrl
+bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
 // https://www.gnu.org/software/bison/manual/bison.html#Location-Type
 …
         WaitForStmt * wfs;
         Expression * constant;
+        IfCtl * ifctl;
+        ForCtl * fctl;
+        IfCtrl * ifctl;
+        ForCtrl * fctl;
+        enum OperKinds compop;
         LabelNode * label;
         InitializerNode * in;
 …
         bool flag;
         CatchStmt::Kind catch_kind;
+        GenericExpr * genexpr;
+}
 …
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
+%token EXCEPTION                                                                                // CFA
 %token COROUTINE MONITOR THREAD                                                 // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
 …
 %token<tok> ATTR_IDENTIFIER             ATTR_TYPEDEFname                ATTR_TYPEGENname
 %token<tok> INTEGERconstant             CHARACTERconstant               STRINGliteral
+%token<tok> DIRECTIVE
 // Floating point constant is broken into three kinds of tokens because of the ambiguity with tuple indexing and
 // overloading constants 0/1, e.g., x.1 is lexed as (x)(.1), where (.1) is a factional constant, but is semantically
 …
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
+%token Erange                                                                                   // ~=
 %token ATassign                                                                                 // @=
 …
 %type<ifctl> if_control_expression
 %type<fctl> for_control_expression
+%type<compop> inclexcl
 %type<en> subrange
 %type<decl> asm_name_opt
 …
 %type<flag> asm_volatile_opt
 %type<en> handler_predicate_opt
+%type<genexpr> generic_association generic_assoc_list
 // statements
 %type<sn> statement                                             labeled_statement                       compound_statement
 %type<sn> statement_decl                                statement_decl_list                     statement_list_nodecl
 %type<sn> selection_statement
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
+%type<sn> selection_statement                   if_statement
+%type<sn> switch_clause_list_opt                switch_clause_list
 %type<en> case_value
 %type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
-%type<sn> fall_through                                  fall_through_opt
 %type<sn> iteration_statement                   jump_statement
 %type<sn> expression_statement                  asm_statement
+%type<sn> with_statement                                with_clause_opt
+%type<sn> with_statement
+%type<en> with_clause_opt
 %type<sn> exception_statement                   handler_clause                          finally_clause
 %type<catch_kind> handler_key
 …
 %type<decl> aggregate_type aggregate_type_nobody
 %type<decl> assertion assertion_list_opt
+%type<decl> assertion assertion_list assertion_list_opt
 %type<en>   bit_subrange_size_opt bit_subrange_size
 …
 %type<en> enumerator_value_opt
+%type<decl> exception_declaration external_definition external_definition_list external_definition_list_opt
+%type<decl> field_declaration field_declaration_list field_declarator field_declaring_list
+%type<en> field field_list field_name fraction_constants
+%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> cfa_identifier_parameter_declarator_tuple cfa_identifier_parameter_ptr
 %type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_type_list cfa_parameter_type_list_opt
+%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_ellipsis_list_opt
 %type<decl> cfa_typedef_declaration cfa_variable_declaration cfa_variable_specifier
 %type<decl> c_declaration
+%type<decl> c_declaration static_assert
 %type<decl> KR_function_declarator KR_function_no_ptr KR_function_ptr KR_function_array
+%type<decl> KR_declaration_list KR_declaration_list_opt
+%type<decl> parameter_declaration parameter_list parameter_type_list
+%type<decl> parameter_type_list_opt
+%type<decl> KR_parameter_list KR_parameter_list_opt
+%type<decl> parameter_declaration parameter_list parameter_type_list_opt
 %type<decl> paren_identifier paren_type
 …
 %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
 …
 // initializers
 %type<in>  initializer initializer_list initializer_opt
+%type<in>  initializer initializer_list_opt initializer_opt
 // designators
 …
 //   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 '('
 %locations                      // support location tracking for error messages
+%locations                                                                                              // support location tracking for error messages
 %start translation_unit                                                                 // parse-tree root
 …
 //************************* Namespace Management ********************************
 // The grammar in the ANSI C standard is not strictly context-free, since it relies upon the distinct terminal symbols
 // "identifier", "TYPEDEFname", and "TYPEGENname" that are lexically identical.  While it is possible to write a purely
 // context-free grammar, such a grammar would obscure the relationship between syntactic and semantic constructs.
 // Hence, this grammar uses the ANSI style.
 //
 // Cforall compounds this problem by introducing type names local to the scope of a declaration (for instance, those
 // introduced through "forall" qualifiers), and by introducing "type generators" -- parameterized types.  This latter
 // type name creates a third class of identifiers that must be distinguished by the scanner.
 //
 // Since the scanner cannot distinguish among the different classes of identifiers without some context information, it
 // accesses a data structure (TypedefTable) to allow classification of an identifier that it has just read.  Semantic
 // actions during the parser update this data structure when the class of identifiers change.
 //
 // Because the Cforall language is block-scoped, there is the possibility that an identifier can change its class in a
 // local scope; it must revert to its original class at the end of the block.  Since type names can be local to a
 // particular declaration, each declaration is itself a scope.  This requires distinguishing between type names that are
 // local to the current declaration scope and those that persist past the end of the declaration (i.e., names defined in
 // "typedef" or "otype" declarations).
 //
 // The non-terminals "push" and "pop" derive the empty string; their only use is to denote the opening and closing of
 // scopes.  Every push must have a matching pop, although it is regrettable the matching pairs do not always occur
 // within the same rule.  These non-terminals may appear in more contexts than strictly necessary from a semantic point
 // of view.  Unfortunately, these extra rules are necessary to prevent parsing conflicts -- the parser may not have
 // enough context and look-ahead information to decide whether a new scope is necessary, so the effect of these extra
 // rules is to open a new scope unconditionally.  As the grammar evolves, it may be neccesary to add or move around
 // "push" and "pop" nonterminals to resolve conflicts of this sort.
+// The C grammar is not context free because it relies on the distinct terminal symbols "identifier" and "TYPEDEFname",
+// which are lexically identical.
+//
+//   typedef int foo; // identifier foo must now be scanned as TYPEDEFname
+//   foo f;           // to allow it to appear in this context
+//
+// While it may be possible to write a purely context-free grammar, such a grammar would obscure the relationship
+// between syntactic and semantic constructs.  Cforall compounds this problem by introducing type names local to the
+// scope of a declaration (for instance, those introduced through "forall" qualifiers), and by introducing "type
+// generators" -- parameterized types.  This latter type name creates a third class of identifiers, "TYPEGENname", which
+// must be distinguished by the lexical scanner.
+//
+// Since the scanner cannot distinguish among the different classes of identifiers without some context information,
+// there is a type table (typedefTable), which holds type names and identifiers that override type names, for each named
+// scope. During parsing, semantic actions update the type table by adding new identifiers in the current scope. For
+// each context that introduces a name scope, a new level is created in the type table and that level is popped on
+// exiting the scope.  Since type names can be local to a particular declaration, each declaration is itself a scope.
+// This requires distinguishing between type names that are local to the current declaration scope and those that
+// persist past the end of the declaration (i.e., names defined in "typedef" or "otype" declarations).
+//
+// The non-terminals "push" and "pop" denote the opening and closing of named scopes. Every push has a matching pop in
+// the production rule. There are multiple lists of declarations, where each declaration is a named scope, so pop/push
+// around the list separator.
+//
+//  int f( forall(T) T (*f1) T , forall( S ) S (*f2)( S ) );
+//      push               pop   push                   pop
 push:
 …
+        ;
-identifier:
-        IDENTIFIER
-        | ATTR_IDENTIFIER                                                                       // CFA
-        | quasi_keyword
+        ;
 no_attr_identifier:
         IDENTIFIER
         | quasi_keyword
+        | '@'                                                                                           // CFA
+                { Token tok = { new string( DeclarationNode::anonymous.newName() ), yylval.tok.loc }; $$ = tok; }
+        ;
+identifier:
+        no_attr_identifier
+        | ATTR_IDENTIFIER                                                                       // CFA
+        ;
 …
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
+        | constant '`' IDENTIFIER                                                       // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
+        | string_literal '`' IDENTIFIER                                         // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( $1 ) ) ); }
+        | IDENTIFIER '`' IDENTIFIER                                                     // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( build_varref( $1 ) ) ) ); }
+        | tuple '`' IDENTIFIER                                                          // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
+        | '(' 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
+                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; }                                                          // FIX ME
+        | type_name '.' '[' push field_list pop ']'                     // CFA, nested type / tuple field selector
+                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; }                                                          // FIX ME
+                { 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
+                {
+                        // add the missing control expression to the GenericExpr and return it
+                        $5->control = maybeMoveBuild<Expression>( $3 );
+                        $$ = new ExpressionNode( $5 );
+                }
+        ;
+generic_assoc_list:                                                                             // C11
+        generic_association
+        | generic_assoc_list ',' generic_association
+                {
+                        // steal the association node from the singleton and delete the wrapper
+                        $1->associations.splice($1->associations.end(), $3->associations);
+                        delete $3;
+                        $$ = $1;
+                }
+        ;
+generic_association:                                                                    // C11
+        type_no_function ':' assignment_expression
+                {
+                        // create a GenericExpr wrapper with one association pair
+                        $$ = new GenericExpr( nullptr, { { maybeMoveBuildType($1), maybeMoveBuild<Expression>($3) } } );
+                }
+        | DEFAULT ':' assignment_expression
+                { $$ = new GenericExpr( nullptr, { { maybeMoveBuild<Expression>($3) } } ); }
+        ;
 postfix_expression:
         primary_expression
         | postfix_expression '[' push assignment_expression pop ']'
+        | postfix_expression '[' assignment_expression ']'
                 // CFA, comma_expression disallowed in this context because it results in a common user error: subscripting a
                 // matrix with x[i,j] instead of x[i][j]. While this change is not backwards compatible, there seems to be
                 // little advantage to this feature and many disadvantages. It is possible to write x[(i,j)] in CFA, which is
                 // equivalent to the old x[i,j].
                 { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, $4 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, $3 ) ); }
         | postfix_expression '{' argument_expression_list '}' // CFA, constructor call
+                {
 …
         | postfix_expression '.' no_attr_identifier
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
         | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
+        | postfix_expression '.' INTEGERconstant                        // CFA, tuple index
+                { $$ = new ExpressionNode( build_fieldSel( $1, build_constantInteger( *$3 ) ) ); }
         | postfix_expression FLOATING_FRACTIONconstant          // CFA, tuple index
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_FLOATING_FRACTIONconstant( *$2 ) ) ); }
+        | 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 '[' push field_list pop ']' // CFA, tuple field selector
-                        { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$3 ) ) ); }
+        | postfix_expression ARROW '[' field_name_list ']'      // CFA, tuple field selector
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); }
         | postfix_expression ICR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }
         | postfix_expression DECR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, $1 ) ); }
         | '(' type_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
+        | '(' type_no_function ')' '{' initializer_list_opt comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
+        | '(' type_no_function ')' '@' '{' initializer_list_opt comma_opt '}' // CFA, explicit C compound-literal
+                { $$ = new ExpressionNode( build_compoundLiteral( $2, (new InitializerNode( $6, true ))->set_maybeConstructed( false ) ) ); }
         | '^' primary_expression '{' argument_expression_list '}' // CFA
+                {
 …
         // 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 '[' push field_list pop ']'
                 { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), build_tuple( $4 ) ) ); }
+        | 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 '.' '[' push field_list pop ']'
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
+        | 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 '[' push field_list pop ']'
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
+        | field_name ARROW '[' field_name_list ']'
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); }
+        ;
 field_name:
         INTEGERconstant fraction_constants
+        INTEGERconstant fraction_constants_opt
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_constantInteger( *$1 ), $2 ) ); }
         | FLOATINGconstant fraction_constants
+        | FLOATINGconstant fraction_constants_opt
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_field_name_FLOATINGconstant( *$1 ), $2 ) ); }
         | no_attr_identifier fraction_constants
+        | no_attr_identifier fraction_constants_opt
+                {
                         $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) );
 …
+        ;
 fraction_constants:
+fraction_constants_opt:
         // empty
                 { $$ = nullptr; }
         | fraction_constants FLOATING_FRACTIONconstant
+        | fraction_constants_opt FLOATING_FRACTIONconstant
+                {
                         Expression * constant = build_field_name_FLOATING_FRACTIONconstant( *$2 );
 …
                 // semantics checks, e.g., ++3, 3--, *3, &&3
         | constant
-                { $$ = $1; }
         | string_literal
                 { $$ = new ExpressionNode( $1 ); }
 …
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
+        | '(' COROUTINE '&' ')' cast_expression                         // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
+        | '(' THREAD '&' ')' cast_expression                            // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Thread, $5 ) ); }
+        | '(' MONITOR '&' ')' cast_expression                           // CFA
+                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Monitor, $5 ) ); }
                 // VIRTUAL cannot be opt because of look ahead issues
         | '(' VIRTUAL ')' cast_expression
+        | '(' VIRTUAL ')' cast_expression                                       // CFA
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $4 ), maybeMoveBuildType( nullptr ) ) ); }
         | '(' VIRTUAL type_no_function ')' cast_expression
+        | '(' VIRTUAL type_no_function ')' cast_expression      // CFA
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); }
 //      | '(' type_no_function ')' tuple
 …
         | logical_OR_expression '?' comma_expression ':' conditional_expression
                 { $$ = new ExpressionNode( build_cond( $1, $3, $5 ) ); }
                 // FIX ME: this hack computes $1 twice
+                // FIX ME: computes $1 twice
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
                 { $$ = new ExpressionNode( build_cond( $1, $1, $4 ) ); }
 …
         | unary_expression assignment_operator assignment_expression
                 { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
+        | unary_expression '=' '{' initializer_list_opt comma_opt '}'
+                { SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; }
+        ;
 …
 //      '[' ']'
 //              { $$ = new ExpressionNode( build_tuple() ); }
 //      '[' push assignment_expression pop ']'
+//      | '[' push assignment_expression pop ']'
 //              { $$ = new ExpressionNode( build_tuple( $3 ) ); }
         '[' push ',' tuple_expression_list pop ']'
                 { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $4 ) ) ); }
         | '[' push assignment_expression ',' tuple_expression_list pop ']'
                 { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)$3->set_last( $5 ) ) ); }
+        '[' ',' tuple_expression_list ']'
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $3 ) ) ); }
+        | '[' push assignment_expression pop ',' tuple_expression_list ']'
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)$3->set_last( $6 ) ) ); }
+        ;
 …
         labeled_statement
         | compound_statement
         | expression_statement                                          { $$ = $1; }
+        | expression_statement
         | selection_statement
         | iteration_statement
 …
         | waitfor_statement
         | exception_statement
+        | enable_disable_statement
+                { SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; }
         | asm_statement
+        | DIRECTIVE
+                { $$ = new StatementNode( build_directive( $1 ) ); }
+        ;
 labeled_statement:
 …
         '{' '}'
                 { $$ = new StatementNode( build_compound( (StatementNode *)0 ) ); }
+        | '{'
+                // Two scopes are necessary because the block itself has a scope, but every declaration within the block also
+                // requires its own scope.
+          push push
+        | '{' push
           local_label_declaration_opt                                           // GCC, local labels
           statement_decl_list                                                           // C99, intermix declarations and statements
           pop '}'
                 { $$ = new StatementNode( build_compound( $5 ) ); }
+                { $$ = new StatementNode( build_compound( $4 ) ); }
+        ;
 statement_decl_list:                                                                    // C99
         statement_decl
         | statement_decl_list push statement_decl
                 { if ( $1 != 0 ) { $1->set_last( $3 ); $$ = $1; } }
+        | statement_decl_list statement_decl
+                { if ( $1 != 0 ) { $1->set_last( $2 ); $$ = $1; } }
+        ;
 …
                         $$ = new StatementNode( $2 );
+                }
         | statement pop
+        | statement
+        ;
 …
 selection_statement:
+        IF '(' push if_control_expression ')' statement         %prec THEN
+                // explicitly deal with the shift/reduce conflict on if/else
+                { $$ = new StatementNode( build_if( $4, $6, nullptr ) ); }
+        | IF '(' push if_control_expression ')' statement ELSE statement
+                { $$ = new StatementNode( build_if( $4, $6, $8 ) ); }
+                        // pop causes a S/R conflict without separating the IF statement into a non-terminal even after resolving
+                        // the inherent S/R conflict with THEN/ELSE.
+        push if_statement pop
+                { $$ = $2; }
         | SWITCH '(' comma_expression ')' case_clause
                 { $$ = new StatementNode( build_switch( $3, $5 ) ); }
         | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
+                {
                         StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
+                { $$ = new StatementNode( build_switch( true, $3, $5 ) ); }
+        | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt pop '}' // CFA
+                {
+                        StatementNode *sw = new StatementNode( build_switch( true, $3, $8 ) );
                         // The semantics of the declaration list is changed to include associated initialization, which is performed
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
 …
+                }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
                 { $$ = new StatementNode( build_switch( $3, $5 ) ); }
         | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt choose_clause_list_opt '}' // CFA
+                {
                         StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
+                { $$ = new StatementNode( build_switch( false, $3, $5 ) ); }
+        | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt pop '}' // CFA
+                {
+                        StatementNode *sw = new StatementNode( build_switch( false, $3, $8 ) );
                         $$ = $7 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
+                }
+        ;
+if_statement:
+        IF '(' if_control_expression ')' statement                      %prec THEN
+                // explicitly deal with the shift/reduce conflict on if/else
+                { $$ = new StatementNode( build_if( $3, $5, nullptr ) ); }
+        | IF '(' if_control_expression ')' statement ELSE statement
+                { $$ = new StatementNode( build_if( $3, $5, $7 ) ); }
+        ;
 if_control_expression:
         comma_expression pop
                 { $$ = new IfCtl( nullptr, $1 ); }
         | c_declaration pop                                                                     // no semi-colon
                 { $$ = new IfCtl( $1, nullptr ); }
         | cfa_declaration pop                                                           // no semi-colon
                 { $$ = new IfCtl( $1, nullptr ); }
+        comma_expression
+                { $$ = new IfCtrl( nullptr, $1 ); }
+        | c_declaration                                                                         // no semi-colon
+                { $$ = new IfCtrl( $1, nullptr ); }
+        | cfa_declaration                                                                       // no semi-colon
+                { $$ = new IfCtrl( $1, nullptr ); }
         | declaration comma_expression                                          // semi-colon separated
                 { $$ = new IfCtl( $1, $2 ); }
+                { $$ = new IfCtrl( $1, $2 ); }
+        ;
 …
+        ;
+//label_list_opt:
+//      // empty
+//      | identifier_or_type_name ':'
+//      | label_list_opt identifier_or_type_name ':'
+//      ;
 case_label_list:                                                                                // CFA
         case_label
 …
+        ;
-choose_clause_list_opt:                                                                 // CFA
-        // empty
-                { $$ = nullptr; }
-        | choose_clause_list
+        ;
-choose_clause_list:                                                                             // CFA
-        case_label_list fall_through
-                { $$ = $1->append_last_case( $2 ); }
-        | case_label_list statement_list_nodecl fall_through_opt
-                { $$ = $1->append_last_case( new StatementNode( build_compound( (StatementNode *)$2->set_last( $3 ) ) ) ); }
-        | choose_clause_list case_label_list fall_through
-                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( $3 ))); }
-        | choose_clause_list case_label_list statement_list_nodecl fall_through_opt
-                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( (StatementNode *)$3->set_last( $4 ) ) ) ) ) ); }
+        ;
-fall_through_opt:                                                                               // CFA
-        // empty
-                { $$ = new StatementNode( build_branch( BranchStmt::Break ) ); } // insert implicit break
-        | fall_through
+        ;
-fall_through_name:                                                                              // CFA
-        FALLTHRU
-        | FALLTHROUGH
+        ;
-fall_through:                                                                                   // CFA
-        fall_through_name
-                { $$ = nullptr; }
-        | fall_through_name ';'
-                { $$ = nullptr; }
+        ;
 iteration_statement:
+        WHILE '(' comma_expression ')' statement
+                { $$ = new StatementNode( build_while( $3, $5 ) ); }
+        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_while( $5, $2, true ) ); }
+        | FOR '(' push for_control_expression ')' statement
+                { $$ = new StatementNode( build_do_while( $5, $2 ) ); }
+        | 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 ')' statement pop
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }
+        ;
 for_control_expression:
+        comma_expression_opt pop ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtl( $1, $4, $6 ); }
+        | declaration comma_expression_opt ';' comma_expression_opt // C99
+                { $$ = new ForCtl( $1, $2, $4 ); }
+        comma_expression_opt                                                            // CFA
+                {
+                        if ( ! $1 ) {                                                           // => for ( ;; )
+                                $$ = new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr );
+                        } else {
+                                $$ = 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" ) ) ) );
+                        } // if
+                }
+        | constant_expression inclexcl constant_expression      // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
+        | constant_expression inclexcl constant_expression '~' constant_expression // CFA
+                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
+        | comma_expression_opt ';' comma_expression                     // CFA
+                {
+                        if ( ! $1 ) {
+                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
+                        } else if ( ! $3 ) {
+                                SemanticError( yylloc, "Missing loop range." ); $$ = nullptr;
+                        } else {
+                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
+                                        $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $3->clone(),
+                                                                 new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                                } else {
+                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
+                                } // if
+                        } // if
+                }
+        | comma_expression_opt ';' constant_expression inclexcl constant_expression // CFA
+                {
+                        if ( ! $1 ) {
+                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
+                        } else {
+                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
+                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
+                                } else {
+                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
+                                } // if
+                        } // if
+                }
+        | comma_expression_opt ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
+                {
+                        if ( ! $1 ) {
+                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
+                        } else {
+                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
+                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, $7 );
+                                } else {
+                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
+                                } // if
+                        } // if
+                }
+        | comma_expression_opt ';' 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 ); }
+        ;
+inclexcl:
+        '~'
+                { $$ = OperKinds::LThan; }
+        | Erange
+                { $$ = OperKinds::LEThan; }
+        ;
 …
                 // whereas normal operator precedence yields goto (*i)+3;
                 { $$ = new StatementNode( build_computedgoto( $3 ) ); }
+                // A semantic check is required to ensure fallthru appears only in the body of a choose statement.
+    | fall_through_name ';'                                                             // CFA
+                { $$ = new StatementNode( build_branch( BranchStmt::FallThrough ) ); }
+    | fall_through_name identifier_or_type_name ';'             // CFA
+                { $$ = new StatementNode( build_branch( $2, BranchStmt::FallThrough ) ); }
+        | fall_through_name DEFAULT ';'                                         // CFA
+                { $$ = new StatementNode( build_branch( BranchStmt::FallThroughDefault ) ); }
         | CONTINUE ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
 …
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
+        | RETURN '{' initializer_list_opt comma_opt '}'
+                { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
 …
+        ;
+fall_through_name:                                                                              // CFA
+        FALLTHRU
+        | FALLTHROUGH
+        ;
 with_statement:
         WITH '(' tuple_expression_list ')' statement
 …
 mutex_statement:
         MUTEX '(' argument_expression_list ')' statement
                 { throw SemanticError("Mutex statement is currently unimplemented."); $$ = nullptr; } // FIX ME
+                { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; }
+        ;
 when_clause:
+        WHEN '(' comma_expression ')'
+                { $$ = $3; }
+        WHEN '(' comma_expression ')'                           { $$ = $3; }
+        ;
 …
 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 ); }
+        ;
 timeout:
+        TIMEOUT '(' comma_expression ')'
+                { $$ = $3; }
+        TIMEOUT '(' comma_expression ')'                        { $$ = $3; }
+        ;
 …
                 { $$ = 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 push exception_declaration pop handler_predicate_opt ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( $1, $5, $7, $9 ) ); }
         | handler_clause handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
                 { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, $8, $10 ) ) ); }
+        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( $1, $4, $6, $8 ) ); }
+        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $5, $7, $9 ) ) ); }
+        ;
 handler_predicate_opt:
         //empty
+        // empty
                 { $$ = nullptr; }
+        | ';' conditional_expression
+                { $$ = $2; }
+        | ';' conditional_expression                            { $$ = $2; }
+        ;
 handler_key:
+        CATCH
+                { $$ = CatchStmt::Terminate; }
+        | CATCHRESUME
+                { $$ = CatchStmt::Resume; }
+        CATCH                                                                           { $$ = CatchStmt::Terminate; }
+        | CATCHRESUME                                                           { $$ = CatchStmt::Resume; }
+        ;
 finally_clause:
+        FINALLY compound_statement
+                {
+                        $$ = new StatementNode( build_finally( $2 ) );
+                }
+        FINALLY compound_statement                                      { $$ = new StatementNode( build_finally( $2 ) ); }
+        ;
 …
         type_specifier_nobody
         | type_specifier_nobody declarator
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addType( $1 );
+                }
+                { $$ = $2->addType( $1 ); }
         | type_specifier_nobody variable_abstract_declarator
                 { $$ = $2->addType( $1 ); }
         | cfa_abstract_declarator_tuple no_attr_identifier      // CFA
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->addName( $2 );
+                }
+                { $$ = $1->addName( $2 ); }
         | cfa_abstract_declarator_tuple                                         // CFA
+        ;
+enable_disable_statement:
+        enable_disable_key identifier_list compound_statement
+        ;
+enable_disable_key:
+        ENABLE
+        | DISABLE
+        ;
 asm_statement:
         ASM asm_volatile_opt '(' string_literal ')' ';'
                 { $$ = new StatementNode( build_asmstmt( $2, $4, 0 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, 0 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ')' ';' // remaining GCC
                 { $$ = new StatementNode( build_asmstmt( $2, $4, $6 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, $6 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ')' ';'
                 { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, $6, $8 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ':' asm_clobbers_list_opt ')' ';'
                 { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8, $10 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $4, $6, $8, $10 ) ); }
         | ASM asm_volatile_opt GOTO '(' string_literal ':' ':' asm_operands_opt ':' asm_clobbers_list_opt ':' label_list ')' ';'
                 { $$ = new StatementNode( build_asmstmt( $2, $5, 0, $8, $10, $12 ) ); }
+                { $$ = new StatementNode( build_asm( $2, $5, 0, $8, $10, $12 ) ); }
+        ;
 …
 declaration_list_opt:                                                                   // used at beginning of switch statement
         pop
+        // empty
                 { $$ = nullptr; }
         | declaration_list
 …
 declaration_list:
         declaration
         | declaration_list push declaration
                 { $$ = $1->appendList( $3 ); }
+        ;
 KR_declaration_list_opt:                                                                // used to declare parameter types in K&R style functions
+        | declaration_list declaration
+                { $$ = $1->appendList( $2 ); }
+        ;
+KR_parameter_list_opt:                                                                  // used to declare parameter types in K&R style functions
         // empty
                 { $$ = nullptr; }
         | KR_declaration_list
+        ;
 KR_declaration_list:
+        | KR_parameter_list
+        ;
+KR_parameter_list:
         push c_declaration pop ';'
                 { $$ = $2; }
         | KR_declaration_list push c_declaration pop ';'
+        | KR_parameter_list push c_declaration pop ';'
                 { $$ = $1->appendList( $3 ); }
+        ;
 …
 local_label_list:                                                                               // GCC, local label
         no_attr_identifier_or_type_name                         {}
         | local_label_list ',' no_attr_identifier_or_type_name {}
+        no_attr_identifier_or_type_name
+        | local_label_list ',' no_attr_identifier_or_type_name
+        ;
 declaration:                                                                                    // old & new style declarations
+        c_declaration pop ';'
+        | cfa_declaration pop ';'                                                       // CFA
+        | STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
+                { throw SemanticError("Static assert is currently unimplemented."); $$ = nullptr; }     // FIX ME
+        ;
+        c_declaration ';'
+        | cfa_declaration ';'                                                           // CFA
+        | static_assert                                                                         // C11
+        ;
+static_assert:
+        STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
+                { $$ = DeclarationNode::newStaticAssert( $3, $5 ); }
+        | STATICASSERT '(' constant_expression ')' ';'          // CFA
+                { $$ = DeclarationNode::newStaticAssert( $3, build_constantStr( *new string( "\"\"" ) ) ); }
 // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function
 …
 cfa_variable_declaration:                                                               // CFA
         cfa_variable_specifier initializer_opt
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->addInitializer( $2 );
+                }
+                { $$ = $1->addInitializer( $2 ); }
         | declaration_qualifier_list cfa_variable_specifier initializer_opt
                 // declaration_qualifier_list also includes type_qualifier_list, so a semantic check is necessary to preclude
                 // them as a type_qualifier cannot appear in that context.
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addQualifiers( $1 )->addInitializer( $3 );;
+                }
+                { $$ = $2->addQualifiers( $1 )->addInitializer( $3 ); }
         | cfa_variable_declaration pop ',' push identifier_or_type_name initializer_opt
+                {
+                        typedefTable.addToEnclosingScope( *$5, TypedefTable::ID );
+                        $$ = $1->appendList( $1->cloneType( $5 )->addInitializer( $6 ) );
+                }
+                { $$ = $1->appendList( $1->cloneType( $5 )->addInitializer( $6 ) ); }
+        ;
 …
                 // storage-class
         cfa_abstract_declarator_no_tuple identifier_or_type_name asm_name_opt
+                {
+                        typedefTable.setNextIdentifier( *$2 );
+                        $$ = $1->addName( $2 )->addAsmName( $3 );
+                }
+                { $$ = $1->addName( $2 )->addAsmName( $3 ); }
         | cfa_abstract_tuple identifier_or_type_name asm_name_opt
+                {
+                        typedefTable.setNextIdentifier( *$2 );
+                        $$ = $1->addName( $2 )->addAsmName( $3 );
+                }
+                { $$ = $1->addName( $2 )->addAsmName( $3 ); }
         | type_qualifier_list cfa_abstract_tuple identifier_or_type_name asm_name_opt
+                {
+                        typedefTable.setNextIdentifier( *$3 );
+                        $$ = $2->addQualifiers( $1 )->addName( $3 )->addAsmName( $4 );
+                }
+                { $$ = $2->addQualifiers( $1 )->addName( $3 )->addAsmName( $4 ); }
+        ;
 cfa_function_declaration:                                                               // CFA
         cfa_function_specifier
+                {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        $$ = $1;
+                }
         | type_qualifier_list cfa_function_specifier
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addQualifiers( $1 );
+                }
+                { $$ = $2->addQualifiers( $1 ); }
         | declaration_qualifier_list cfa_function_specifier
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addQualifiers( $1 );
+                }
+                { $$ = $2->addQualifiers( $1 ); }
         | declaration_qualifier_list type_qualifier_list cfa_function_specifier
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $3->addQualifiers( $1 )->addQualifiers( $2 );
+                }
+        | cfa_function_declaration pop ',' push identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
+                { $$ = $3->addQualifiers( $1 )->addQualifiers( $2 ); }
+        | cfa_function_declaration ',' identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
+                {
                         // Append the return type at the start (left-hand-side) to each identifier in the list.
                         DeclarationNode * ret = new DeclarationNode;
                         ret->type = maybeClone( $1->type->base );
                         $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr, true ) );
+                        $$ = $1->appendList( DeclarationNode::newFunction( $3, ret, $6, nullptr ) );
+                }
+        ;
 cfa_function_specifier:                                                                 // CFA
 //      '[' ']' identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')' // S/R conflict
+//      '[' ']' identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')' // S/R conflict
 //              {
 //                      $$ = DeclarationNode::newFunction( $3, DeclarationNode::newTuple( 0 ), $6, 0, true );
 //              }
 //      '[' ']' identifier '(' push cfa_parameter_type_list_opt pop ')'
+//      '[' ']' identifier '(' push cfa_parameter_ellipsis_list_opt pop ')'
 //              {
 //                      typedefTable.setNextIdentifier( *$5 );
 //                      $$ = DeclarationNode::newFunction( $5, DeclarationNode::newTuple( 0 ), $8, 0, true );
 //              }
 //      | '[' ']' TYPEDEFname '(' push cfa_parameter_type_list_opt pop ')'
+//      | '[' ']' TYPEDEFname '(' push cfa_parameter_ellipsis_list_opt pop ')'
 //              {
 //                      typedefTable.setNextIdentifier( *$5 );
 …
                 // identifier_or_type_name must be broken apart because of the sequence:
                 //
                 //   '[' ']' identifier_or_type_name '(' cfa_parameter_type_list_opt ')'
+                //   '[' ']' identifier_or_type_name '(' cfa_parameter_ellipsis_list_opt ')'
                 //   '[' ']' type_specifier
                 //
                 // type_specifier can resolve to just TYPEDEFname (e.g., typedef int T; int f( T );). Therefore this must be
                 // flattened to allow lookahead to the '(' without having to reduce identifier_or_type_name.
         cfa_abstract_tuple identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
+        cfa_abstract_tuple identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 // To obtain LR(1 ), this rule must be factored out from function return type (see cfa_abstract_declarator).
+                {
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
+                }
+        | cfa_function_return identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
+                {
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
+                }
+                { $$ = DeclarationNode::newFunction( $2, $1, $5, 0 ); }
+        | cfa_function_return identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
+                { $$ = DeclarationNode::newFunction( $2, $1, $5, 0 ); }
+        ;
 …
                 { $$ = DeclarationNode::newTuple( $3 ); }
         | '[' push cfa_parameter_list pop ',' push cfa_abstract_parameter_list pop ']'
+                // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the
+                // ']'.
+                // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the ']'.
                 { $$ = DeclarationNode::newTuple( $3->appendList( $7 ) ); }
+        ;
 …
         TYPEDEF cfa_variable_specifier
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, "1" );
                         $$ = $2->addTypedef();
+                }
         | TYPEDEF cfa_function_specifier
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, "2" );
                         $$ = $2->addTypedef();
+                }
         | cfa_typedef_declaration pop ',' push no_attr_identifier
+                {
                         typedefTable.addToEnclosingScope( *$5, TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$5, TYPEDEFname, "3" );
                         $$ = $1->appendList( $1->cloneType( $5 ) );
+                }
 …
         TYPEDEF type_specifier declarator
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "4" );
                         $$ = $3->addType( $2 )->addTypedef();
+                }
         | typedef_declaration pop ',' push declarator
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$5->name, TYPEDEFname, "5" );
                         $$ = $1->appendList( $1->cloneBaseType( $5 )->addTypedef() );
+                }
         | type_qualifier_list TYPEDEF type_specifier declarator // remaining OBSOLESCENT (see 2 )
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "6" );
                         $$ = $4->addType( $3 )->addQualifiers( $1 )->addTypedef();
+                }
         | type_specifier TYPEDEF declarator
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "7" );
                         $$ = $3->addType( $1 )->addTypedef();
+                }
         | type_specifier TYPEDEF type_qualifier_list declarator
+                {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "8" );
                         $$ = $4->addQualifiers( $1 )->addTypedef()->addType( $1 );
+                }
 …
         TYPEDEF no_attr_identifier '=' assignment_expression
+                {
                         typedefTable.addToEnclosingScope( *$2, TypedefTable::TD );
                         $$ = DeclarationNode::newName( 0 );                     // unimplemented
+                        // $$ = DeclarationNode::newName( 0 );                  // unimplemented
+                        SemanticError( yylloc, "Typedef expression is currently unimplemented." ); $$ = nullptr;
+                }
         | typedef_expression pop ',' push no_attr_identifier '=' assignment_expression
+                {
                         typedefTable.addToEnclosingScope( *$5, TypedefTable::TD );
                         $$ = DeclarationNode::newName( 0 );                     // unimplemented
+                        // $$ = DeclarationNode::newName( 0 );                  // unimplemented
+                        SemanticError( yylloc, "Typedef expression is currently unimplemented." ); $$ = nullptr;
+                }
+        ;
 …
 //       declarator asm_name_opt initializer_opt
 //              {
 //                      typedefTable.addToEnclosingScope( TypedefTable::ID );
+//                      typedefTable.addToEnclosingScope( IDENTIFIER );
 //                      $$ = ( $2->addType( $1 ))->addAsmName( $3 )->addInitializer( $4 );
 //              }
 //      | declaring_list ',' attribute_list_opt declarator asm_name_opt initializer_opt
 //              {
 //                      typedefTable.addToEnclosingScope( TypedefTable::ID );
+//                      typedefTable.addToEnclosingScope( IDENTIFIER );
 //                      $$ = $1->appendList( $1->cloneBaseType( $4->addAsmName( $5 )->addInitializer( $6 ) ) );
 //              }
 …
 c_declaration:
         declaration_specifier declaring_list
+                {
+                        $$ = distAttr( $1, $2 );
+                }
+                { $$ = distAttr( $1, $2 ); }
         | typedef_declaration
         | typedef_expression                                                            // GCC, naming expression type
 …
                 // storage-class
         declarator asm_name_opt initializer_opt
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->addAsmName( $2 )->addInitializer( $3 );
+                }
+                { $$ = $1->addAsmName( $2 )->addInitializer( $3 ); }
         | declaring_list ',' attribute_list_opt declarator asm_name_opt initializer_opt
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->appendList( $4->addQualifiers( $3 )->addAsmName( $5 )->addInitializer( $6 ) );
+                }
+                { $$ = $1->appendList( $4->addQualifiers( $3 )->addAsmName( $5 )->addInitializer( $6 ) ); }
+        ;
 …
 forall:
+        FORALL '('
+                {
+                        typedefTable.enterScope();
+                }
+          type_parameter_list ')'                                                       // CFA
+                {
+                        typedefTable.leaveScope();
+                        $$ = DeclarationNode::newForall( $4 );
+                }
+        FORALL '(' type_parameter_list ')'                                      // CFA
+                { $$ = DeclarationNode::newForall( $3 ); }
+        ;
 …
         | LONG
                 { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
-        | ZERO_T
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
-        | ONE_T
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
 …
 basic_type_specifier:
         direct_type
+                // Cannot have type modifiers, e.g., short, long, etc.
         | type_qualifier_list_opt indirect_type type_qualifier_list_opt
                 { $$ = $2->addQualifiers( $1 )->addQualifiers( $3 ); }
 …
 direct_type:
-                // A semantic check is necessary for conflicting type qualifiers.
         basic_type_name
         | type_qualifier_list basic_type_name
 …
         | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type(a+b) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
+        | ZERO_T                                                                                        // CFA
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
+        | ONE_T                                                                                         // CFA
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
+        ;
 …
                 { $$ = $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
                 { $$ = DeclarationNode::newFromTypedef( $2 ); } // FIX ME
+                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), DeclarationNode::newFromTypedef( $2 ) ); }
         | type_name '.' TYPEDEFname
                 { $$ = DeclarationNode::newFromTypedef( $3 ); } // FIX ME
+                { $$ = DeclarationNode::newQualifiedType( $1, DeclarationNode::newFromTypedef( $3 ) ); }
         | typegen_name
         | '.' typegen_name
                 { $$ = $2; }                                                                    // FIX ME
+                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), $2 ); }
         | type_name '.' typegen_name
                 { $$ = $3; }                                                                    // FIX ME
+                { $$ = DeclarationNode::newQualifiedType( $1, $3 ); }
+        ;
 …
+        ;
+fred:
+        // empty
+                { yyy = false; }
+        ;
 aggregate_type:                                                                                 // struct, union
+        aggregate_key attribute_list_opt '{' field_declaration_list '}'
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
+                {
+                        typedefTable.makeTypedef( *$3 );                        // create typedef
+                        if ( forall ) typedefTable.changeKind( *$3, TypedefTable::TG ); // 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 no_attr_identifier fred
+                {
+                        typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
                         forall = false;                                                         // reset
+                }
+          '{' field_declaration_list '}'
+                { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $6, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt '(' type_list ')' '{' field_declaration_list '}' // 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, $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 '}' 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 );
+        aggregate_key attribute_list_opt no_attr_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 TYPEDEFname
+                {
+                        typedefTable.makeTypedef( *$3 );
+                        $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
+                }
+        | aggregate_key attribute_list_opt typegen_name         // CFA
+                {
+        | 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
+                { yyy = true; $$ = DeclarationNode::Exception; }
         | COROUTINE
                 { $$ = DeclarationNode::Coroutine; }
+                { yyy = true; $$ = DeclarationNode::Coroutine; }
         | MONITOR
                 { $$ = DeclarationNode::Monitor; }
+                { yyy = true; $$ = DeclarationNode::Monitor; }
         | THREAD
                 { $$ = DeclarationNode::Thread; }
+        ;
 field_declaration_list:
+                { yyy = true; $$ = DeclarationNode::Thread; }
+        ;
+field_declaration_list_opt:
         // empty
                 { $$ = nullptr; }
         | field_declaration_list field_declaration
+        | field_declaration_list_opt field_declaration
                 { $$ = $1 ? $1->appendList( $2 ) : $2; }
+        ;
 field_declaration:
+        cfa_field_declaring_list ';'                                            // CFA, new style field declaration
+        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
+        | cfa_field_declaring_list ';'                                          // CFA, new style field declaration
         | EXTENSION cfa_field_declaring_list ';'                        // GCC
+                {
+                        distExt( $2 );                                                          // mark all fields in list
+                        $$ = $2;
+                }
+        | type_specifier field_declaring_list ';'
+                {
+                        $$ = distAttr( $1, $2 ); }
+        | EXTENSION type_specifier field_declaring_list ';'     // GCC
+                {
+                        distExt( $3 );                                                          // mark all fields in list
+                        $$ = distAttr( $2, $3 );
+                }
+                { distExt( $2 ); $$ = $2; }                                             // mark all fields in list
+        | INLINE cfa_field_abstract_list ';'                            // CFA, new style field declaration
+                { $$ = $2; }                                                                    // mark all fields in list
+        | cfa_typedef_declaration ';'                                           // CFA
+        | static_assert                                                                         // C11
+        ;
+field_declaring_list_opt:
+        // empty
+                { $$ = nullptr; }
+        | field_declarator
+        | field_declaring_list_opt ',' attribute_list_opt field_declarator
+                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
+        ;
+field_declarator:
+        bit_subrange_size                                                                       // C special case, no field name
+                { $$ = DeclarationNode::newBitfield( $1 ); }
+        | variable_declarator bit_subrange_size_opt
+                // A semantic check is required to ensure bit_subrange only appears on integral types.
+                { $$ = $1->addBitfield( $2 ); }
+        | variable_type_redeclarator bit_subrange_size_opt
+                // A semantic check is required to ensure bit_subrange only appears on integral types.
+                { $$ = $1->addBitfield( $2 ); }
+        ;
+field_abstract_list_opt:
+        // empty
+                { $$ = nullptr; }
+        | field_abstract
+        | field_abstract_list_opt ',' attribute_list_opt field_abstract
+                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
+        ;
+field_abstract:
+                //      no bit fields
+        variable_abstract_declarator
+        ;
 cfa_field_declaring_list:                                                               // CFA, new style field declaration
         cfa_abstract_declarator_tuple                                           // CFA, no field name
         | cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
+        // bit-fields are handled by C declarations
+        cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
                 { $$ = $1->addName( $2 ); }
         | cfa_field_declaring_list ',' no_attr_identifier_or_type_name
                 { $$ = $1->appendList( $1->cloneType( $3 ) ); }
+        | cfa_field_declaring_list ','                                          // CFA, no field name
+        ;
+cfa_field_abstract_list:                                                                // CFA, new style field declaration
+        // bit-fields are handled by C declarations
+        cfa_abstract_declarator_tuple
+        | cfa_field_abstract_list ','
                 { $$ = $1->appendList( $1->cloneType( 0 ) ); }
+        ;
-field_declaring_list:
-        field_declarator
-        | field_declaring_list ',' attribute_list_opt field_declarator
-                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
+        ;
-field_declarator:
-        // empty
-                { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name
-        // '@'
-        //      { $$ = DeclarationNode::newName( new string( DeclarationNode::anonymous.newName() ) ); } // CFA, no field name
-        | bit_subrange_size                                                                     // no field name
-                { $$ = DeclarationNode::newBitfield( $1 ); }
-        | variable_declarator bit_subrange_size_opt
-                // A semantic check is required to ensure bit_subrange only appears on base type int.
-                { $$ = $1->addBitfield( $2 ); }
-        | variable_type_redeclarator bit_subrange_size_opt
-                // A semantic check is required to ensure bit_subrange only appears on base type int.
-                { $$ = $1->addBitfield( $2 ); }
-        | variable_abstract_declarator                                          // CFA, no field name
+        ;
 …
                 { $$ = nullptr; }
         | bit_subrange_size
-                { $$ = $1; }
+        ;
 …
 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_or_type_name
+                { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
+        | ENUM attribute_list_opt no_attr_identifier
                 { typedefTable.makeTypedef( *$3 ); }
           '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( $3, $6, true )->addQualifiers( $2 ); }
+        | ENUM attribute_list_opt type_name
+          '{' enumerator_list comma_opt '}'
+                { $$ = DeclarationNode::newEnum( $3->type->symbolic.name, $5, true )->addQualifiers( $2 ); }
         | enum_type_nobody
+        ;
 enum_type_nobody:                                                                               // enum - {...}
         ENUM attribute_list_opt no_attr_identifier_or_type_name
+        ENUM attribute_list_opt no_attr_identifier
+                {
                         typedefTable.makeTypedef( *$3 );
                         $$ = DeclarationNode::newEnum( $3, 0, false )->addQualifiers( $2 );
+                }
+        | ENUM attribute_list_opt type_name
+                {
+                        typedefTable.makeTypedef( *$3->type->symbolic.name );
+                        $$ = DeclarationNode::newEnum( $3->type->symbolic.name, 0, false )->addQualifiers( $2 );
+                }
+        ;
 …
+        ;
+// Minimum of one parameter after which ellipsis is allowed only at the end.
+cfa_parameter_type_list_opt:                                                    // CFA
+cfa_parameter_ellipsis_list_opt:                                                        // CFA, abstract + real
         // empty
+                { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
+        | ELLIPSIS
                 { $$ = nullptr; }
+        | cfa_parameter_type_list
+        ;
+cfa_parameter_type_list:                                                                // CFA, abstract + real
+        cfa_abstract_parameter_list
+        | cfa_abstract_parameter_list
         | cfa_parameter_list
         | cfa_parameter_list pop ',' push cfa_abstract_parameter_list
 …
         // empty
                 { $$ = nullptr; }
+        | parameter_type_list
+        ;
+parameter_type_list:
+        parameter_list
+        | ELLIPSIS
+                { $$ = nullptr; }
+        | parameter_list
         | parameter_list pop ',' push ELLIPSIS
                 { $$ = $1->addVarArgs(); }
 …
                 // No SUE declaration in parameter list.
         declaration_specifier_nobody identifier_parameter_declarator default_initialize_opt
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
+                }
+                { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
         | declaration_specifier_nobody type_parameter_redeclarator default_initialize_opt
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
+                }
+                { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
+        ;
 …
                 { $$ = $2; }
         | '=' VOID
                 { $$ = nullptr; }
+                { $$ = new InitializerNode( true ); }
         | ATassign initializer
                 { $$ = $2->set_maybeConstructed( false ); }
 …
 initializer:
         assignment_expression                                           { $$ = new InitializerNode( $1 ); }
         | '{' initializer_list comma_opt '}'            { $$ = new InitializerNode( $2, true ); }
+        ;
 initializer_list:
+        | '{' initializer_list_opt comma_opt '}'        { $$ = new InitializerNode( $2, true ); }
+        ;
+initializer_list_opt:
         // empty
                 { $$ = nullptr; }
         | initializer
         | designation initializer                                       { $$ = $2->set_designators( $1 ); }
         | initializer_list ',' initializer                      { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
         | initializer_list ',' designation initializer
+        | initializer_list_opt ',' initializer          { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
+        | initializer_list_opt ',' designation initializer
                 { $$ = (InitializerNode *)( $1->set_last( $4->set_designators( $3 ) ) ); }
+        ;
 …
         | '[' 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_list:                                                                    // CFA
         type_parameter
-                { $$ = $1; }
         | type_parameter_list ',' type_parameter
                 { $$ = $1->appendList( $3 ); }
 …
 type_parameter:                                                                                 // CFA
         type_class no_attr_identifier_or_type_name
                 { typedefTable.addToEnclosingScope( *$2, TypedefTable::TD ); }
+                { typedefTable.addToScope( *$2, TYPEDEFname, "9" ); }
           type_initializer_opt assertion_list_opt
                 { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
         | type_specifier identifier_parameter_declarator
+        | assertion_list
+                { $$ = DeclarationNode::newTypeParam( DeclarationNode::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); }
+        ;
 …
         // empty
                 { $$ = nullptr; }
+        | assertion_list_opt assertion
+        | assertion_list
+        ;
+assertion_list:                                                                                 // CFA
+        assertion
+        | assertion_list assertion
                 { $$ = $1 ? $1->appendList( $2 ) : $2; }
+        ;
 …
 assertion:                                                                                              // CFA
         '|' no_attr_identifier_or_type_name '(' type_list ')'
+                {
+                        typedefTable.openTrait( *$2 );
+                        $$ = DeclarationNode::newTraitUse( $2, $4 );
+                }
+        | '|' '{' push trait_declaration_list '}'
+                { $$ = DeclarationNode::newTraitUse( $2, $4 ); }
+        | '|' '{' push trait_declaration_list pop '}'
                 { $$ = $4; }
         | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}' '(' type_list ')'
                 { $$ = nullptr; }
+        // | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list pop '}' '(' type_list ')'
+        //      { SemanticError( yylloc, "Generic data-type assertion is currently unimplemented." ); $$ = nullptr; }
+        ;
 …
                 { $$ = 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 )); }
+        ;
 …
         no_attr_identifier_or_type_name
+                {
                         typedefTable.addToEnclosingScope( *$1, TypedefTable::TD );
+                        typedefTable.addToEnclosingScope( *$1, TYPEDEFname, "10" );
                         $$ = DeclarationNode::newTypeDecl( $1, 0 );
+                }
         | no_attr_identifier_or_type_name '(' push type_parameter_list pop ')'
+                {
                         typedefTable.addToEnclosingScope( *$1, TypedefTable::TG );
                         $$ = DeclarationNode::newTypeDecl( $1, $4 );
+        | no_attr_identifier_or_type_name '(' type_parameter_list ')'
+                {
+                        typedefTable.addToEnclosingScope( *$1, TYPEGENname, "11" );
+                        $$ = DeclarationNode::newTypeDecl( $1, $3 );
+                }
+        ;
 trait_specifier:                                                                                // CFA
+        TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
+                {
+                        typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
+                        $$ = DeclarationNode::newTrait( $2, $5, 0 );
+                }
+        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
+                {
+                        typedefTable.enterTrait( *$2 );
+                        typedefTable.enterScope();
+                }
+          trait_declaration_list '}'
+                {
+                        typedefTable.leaveTrait();
+                        typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
+                        $$ = DeclarationNode::newTrait( $2, $5, $10 );
+                }
+        TRAIT no_attr_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 '}'
+                { $$ = DeclarationNode::newTrait( $2, $4, $8 ); }
+        ;
 trait_declaration_list:                                                                 // CFA
         trait_declaration
         | trait_declaration_list push trait_declaration
                 { $$ = $1->appendList( $3 ); }
+        | trait_declaration_list pop push trait_declaration
+                { $$ = $1->appendList( $4 ); }
+        ;
 trait_declaration:                                                                              // CFA
         cfa_trait_declaring_list pop ';'
         | trait_declaring_list pop ';'
+        cfa_trait_declaring_list ';'
+        | trait_declaring_list ';'
+        ;
 cfa_trait_declaring_list:                                                               // CFA
         cfa_variable_specifier
+                {
-                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
-                        $$ = $1;
+                }
         | cfa_function_specifier
+                {
-                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
-                        $$ = $1;
+                }
         | cfa_trait_declaring_list pop ',' push identifier_or_type_name
+                {
+                        typedefTable.addToEnclosingScope2( *$5, TypedefTable::ID );
+                        $$ = $1->appendList( $1->cloneType( $5 ) );
+                }
+                { $$ = $1->appendList( $1->cloneType( $5 ) ); }
+        ;
 trait_declaring_list:                                                                   // CFA
         type_specifier declarator
+                {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        $$ = $2->addType( $1 );
+                }
+                { $$ = $2->addType( $1 ); }
         | trait_declaring_list pop ',' push declarator
+                {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        $$ = $1->appendList( $1->cloneBaseType( $5 ) );
+                }
+                { $$ = $1->appendList( $1->cloneBaseType( $5 ) ); }
+        ;
 …
 translation_unit:
+        // empty
+                {}                                                                                              // empty input file
+        // empty, input file
         | external_definition_list
                 { parseTree = parseTree ? parseTree->appendList( $1 ) : $1;     }
 …
 external_definition_list:
+        external_definition
+        | external_definition_list push external_definition
+        push external_definition pop
+                { $$ = $2; }
+        | external_definition_list push external_definition pop
                 { $$ = $1 ? $1->appendList( $3 ) : $3; }
+        ;
 …
+        ;
+up:
+                { typedefTable.up( forall ); forall = false; }
+        ;
+down:
+                { typedefTable.down(); }
+        ;
 external_definition:
         declaration
         | external_function_definition
+        | EXTENSION external_definition                                         // GCC, multiple __extension__ allowed, meaning unknown
+                {
+                        distExt( $2 );                                                          // mark all fields in list
+                        $$ = $2;
+                }
         | ASM '(' string_literal ')' ';'                                        // GCC, global assembler statement
+                {
                         $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asmstmt( false, $3, 0 ) ) );
+                        $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asm( false, $3, 0 ) ) );
+                }
         | EXTERN STRINGliteral                                                          // C++-style linkage specifier
+                {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
                         linkage = LinkageSpec::linkageUpdate( linkage, $2 );
+                }
           '{' external_definition_list_opt '}'
+                        linkage = LinkageSpec::linkageUpdate( yylloc, linkage, $2 );
+                }
+          '{' 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;
+                }
+        | EXTENSION external_definition                                         // GCC, multiple __extension__ allowed, meaning unknown
+                {
+                        distExt( $2 );                                                          // mark all fields in list
+                        $$ = $2;
+                }
+        | forall '{' external_definition_list '}'                       // CFA, namespace
+        | declaration_qualifier_list
+                {
+                        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
+                {
+                        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;
+                }
+        ;
 …
                 // declaration must still have a type_specifier.  OBSOLESCENT (see 1)
         | function_declarator compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $1->addFunctionBody( $2 );
+                }
+        | KR_function_declarator KR_declaration_list_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $1->addOldDeclList( $2 )->addFunctionBody( $3 );
+                }
+                { $$ = $1->addFunctionBody( $2 ); }
+        | KR_function_declarator KR_parameter_list_opt compound_statement
+                { $$ = $1->addOldDeclList( $2 )->addFunctionBody( $3 ); }
+        ;
 with_clause_opt:
         // empty
                 { $$ = nullptr; }
+                { $$ = nullptr; forall = false; }
         | WITH '(' tuple_expression_list ')'
                 { $$ = new StatementNode( build_with( $3, nullptr ) ); }
+                { $$ = $3; forall = false; }
+        ;
 …
         cfa_function_declaration with_clause_opt compound_statement     // CFA
+                {
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        typedefTable.leaveScope();
                         // Add the function body to the last identifier in the function definition list, i.e., foo3:
                         //   [const double] foo1(), foo2( int ), foo3( double ) { return 3.0; }
 …
+                {
                         rebindForall( $1, $2 );
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addFunctionBody( $4, $3 )->addType( $1 );
+                }
+        | declaration_specifier variable_type_redeclarator with_clause_opt compound_statement
+                {
+                        rebindForall( $1, $2 );
                         $$ = $2->addFunctionBody( $4, $3 )->addType( $1 );
+                }
                 // handles default int return type, OBSOLESCENT (see 1)
         | type_qualifier_list function_declarator with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 );
+                }
+                { $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 ); }
                 // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list function_declarator with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 );
+                }
+                { $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 ); }
                 // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list type_qualifier_list function_declarator with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $3->addFunctionBody( $5, $4 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
+                { $$ = $3->addFunctionBody( $5, $4 )->addQualifiers( $2 )->addQualifiers( $1 ); }
                 // Old-style K&R function definition, OBSOLESCENT (see 4)
         | declaration_specifier KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
+        | declaration_specifier KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
+                {
                         rebindForall( $1, $2 );
-                        typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addType( $1 );
+                }
                 // handles default int return type, OBSOLESCENT (see 1)
+        | type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 );
+                }
+        | type_qualifier_list KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
+                { $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 ); }
                 // handles default int return type, OBSOLESCENT (see 1)
+        | declaration_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
+                { $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 ); }
                 // handles default int return type, OBSOLESCENT (see 1)
+        | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6, $5 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
+                { $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6, $5 )->addQualifiers( $2 )->addQualifiers( $1 ); }
+        ;
 …
 paren_identifier:
         identifier
+                {
+                        typedefTable.setNextIdentifier( *$1 );
+                        $$ = DeclarationNode::newName( $1 );
+                }
+                { $$ = DeclarationNode::newName( $1 ); }
         | '(' paren_identifier ')'                                                      // redundant parenthesis
                 { $$ = $2; }
 …
 paren_type:
         typedef
+                // hide type name in enclosing scope by variable name
+                {
+                        // 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
+        ;
 …
 typedef:
         TYPEDEFname
+                {
+                        typedefTable.setNextIdentifier( *$1 );
+                        $$ = DeclarationNode::newName( $1 );
+                }
+                { $$ = DeclarationNode::newName( $1 ); }
         | TYPEGENname
+                {
+                        typedefTable.setNextIdentifier( *$1 );
+                        $$ = DeclarationNode::newName( $1 );
+                }
+                { $$ = DeclarationNode::newName( $1 ); }
+        ;
 …
         '[' ']'
                 { $$ = DeclarationNode::newArray( 0, 0, false ); }
         // multi_array_dimension handles the '[' '*' ']' case
+                // multi_array_dimension handles the '[' '*' ']' case
         | '[' push type_qualifier_list '*' pop ']'                      // remaining C99
                 { $$ = DeclarationNode::newVarArray( $3 ); }
         | '[' push type_qualifier_list pop ']'
                 { $$ = DeclarationNode::newArray( 0, $3, false ); }
         // multi_array_dimension handles the '[' assignment_expression ']' case
+                // multi_array_dimension handles the '[' assignment_expression ']' case
         | '[' push type_qualifier_list assignment_expression pop ']'
                 { $$ = DeclarationNode::newArray( $4, $3, false ); }
 …
 //
 //              cfa_abstract_tuple identifier_or_type_name
 //              '[' cfa_parameter_list ']' identifier_or_type_name '(' cfa_parameter_type_list_opt ')'
+//              '[' cfa_parameter_list ']' identifier_or_type_name '(' cfa_parameter_ellipsis_list_opt ')'
 //
 // since a function return type can be syntactically identical to a tuple type:
 …
         '[' push cfa_abstract_parameter_list pop ']'
                 { $$ = DeclarationNode::newTuple( $3 ); }
+        | '[' push type_specifier_nobody ELLIPSIS pop ']'
+                { SemanticError( yylloc, "Tuple array currently unimplemented." ); $$ = nullptr; }
+        | '[' push type_specifier_nobody ELLIPSIS constant_expression pop ']'
+                { SemanticError( yylloc, "Tuple array currently unimplemented." ); $$ = nullptr; }
+        ;
 cfa_abstract_function:                                                                  // CFA
 //      '[' ']' '(' cfa_parameter_type_list_opt ')'
+//      '[' ']' '(' cfa_parameter_ellipsis_list_opt ')'
 //              { $$ = DeclarationNode::newFunction( nullptr, DeclarationNode::newTuple( nullptr ), $4, nullptr ); }
         cfa_abstract_tuple '(' push cfa_parameter_type_list_opt pop ')'
+        cfa_abstract_tuple '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
         | cfa_function_return '(' push cfa_parameter_type_list_opt pop ')'
+        | cfa_function_return '(' push cfa_parameter_ellipsis_list_opt pop ')'
                 { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
+        ;
 …
 %%
 // ----end of grammar----

src/ResolvExpr/AdjustExprType.cc

-              rf9feab8
+              r90152a4
         class AdjustExprType : public WithShortCircuiting {
           public:
                 AdjustExprType( const TypeEnvironment &env, const SymTab::Indexer &indexer );
+                AdjustExprType( const TypeEnvironment & env, const SymTab::Indexer & indexer );
                 void premutate( VoidType * ) { visit_children = false; }
                 void premutate( BasicType * ) { visit_children = false; }
 …
           private:
                 const TypeEnvironment &env;
                 const SymTab::Indexer &indexer;
+                const TypeEnvironment & env;
+                const SymTab::Indexer & indexer;
         };
 …
+        }
+        void adjustExprType( Type *& type ) {
+                TypeEnvironment env;
+                SymTab::Indexer indexer;
+                adjustExprType( type, env, indexer );
+        }
         AdjustExprType::AdjustExprType( 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 );
+                PointerType *pointerType = new PointerType{ arrayType->get_qualifiers(), arrayType->base };
                 arrayType->base = nullptr;
                 delete arrayType;
 …
         Type * AdjustExprType::postmutate( FunctionType * functionType ) {
                 return new PointerType( Type::Qualifiers(), functionType );
+                return new PointerType{ Type::Qualifiers(), functionType };
+        }
         Type * AdjustExprType::postmutate( TypeInstType * typeInst ) {
+                EqvClass eqvClass;
+                if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
+                        if ( eqvClass.data.kind == TypeDecl::Ftype ) {
+                                PointerType *pointerType = new PointerType( Type::Qualifiers(), typeInst );
+                                return pointerType;
+                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 ) ) {
                                 if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
+                                        PointerType *pointerType = new PointerType( Type::Qualifiers(), typeInst );
+                                        return pointerType;
+                                        return new PointerType{ Type::Qualifiers(), typeInst };
                                 } // if
                         } // if

src/ResolvExpr/Alternative.cc

-              rf9feab8
+              r90152a4
 namespace ResolvExpr {
         Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( 0 ) {}
+        Alternative::Alternative() : cost( Cost::zero ), cvtCost( Cost::zero ), expr( nullptr ) {}
         Alternative::Alternative( Expression *expr, const TypeEnvironment &env, const Cost& cost )
 …
+        }
         Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( other.env ) {
+        Alternative::Alternative( Alternative && other ) : cost( other.cost ), cvtCost( other.cvtCost ), expr( other.expr ), env( std::move( other.env ) ) {
                 other.expr = nullptr;
+        }
 …
                 cvtCost = other.cvtCost;
                 expr = other.expr;
                 env = other.env;
+                env = std::move( other.env );
                 other.expr = nullptr;
                 return *this;

src/ResolvExpr/Alternative.h

-              rf9feab8
+              r90152a4
         /// 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) {
+                alt.print( os );
+                return os;
+        }
 } // namespace ResolvExpr

src/ResolvExpr/AlternativeFinder.cc

-              rf9feab8
+              r90152a4
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Mon Aug 28 13:47:24 2017
 // Update Count     : 32
+// Last Modified On : Sat Feb 17 11:19:39 2018
+// Update Count     : 33
 //
 …
 #include <vector>                  // for vector
+#include "CompilationState.h"      // for resolvep
 #include "Alternative.h"           // for AltList, Alternative
 #include "AlternativeFinder.h"
 …
 #include "typeops.h"               // for adjustExprType, polyCost, castCost
-extern bool resolvep;
 #define PRINT( text ) if ( resolvep ) { text }
 //#define DEBUG_COST
 …
 namespace ResolvExpr {
+        Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer, TypeEnvironment &env ) {
+                CastExpr *castToVoid = new CastExpr( expr );
+                AlternativeFinder finder( indexer, env );
+                finder.findWithAdjustment( castToVoid );
+                // 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.
+                assert( finder.get_alternatives().size() == 1 );
+                CastExpr *newExpr = dynamic_cast< CastExpr* >( finder.get_alternatives().front().expr );
+                assert( newExpr );
+                env = finder.get_alternatives().front().env;
+                return newExpr->get_arg()->clone();
+        }
+        struct AlternativeFinder::Finder : public WithShortCircuiting {
+                Finder( AlternativeFinder & altFinder ) : altFinder( altFinder ), indexer( altFinder.indexer ), alternatives( altFinder.alternatives ), env( altFinder.env ), targetType( altFinder.targetType )  {}
+                void previsit( BaseSyntaxNode * ) { visit_children = false; }
+                void postvisit( ApplicationExpr * applicationExpr );
+                void postvisit( UntypedExpr * untypedExpr );
+                void postvisit( AddressExpr * addressExpr );
+                void postvisit( LabelAddressExpr * labelExpr );
+                void postvisit( CastExpr * castExpr );
+                void postvisit( VirtualCastExpr * castExpr );
+                void postvisit( UntypedMemberExpr * memberExpr );
+                void postvisit( MemberExpr * memberExpr );
+                void postvisit( NameExpr * variableExpr );
+                void postvisit( VariableExpr * variableExpr );
+                void postvisit( ConstantExpr * constantExpr );
+                void postvisit( SizeofExpr * sizeofExpr );
+                void postvisit( AlignofExpr * alignofExpr );
+                void postvisit( UntypedOffsetofExpr * offsetofExpr );
+                void postvisit( OffsetofExpr * offsetofExpr );
+                void postvisit( OffsetPackExpr * offsetPackExpr );
+                void postvisit( AttrExpr * attrExpr );
+                void postvisit( LogicalExpr * logicalExpr );
+                void postvisit( ConditionalExpr * conditionalExpr );
+                void postvisit( CommaExpr * commaExpr );
+                void postvisit( ImplicitCopyCtorExpr  * impCpCtorExpr );
+                void postvisit( ConstructorExpr  * ctorExpr );
+                void postvisit( RangeExpr  * rangeExpr );
+                void postvisit( UntypedTupleExpr * tupleExpr );
+                void postvisit( TupleExpr * tupleExpr );
+                void postvisit( TupleIndexExpr * tupleExpr );
+                void postvisit( TupleAssignExpr * tupleExpr );
+                void postvisit( UniqueExpr * unqExpr );
+                void postvisit( StmtExpr * stmtExpr );
+                void postvisit( UntypedInitExpr * initExpr );
+                void postvisit( InitExpr * initExpr );
+                void postvisit( DeletedExpr * delExpr );
+                void postvisit( GenericExpr * genExpr );
+                /// Adds alternatives for anonymous members
+                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 );
+                /// 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 );
+                /// 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 );
+                /// Takes a final result and checks if its assertions can be satisfied
+                template<typename OutputIterator>
+                void validateFunctionAlternative( const Alternative &func, ArgPack& result, const std::vector<ArgPack>& results, OutputIterator out );
+                /// 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
+                template< typename OutputIterator >
+                void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );
+        private:
+                AlternativeFinder & altFinder;
+                const SymTab::Indexer &indexer;
+                AltList & alternatives;
+                const TypeEnvironment &env;
+                Type *& targetType;
+        };
         Cost sumCost( const AltList &in ) {
 …
                                                 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 renameTypes( Expression *expr ) {
                         expr->get_result()->accept( global_renamer );
+                        renameTyVars( expr->result );
+                }
         } // namespace
         void referenceToRvalueConversion( Expression *& expr ) {
+        void referenceToRvalueConversion( Expression *& expr, Cost & cost ) {
                 if ( dynamic_cast< ReferenceType * >( expr->get_result() ) ) {
                         // cast away reference from expr
                         expr = new CastExpr( expr, expr->get_result()->stripReferences()->clone() );
+                        cost.incReference();
+                }
+        }
 …
         void AlternativeFinder::find( Expression *expr, bool adjust, bool prune, bool failFast ) {
+                expr->accept( *this );
+                PassVisitor<Finder> finder( *this );
+                expr->accept( finder );
                 if ( failFast && alternatives.empty() ) {
                         PRINT(
                                 std::cerr << "No reasonable alternatives for expression " << expr << std::endl;
+                        )
                         throw SemanticError( "No reasonable alternatives for expression ", expr );
+                        SemanticError( expr, "No reasonable alternatives for expression " );
+                }
                 if ( prune ) {
 …
                                 stream << "Cannot choose between " << winners.size() << " alternatives for expression\n";
                                 expr->print( stream );
                                 stream << "Alternatives are:\n";
+                                stream << " Alternatives are:\n";
                                 printAlts( winners, stream, 1 );
                                 throw SemanticError( stream.str() );
+                                SemanticError( expr->location, stream.str() );
+                        }
                         alternatives = move(pruned);
 …
+        }
         void AlternativeFinder::addAnonConversions( const Alternative & alt ) {
+        void AlternativeFinder::Finder::addAnonConversions( const Alternative & alt ) {
                 // adds anonymous member interpretations whenever an aggregate value type is seen.
                 // it's okay for the aggregate expression to have reference type -- cast it to the base type to treat the aggregate as the referenced value
                 std::unique_ptr<Expression> aggrExpr( alt.expr->clone() );
                 alt.env.apply( aggrExpr->get_result() );
                 Type * aggrType = aggrExpr->get_result();
+                alt.env.apply( aggrExpr->result );
+                Type * aggrType = aggrExpr->result;
                 if ( dynamic_cast< ReferenceType * >( aggrType ) ) {
                         aggrType = aggrType->stripReferences();
 …
+                }
+                if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
+                        NameExpr nameExpr( "" );
+                        addAggMembers( structInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
+                } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
+                        NameExpr nameExpr( "" );
+                        addAggMembers( unionInst, aggrExpr.get(), alt.cost+Cost::safe, alt.env, &nameExpr );
+                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
+        }
         template< typename StructOrUnionType >
+        void AlternativeFinder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
+                // by this point, member must be a name expr
+                NameExpr * nameExpr = dynamic_cast< NameExpr * >( member );
+                if ( ! nameExpr ) return;
+                const std::string & name = nameExpr->get_name();
+        void AlternativeFinder::Finder::addAggMembers( StructOrUnionType *aggInst, Expression *expr, const Cost &newCost, const TypeEnvironment & env, const std::string & name ) {
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
+                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 MemberExpr( dwt, expr->clone() ), env, newCost ) );
+                                renameTypes( alternatives.back().expr );
+                                addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
+                for ( Declaration * decl : members ) {
+                        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 );
+                                renameTypes( newAlt.expr );
+                                addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a member expression.
+                                alternatives.push_back( std::move(newAlt) );
                         } else {
                                 assert( false );
 …
+        }
         void AlternativeFinder::addTupleMembers( TupleType * tupleType, Expression *expr, const Cost &newCost, const TypeEnvironment & env, Expression * member ) {
+        void AlternativeFinder::Finder::addTupleMembers( TupleType * tupleType, Expression *expr, const Cost &newCost, const TypeEnvironment & env, 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( new TupleIndexExpr( expr->clone(), val ), env, 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::visit( ApplicationExpr *applicationExpr ) {
+        void AlternativeFinder::Finder::postvisit( ApplicationExpr *applicationExpr ) {
                 alternatives.push_back( Alternative( applicationExpr->clone(), env, Cost::zero ) );
+        }
 …
                                         PRINT( std::cerr << "end of formals with varargs function: inc unsafe: " << convCost << std::endl; ; )
                                         // convert reference-typed expressions to value-typed expressions
                                         referenceToRvalueConversion( *actualExpr );
+                                        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;
+                        }
                         Type * formalType = (*formal)->get_type();
                         convCost += computeExpressionConversionCost( *actualExpr, formalType, indexer, alt.env );
 …
         /// Adds type variables to the open variable set and marks their assertions
         void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions ) {
                 for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
+                for ( Type::ForallList::const_iterator tyvar = type->forall.begin(); tyvar != type->forall.end(); ++tyvar ) {
                         unifiableVars[ (*tyvar)->get_name() ] = TypeDecl::Data{ *tyvar };
                         for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->get_assertions().begin(); assert != (*tyvar)->get_assertions().end(); ++assert ) {
+                        for ( std::list< DeclarationWithType* >::iterator assert = (*tyvar)->assertions.begin(); assert != (*tyvar)->assertions.end(); ++assert ) {
                                 needAssertions[ *assert ].isUsed = true;
+                        }
 …
+        }
-        // /// Map of declaration uniqueIds (intended to be the assertions in an AssertionSet) to their parents and the number of times they've been included
-        //typedef std::unordered_map< UniqueId, std::unordered_map< UniqueId, unsigned > > AssertionParentSet;
         static const int recursionLimit = /*10*/ 4;  ///< Limit to depth of recursion satisfaction
-        //static const unsigned recursionParentLimit = 1;  ///< Limit to the number of times an assertion can recursively use itself
         void addToIndexer( AssertionSet &assertSet, SymTab::Indexer &indexer ) {
 …
         template< typename ForwardIterator, typename OutputIterator >
         void inferRecursive( ForwardIterator begin, ForwardIterator end, const Alternative &newAlt, OpenVarSet &openVars, const SymTab::Indexer &decls, const AssertionSet &newNeed, /*const AssertionParentSet &needParents,*/
                                                  int level, const SymTab::Indexer &indexer, OutputIterator out ) {
+        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 ( newAlt.cost == Cost::infinity ) return; // don't proceed down this dead end
                 if ( begin == end ) {
                         if ( newNeed.empty() ) {
 …
                                 return;
                         } else if ( level >= recursionLimit ) {
                                 throw SemanticError( "Too many recursive assertions" );
+                                SemanticError( newAlt.expr->location, "Too many recursive assertions" );
                         } else {
                                 AssertionSet newerNeed;
 …
                                         printAssertionSet( newNeed, std::cerr, 8 );
+                                )
                                 inferRecursive( newNeed.begin(), newNeed.end(), newAlt, openVars, decls, newerNeed, /*needParents,*/ level+1, indexer, out );
+                                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, /*needParents,*/ level, indexer, out );
+                        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
+                }
 …
                         Type *adjType = candidate->get_type()->clone();
                         adjustExprType( adjType, newEnv, indexer );
                         adjType->accept( global_renamer );
+                        renameTyVars( adjType );
                         PRINT(
                                 std::cerr << "unifying ";
 …
+                                }
+                                //AssertionParentSet newNeedParents( needParents );
+                                // skip repeatingly-self-recursive assertion satisfaction
+                                // DOESN'T WORK: grandchild nodes conflict with their cousins
+                                //if ( newNeedParents[ curDecl->get_uniqueId() ][ candDecl->get_uniqueId() ]++ > recursionParentLimit ) continue;
+                                Expression *varExpr = data.combine();
+                                Expression *varExpr = data.combine( newerAlt.cvtCost );
                                 delete varExpr->get_result();
                                 varExpr->set_result( adjType->clone() );
 …
                                 // 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, /*newNeedParents,*/ level, indexer, out );
+                                inferRecursive( begin, end, newerAlt, newOpenVars, newDecls, newerNeed, level, indexer, out );
                         } else {
                                 delete adjType;
 …
         template< typename OutputIterator >
         void AlternativeFinder::inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out ) {
+        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;
 …
                 addToIndexer( have, decls );
                 AssertionSet newNeed;
-                //AssertionParentSet needParents;
                 PRINT(
                         std::cerr << "env is: " << std::endl;
 …
+                )
                 inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, /*needParents,*/ 0, indexer, out );
+                inferRecursive( need.begin(), need.end(), newAlt, openVars, decls, newNeed, 0, indexer, out );
 //      PRINT(
 //          std::cerr << "declaration 14 is ";
 …
         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 );
+                        }
+                }
 …
                 ArgPack()
                         : parent(0), expr(), cost(Cost::zero), env(), need(), have(), openVars(), nextArg(0),
                           tupleStart(0), nextExpl(0), explAlt(0) {}
 …
                         const ExplodedArgs& args, std::vector<ArgPack>& results, std::size_t& genStart,
                         const SymTab::Indexer& indexer, unsigned nTuples = 0 ) {
                 if ( TupleType* tupleType = dynamic_cast<TupleType*>( formalType ) ) {
+                if ( TupleType * tupleType = dynamic_cast<TupleType*>( formalType ) ) {
                         // formalType is a TupleType - group actuals into a TupleExpr
                         ++nTuples;
                         for ( Type* type : *tupleType ) {
                                 // xxx - dropping initializer changes behaviour from previous, but seems correct
+                                // ^^^ need to handle the case where a tuple has a default argument
                                 if ( ! instantiateArgument(
                                                 type, nullptr, args, results, genStart, indexer, nTuples ) )
 …
+                        }
                         return true;
                 } else if ( TypeInstType* ttype = Tuples::isTtype( formalType ) ) {
+                } else if ( TypeInstType * ttype = Tuples::isTtype( formalType ) ) {
                         // formalType is a ttype, consumes all remaining arguments
                         // xxx - mixing default arguments with variadic??
 …
                                                 Type* argType;
+                                                if ( nTuples > 0 ) {
+                                                        // first iteration, push empty tuple expression
+                                                if ( nTuples > 0 || ! results[i].expr ) {
+                                                        // first iteration or no expression to clone,
+                                                        // push empty tuple expression
                                                         newResult.parent = i;
                                                         std::list<Expression*> emptyList;
 …
                                                                 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 );
+                                                }
 …
                                 // consider only first exploded actual
                                 Expression* expr = expl.exprs.front().get();
                                 Type* actualType = expr->get_result()->clone();
+                                Type* actualType = expr->result->clone();
                                 PRINT(
 …
         template<typename OutputIterator>
         void AlternativeFinder::validateFunctionAlternative( const Alternative &func, ArgPack& result,
+        void AlternativeFinder::Finder::validateFunctionAlternative( const Alternative &func, ArgPack& result,
                         const std::vector<ArgPack>& results, OutputIterator out ) {
                 ApplicationExpr *appExpr = new ApplicationExpr( func.expr->clone() );
                 // sum cost and accumulate actuals
                 std::list<Expression*>& args = appExpr->get_args();
+                std::list<Expression*>& args = appExpr->args;
                 Cost cost = func.cost;
                 const ArgPack* pack = &result;
 …
         template<typename OutputIterator>
         void AlternativeFinder::makeFunctionAlternatives( const Alternative &func,
+        void AlternativeFinder::Finder::makeFunctionAlternatives( const Alternative &func,
                         FunctionType *funcType, const ExplodedArgs &args, OutputIterator out ) {
                 OpenVarSet funcOpenVars;
 …
                 // add all type variables as open variables now so that those not used in the parameter
                 // list are still considered open.
                 funcEnv.add( funcType->get_forall() );
                 if ( targetType && ! targetType->isVoid() && ! funcType->get_returnVals().empty() ) {
+                funcEnv.add( funcType->forall );
+                if ( targetType && ! targetType->isVoid() && ! funcType->returnVals.empty() ) {
                         // attempt to narrow based on expected target type
                         Type * returnType = funcType->get_returnVals().front()->get_type();
+                        Type * returnType = funcType->returnVals.front()->get_type();
                         if ( ! unify( returnType, targetType, funcEnv, funcNeed, funcHave, funcOpenVars,
                                         indexer ) ) {
 …
                 std::size_t genStart = 0;
                 for ( DeclarationWithType* formal : funcType->get_parameters() ) {
+                for ( DeclarationWithType* formal : funcType->parameters ) {
                         ObjectDecl* obj = strict_dynamic_cast< ObjectDecl* >( formal );
                         if ( ! instantiateArgument(
                                         obj->get_type(), obj->get_init(), args, results, genStart, indexer ) )
+                                        obj->type, obj->init, args, results, genStart, indexer ) )
                                 return;
+                }
 …
+        }
         void AlternativeFinder::visit( UntypedExpr *untypedExpr ) {
+        void AlternativeFinder::Finder::postvisit( UntypedExpr *untypedExpr ) {
                 AlternativeFinder funcFinder( indexer, env );
                 funcFinder.findWithAdjustment( untypedExpr->get_function() );
+                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;
                 std::vector< AlternativeFinder > argAlternatives;
                 findSubExprs( untypedExpr->begin_args(), untypedExpr->end_args(),
+                altFinder.findSubExprs( untypedExpr->begin_args(), untypedExpr->end_args(),
                         back_inserter( argAlternatives ) );
                 // take care of possible tuple assignments
                 // if not tuple assignment, assignment is taken care of as a normal function call
                 Tuples::handleTupleAssignment( *this, untypedExpr, argAlternatives );
+                Tuples::handleTupleAssignment( altFinder, untypedExpr, argAlternatives );
                 // find function operators
 …
                 AlternativeFinder funcOpFinder( indexer, env );
                 // it's ok if there aren't any defined function ops
                 funcOpFinder.maybeFind( opExpr);
+                funcOpFinder.maybeFind( opExpr );
                 PRINT(
                         std::cerr << "known function ops:" << std::endl;
 …
                         argExpansions.emplace_back();
                         auto& argE = argExpansions.back();
                         argE.reserve( arg.alternatives.size() );
+                        // argE.reserve( arg.alternatives.size() );
                         for ( const Alternative& actual : arg ) {
 …
                 AltList candidates;
                 SemanticError errors;
+                SemanticErrorException errors;
                 for ( AltList::iterator func = funcFinder.alternatives.begin(); func != funcFinder.alternatives.end(); ++func ) {
                         try {
 …
+                                )
                                 // check if the type is pointer to function
                                 if ( PointerType *pointer = dynamic_cast< PointerType* >( func->expr->get_result()->stripReferences() ) ) {
                                         if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->get_base() ) ) {
+                                if ( PointerType *pointer = dynamic_cast< PointerType* >( func->expr->result->stripReferences() ) ) {
+                                        if ( FunctionType *function = dynamic_cast< FunctionType* >( pointer->base ) ) {
                                                 Alternative newFunc( *func );
                                                 referenceToRvalueConversion( newFunc.expr );
+                                                referenceToRvalueConversion( newFunc.expr, newFunc.cost );
                                                 makeFunctionAlternatives( newFunc, function, argExpansions,
                                                         std::back_inserter( candidates ) );
+                                        }
+                                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( func->expr->get_result()->stripReferences() ) ) { // handle ftype (e.g. *? on function pointer)
+                                        EqvClass eqvClass;
+                                        if ( func->env.lookup( typeInst->get_name(), eqvClass ) && eqvClass.type ) {
+                                                if ( FunctionType *function = dynamic_cast< FunctionType* >( eqvClass.type ) ) {
+                                } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( func->expr->result->stripReferences() ) ) { // handle ftype (e.g. *? on function pointer)
+                                        if ( const EqvClass *eqvClass = func->env.lookup( typeInst->name ) ) {
+                                                if ( FunctionType *function = dynamic_cast< FunctionType* >( eqvClass->type ) ) {
                                                         Alternative newFunc( *func );
                                                         referenceToRvalueConversion( newFunc.expr );
+                                                        referenceToRvalueConversion( newFunc.expr, newFunc.cost );
                                                         makeFunctionAlternatives( newFunc, function, argExpansions,
                                                                 std::back_inserter( candidates ) );
 …
                                         } // if
+                                }
                         } catch ( SemanticError &e ) {
+                        } catch ( SemanticErrorException &e ) {
                                 errors.append( e );
+                        }
 …
                                         // check if type is a pointer to function
                                         if ( PointerType* pointer = dynamic_cast<PointerType*>(
                                                         funcOp->expr->get_result()->stripReferences() ) ) {
+                                                        funcOp->expr->result->stripReferences() ) ) {
                                                 if ( FunctionType* function =
                                                                 dynamic_cast<FunctionType*>( pointer->get_base() ) ) {
+                                                                dynamic_cast<FunctionType*>( pointer->base ) ) {
                                                         Alternative newFunc( *funcOp );
                                                         referenceToRvalueConversion( newFunc.expr );
+                                                        referenceToRvalueConversion( newFunc.expr, newFunc.cost );
                                                         makeFunctionAlternatives( newFunc, function, argExpansions,
                                                                 std::back_inserter( candidates ) );
+                                                }
+                                        }
                                 } catch ( SemanticError &e ) {
+                                } catch ( SemanticErrorException &e ) {
                                         errors.append( e );
+                                }
 …
                         PRINT(
                                 ApplicationExpr *appExpr = strict_dynamic_cast< ApplicationExpr* >( withFunc.expr );
                                 PointerType *pointer = strict_dynamic_cast< PointerType* >( appExpr->get_function()->get_result() );
                                 FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->get_base() );
                                 std::cerr << "Case +++++++++++++ " << appExpr->get_function() << std::endl;
+                                PointerType *pointer = strict_dynamic_cast< PointerType* >( appExpr->function->result );
+                                FunctionType *function = strict_dynamic_cast< FunctionType* >( pointer->base );
+                                std::cerr << "Case +++++++++++++ " << appExpr->function << std::endl;
                                 std::cerr << "formals are:" << std::endl;
                                 printAll( function->get_parameters(), std::cerr, 8 );
+                                printAll( function->parameters, std::cerr, 8 );
                                 std::cerr << "actuals are:" << std::endl;
                                 printAll( appExpr->get_args(), std::cerr, 8 );
+                                printAll( appExpr->args, std::cerr, 8 );
                                 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;
+                        )
 …
                         // fix this issue in a more robust way.
                         targetType = nullptr;
                         visit( untypedExpr );
+                        postvisit( untypedExpr );
+                }
+        }
 …
         bool isLvalue( Expression *expr ) {
                 // xxx - recurse into tuples?
                 return expr->result && ( expr->get_result()->get_lvalue() || dynamic_cast< ReferenceType * >( expr->get_result() ) );
+        }
         void AlternativeFinder::visit( AddressExpr *addressExpr ) {
+                return expr->result && ( expr->result->get_lvalue() || dynamic_cast< ReferenceType * >( expr->result ) );
+        }
+        void AlternativeFinder::Finder::postvisit( AddressExpr *addressExpr ) {
                 AlternativeFinder finder( indexer, env );
                 finder.find( addressExpr->get_arg() );
 …
+        }
         void AlternativeFinder::visit( LabelAddressExpr * expr ) {
+        void AlternativeFinder::Finder::postvisit( LabelAddressExpr * expr ) {
                 alternatives.push_back( Alternative{ expr->clone(), env, Cost::zero } );
+        }
         Expression * restructureCast( Expression * argExpr, Type * toType ) {
+        Expression * restructureCast( Expression * argExpr, Type * toType, bool isGenerated ) {
                 if ( argExpr->get_result()->size() > 1 && ! toType->isVoid() && ! dynamic_cast<ReferenceType *>( toType ) ) {
                         // Argument expression is a tuple and the target type is not void and not a reference type.
 …
                                 // cast each component
                                 TupleIndexExpr * idx = new TupleIndexExpr( argExpr->clone(), i );
                                 componentExprs.push_back( restructureCast( idx, toType->getComponent( i ) ) );
+                                componentExprs.push_back( restructureCast( idx, toType->getComponent( i ), isGenerated ) );
+                        }
                         delete argExpr;
 …
                 } else {
                         // handle normally
+                        return new CastExpr( argExpr, toType->clone() );
+                }
+        }
+        void AlternativeFinder::visit( CastExpr *castExpr ) {
+                        CastExpr * ret = new CastExpr( argExpr, toType->clone() );
+                        ret->isGenerated = isGenerated;
+                        return ret;
+                }
+        }
+        void AlternativeFinder::Finder::postvisit( CastExpr *castExpr ) {
                 Type *& toType = castExpr->get_result();
                 assert( toType );
 …
                 AlternativeFinder finder( indexer, env );
                 finder.targetType = toType;
                 finder.findWithAdjustment( castExpr->get_arg() );
+                finder.findWithAdjustment( castExpr->arg );
                 AltList candidates;
 …
                         OpenVarSet openVars;
+                        alt.env.extractOpenVars( openVars );
                         // It's possible that a cast can throw away some values in a multiply-valued expression.  (An example is a
                         // cast-to-void, which casts from one value to zero.)  Figure out the prefix of the subexpression results
                         // that are cast directly.  The candidate is invalid if it has fewer results than there are types to cast
                         // to.
                         int discardedValues = alt.expr->get_result()->size() - castExpr->get_result()->size();
+                        int discardedValues = alt.expr->result->size() - castExpr->result->size();
                         if ( discardedValues < 0 ) continue;
                         // xxx - may need to go into tuple types and extract relevant types and use unifyList. Note that currently, this does not
                         // allow casting a tuple to an atomic type (e.g. (int)([1, 2, 3]))
                         // unification run for side-effects
                         unify( castExpr->get_result(), alt.expr->get_result(), alt.env, needAssertions,
+                        unify( castExpr->result, alt.expr->result, alt.env, needAssertions,
                                 haveAssertions, openVars, indexer );
                         Cost thisCost = castCost( alt.expr->get_result(), castExpr->get_result(), indexer,
+                        Cost thisCost = castCost( alt.expr->result, castExpr->result, indexer,
                                 alt.env );
                         PRINT(
 …
                                 // count one safe conversion for each value that is thrown away
                                 thisCost.incSafe( discardedValues );
                                 Alternative newAlt( restructureCast( alt.expr->clone(), toType ), alt.env,
+                                Alternative newAlt( restructureCast( alt.expr->clone(), toType, castExpr->isGenerated ), alt.env,
                                         alt.cost, thisCost );
                                 inferParameters( needAssertions, haveAssertions, newAlt, openVars,
 …
+        }
         void AlternativeFinder::visit( VirtualCastExpr * castExpr ) {
+        void AlternativeFinder::Finder::postvisit( VirtualCastExpr * castExpr ) {
                 assertf( castExpr->get_result(), "Implicate virtual cast targets not yet supported." );
                 AlternativeFinder finder( indexer, env );
 …
+        }
+        void AlternativeFinder::visit( UntypedMemberExpr *memberExpr ) {
+        namespace {
+                /// Gets name from untyped member expression (member must be NameExpr)
+                const std::string& get_member_name( UntypedMemberExpr *memberExpr ) {
+                        NameExpr * nameExpr = dynamic_cast< NameExpr * >( memberExpr->get_member() );
+                        assert( nameExpr );
+                        return nameExpr->get_name();
+                }
+        }
+        void AlternativeFinder::Finder::postvisit( UntypedMemberExpr *memberExpr ) {
                 AlternativeFinder funcFinder( indexer, env );
                 funcFinder.findWithAdjustment( memberExpr->get_aggregate() );
                 for ( AltList::const_iterator agg = funcFinder.alternatives.begin(); agg != funcFinder.alternatives.end(); ++agg ) {
                         // it's okay for the aggregate expression to have reference type -- cast it to the base type to treat the aggregate as the referenced value
+                        std::unique_ptr<Expression> aggrExpr( agg->expr->clone() );
+                        Type * aggrType = aggrExpr->get_result();
+                        if ( dynamic_cast< ReferenceType * >( aggrType ) ) {
+                                aggrType = aggrType->stripReferences();
+                                aggrExpr.reset( new CastExpr( aggrExpr.release(), aggrType->clone() ) );
+                        }
+                        Cost cost = agg->cost;
+                        Expression * aggrExpr = agg->expr->clone();
+                        referenceToRvalueConversion( aggrExpr, cost );
+                        std::unique_ptr<Expression> guard( aggrExpr );
                         // find member of the given type
                         if ( StructInstType *structInst = dynamic_cast< StructInstType* >( aggrExpr->get_result() ) ) {
                                 addAggMembers( structInst, aggrExpr.get(), agg->cost, agg->env, memberExpr->get_member() );
+                                addAggMembers( structInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
                         } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( aggrExpr->get_result() ) ) {
                                 addAggMembers( unionInst, aggrExpr.get(), agg->cost, agg->env, memberExpr->get_member() );
+                                addAggMembers( unionInst, aggrExpr, cost, agg->env, get_member_name(memberExpr) );
                         } else if ( TupleType * tupleType = dynamic_cast< TupleType * >( aggrExpr->get_result() ) ) {
                                 addTupleMembers( tupleType, aggrExpr.get(), agg->cost, agg->env, memberExpr->get_member() );
+                                addTupleMembers( tupleType, aggrExpr, cost, agg->env, memberExpr->get_member() );
                         } // if
                 } // for
+        }
         void AlternativeFinder::visit( MemberExpr *memberExpr ) {
+        void AlternativeFinder::Finder::postvisit( MemberExpr *memberExpr ) {
                 alternatives.push_back( Alternative( memberExpr->clone(), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( NameExpr *nameExpr ) {
+        void AlternativeFinder::Finder::postvisit( NameExpr *nameExpr ) {
                 std::list< SymTab::Indexer::IdData > declList;
                 indexer.lookupId( nameExpr->get_name(), declList );
                 PRINT( std::cerr << "nameExpr is " << nameExpr->get_name() << std::endl; )
+                indexer.lookupId( nameExpr->name, declList );
+                PRINT( std::cerr << "nameExpr is " << nameExpr->name << std::endl; )
                 for ( auto & data : declList ) {
+                        Expression * newExpr = data.combine();
+                        // xxx - add in extra cost for with-statement exprs?
+                        alternatives.push_back( Alternative( newExpr, env, Cost::zero ) );
+                        Cost cost = Cost::zero;
+                        Expression * newExpr = data.combine( cost );
+                        // 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 );
                         PRINT(
                                 std::cerr << "decl is ";
 …
                                 std::cerr << std::endl;
+                        )
+                        renameTypes( alternatives.back().expr );
+                        addAnonConversions( alternatives.back() ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
+                        renameTypes( newAlt.expr );
+                        addAnonConversions( newAlt ); // add anonymous member interpretations whenever an aggregate value type is seen as a name expression.
+                        alternatives.push_back( std::move(newAlt) );
                 } // for
+        }
         void AlternativeFinder::visit( VariableExpr *variableExpr ) {
+        void AlternativeFinder::Finder::postvisit( VariableExpr *variableExpr ) {
                 // 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->get_var() ), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( ConstantExpr *constantExpr ) {
+                alternatives.push_back( Alternative( new VariableExpr( variableExpr->var ), env, Cost::zero ) );
+        }
+        void AlternativeFinder::Finder::postvisit( ConstantExpr *constantExpr ) {
                 alternatives.push_back( Alternative( constantExpr->clone(), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( SizeofExpr *sizeofExpr ) {
+        void AlternativeFinder::Finder::postvisit( SizeofExpr *sizeofExpr ) {
                 if ( sizeofExpr->get_isType() ) {
                         Type * newType = sizeofExpr->get_type()->clone();
 …
                         findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) );
                         if ( winners.size() != 1 ) {
                                 throw SemanticError( "Ambiguous expression in sizeof operand: ", sizeofExpr->get_expr() );
+                                SemanticError( sizeofExpr->get_expr(), "Ambiguous expression in sizeof operand: " );
                         } // if
                         // return the lowest cost alternative for the argument
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr );
+                        referenceToRvalueConversion( choice.expr, choice.cost );
                         alternatives.push_back( Alternative( new SizeofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
                 } // if
+        }
         void AlternativeFinder::visit( AlignofExpr *alignofExpr ) {
+        void AlternativeFinder::Finder::postvisit( AlignofExpr *alignofExpr ) {
                 if ( alignofExpr->get_isType() ) {
                         Type * newType = alignofExpr->get_type()->clone();
 …
                         findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) );
                         if ( winners.size() != 1 ) {
                                 throw SemanticError( "Ambiguous expression in alignof operand: ", alignofExpr->get_expr() );
+                                SemanticError( alignofExpr->get_expr(), "Ambiguous expression in alignof operand: " );
                         } // if
                         // return the lowest cost alternative for the argument
                         Alternative &choice = winners.front();
                         referenceToRvalueConversion( choice.expr );
+                        referenceToRvalueConversion( choice.expr, choice.cost );
                         alternatives.push_back( Alternative( new AlignofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
                 } // if
 …
         template< typename StructOrUnionType >
         void AlternativeFinder::addOffsetof( StructOrUnionType *aggInst, const std::string &name ) {
+        void AlternativeFinder::Finder::addOffsetof( StructOrUnionType *aggInst, const std::string &name ) {
                 std::list< Declaration* > members;
                 aggInst->lookup( name, members );
 …
+        }
         void AlternativeFinder::visit( UntypedOffsetofExpr *offsetofExpr ) {
+        void AlternativeFinder::Finder::postvisit( UntypedOffsetofExpr *offsetofExpr ) {
                 AlternativeFinder funcFinder( indexer, env );
                 // xxx - resolveTypeof?
                 if ( StructInstType *structInst = dynamic_cast< StructInstType* >( offsetofExpr->get_type() ) ) {
                         addOffsetof( structInst, offsetofExpr->get_member() );
+                        addOffsetof( structInst, offsetofExpr->member );
                 } else if ( UnionInstType *unionInst = dynamic_cast< UnionInstType* >( offsetofExpr->get_type() ) ) {
                         addOffsetof( unionInst, offsetofExpr->get_member() );
+                }
+        }
         void AlternativeFinder::visit( OffsetofExpr *offsetofExpr ) {
+                        addOffsetof( unionInst, offsetofExpr->member );
+                }
+        }
+        void AlternativeFinder::Finder::postvisit( OffsetofExpr *offsetofExpr ) {
                 alternatives.push_back( Alternative( offsetofExpr->clone(), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( OffsetPackExpr *offsetPackExpr ) {
+        void AlternativeFinder::Finder::postvisit( OffsetPackExpr *offsetPackExpr ) {
                 alternatives.push_back( Alternative( offsetPackExpr->clone(), env, Cost::zero ) );
+        }
 …
                         AltList & alternatives = finder.get_alternatives();
                         if ( typesCompatibleIgnoreQualifiers( argType, function->get_parameters().front()->get_type(), indexer, env ) ) {
+                                alternatives.push_back( Alternative( new AttrExpr( data.combine(), argType->clone() ), env, Cost::zero ) );
+                                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();
 …
+        }
         void AlternativeFinder::visit( AttrExpr *attrExpr ) {
+        void AlternativeFinder::Finder::postvisit( AttrExpr *attrExpr ) {
                 // assume no 'pointer-to-attribute'
                 NameExpr *nameExpr = dynamic_cast< NameExpr* >( attrExpr->get_attr() );
 …
                                         if ( function->get_parameters().size() == 1 ) {
                                                 if ( attrExpr->get_isType() ) {
                                                         resolveAttr( data, function, attrExpr->get_type(), env, *this );
+                                                        resolveAttr( data, function, attrExpr->get_type(), env, altFinder);
                                                 } else {
                                                         AlternativeFinder finder( indexer, env );
 …
                                                         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, *this );
+                                                                        resolveAttr(data, function, choice->expr->get_result(), choice->env, altFinder );
                                                                 } // fi
                                                         } // for
 …
                 } else {
                         for ( auto & data : attrList ) {
+                                alternatives.push_back( Alternative( data.combine(), env, Cost::zero ) );
+                                Cost cost = Cost::zero;
+                                Expression * newExpr = data.combine( cost );
+                                alternatives.push_back( Alternative( newExpr, env, Cost::zero, cost ) );
                                 renameTypes( alternatives.back().expr );
                         } // for
 …
+        }
         void AlternativeFinder::visit( LogicalExpr *logicalExpr ) {
+        void AlternativeFinder::Finder::postvisit( LogicalExpr *logicalExpr ) {
                 AlternativeFinder firstFinder( indexer, env );
                 firstFinder.findWithAdjustment( logicalExpr->get_arg1() );
+                for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
+                        AlternativeFinder secondFinder( indexer, first->env );
+                        secondFinder.findWithAdjustment( logicalExpr->get_arg2() );
+                        for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                LogicalExpr *newExpr = new LogicalExpr( first->expr->clone(), second->expr->clone(), logicalExpr->get_isAnd() );
+                                alternatives.push_back( Alternative( newExpr, second->env, first->cost + second->cost ) );
+                        }
+                }
+        }
+        void AlternativeFinder::visit( ConditionalExpr *conditionalExpr ) {
+                if ( firstFinder.alternatives.empty() ) return;
+                AlternativeFinder secondFinder( indexer, env );
+                secondFinder.findWithAdjustment( logicalExpr->get_arg2() );
+                if ( secondFinder.alternatives.empty() ) return;
+                for ( const Alternative & first : firstFinder.alternatives ) {
+                        for ( const Alternative & second : secondFinder.alternatives ) {
+                                TypeEnvironment compositeEnv;
+                                compositeEnv.simpleCombine( 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 ) );
+                        }
+                }
+        }
+        void AlternativeFinder::Finder::postvisit( ConditionalExpr *conditionalExpr ) {
                 // find alternatives for condition
                 AlternativeFinder firstFinder( indexer, env );
+                firstFinder.findWithAdjustment( conditionalExpr->get_arg1() );
+                for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
+                        // find alternatives for true expression
+                        AlternativeFinder secondFinder( indexer, first->env );
+                        secondFinder.findWithAdjustment( conditionalExpr->get_arg2() );
+                        for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                                // find alterantives for false expression
+                                AlternativeFinder thirdFinder( indexer, second->env );
+                                thirdFinder.findWithAdjustment( conditionalExpr->get_arg3() );
+                                for ( AltList::const_iterator third = thirdFinder.alternatives.begin(); third != thirdFinder.alternatives.end(); ++third ) {
+                firstFinder.findWithAdjustment( conditionalExpr->arg1 );
+                if ( firstFinder.alternatives.empty() ) return;
+                // find alternatives for true expression
+                AlternativeFinder secondFinder( indexer, env );
+                secondFinder.findWithAdjustment( conditionalExpr->arg2 );
+                if ( secondFinder.alternatives.empty() ) return;
+                // find alterantives for false expression
+                AlternativeFinder thirdFinder( indexer, env );
+                thirdFinder.findWithAdjustment( conditionalExpr->arg3 );
+                if ( thirdFinder.alternatives.empty() ) return;
+                for ( const Alternative & first : firstFinder.alternatives ) {
+                        for ( const Alternative & second : secondFinder.alternatives ) {
+                                for ( const Alternative & third : thirdFinder.alternatives ) {
+                                        TypeEnvironment compositeEnv;
+                                        compositeEnv.simpleCombine( first.env );
+                                        compositeEnv.simpleCombine( second.env );
+                                        compositeEnv.simpleCombine( third.env );
                                         // unify true and false types, then infer parameters to produce new alternatives
                                         OpenVarSet openVars;
                                         AssertionSet needAssertions, haveAssertions;
                                         Alternative newAlt( 0, third->env, first->cost + second->cost + third->cost );
+                                        Alternative newAlt( 0, compositeEnv, first.cost + second.cost + third.cost );
                                         Type* commonType = nullptr;
                                         if ( unify( second->expr->get_result(), third->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
                                                 ConditionalExpr *newExpr = new ConditionalExpr( first->expr->clone(), second->expr->clone(), third->expr->clone() );
                                                 newExpr->set_result( commonType ? commonType : second->expr->get_result()->clone() );
+                                        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() );
+                                                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 );
 …
+        }
         void AlternativeFinder::visit( CommaExpr *commaExpr ) {
+        void AlternativeFinder::Finder::postvisit( CommaExpr *commaExpr ) {
                 TypeEnvironment newEnv( env );
                 Expression *newFirstArg = resolveInVoidContext( commaExpr->get_arg1(), indexer, newEnv );
                 AlternativeFinder secondFinder( indexer, newEnv );
                 secondFinder.findWithAdjustment( commaExpr->get_arg2() );
                 for ( AltList::const_iterator alt = secondFinder.alternatives.begin(); alt != secondFinder.alternatives.end(); ++alt ) {
                         alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt->expr->clone() ), alt->env, alt->cost ) );
+                for ( const Alternative & alt : secondFinder.alternatives ) {
+                        alternatives.push_back( Alternative( new CommaExpr( newFirstArg->clone(), alt.expr->clone() ), alt.env, alt.cost ) );
                 } // for
                 delete newFirstArg;
+        }
         void AlternativeFinder::visit( RangeExpr * rangeExpr ) {
+        void AlternativeFinder::Finder::postvisit( RangeExpr * rangeExpr ) {
                 // resolve low and high, accept alternatives whose low and high types unify
                 AlternativeFinder firstFinder( indexer, env );
+                firstFinder.findWithAdjustment( rangeExpr->get_low() );
+                for ( AltList::const_iterator first = firstFinder.alternatives.begin(); first != firstFinder.alternatives.end(); ++first ) {
+                        AlternativeFinder secondFinder( indexer, first->env );
+                        secondFinder.findWithAdjustment( rangeExpr->get_high() );
+                        for ( AltList::const_iterator second = secondFinder.alternatives.begin(); second != secondFinder.alternatives.end(); ++second ) {
+                firstFinder.findWithAdjustment( rangeExpr->low );
+                if ( firstFinder.alternatives.empty() ) return;
+                AlternativeFinder secondFinder( indexer, env );
+                secondFinder.findWithAdjustment( rangeExpr->high );
+                if ( secondFinder.alternatives.empty() ) return;
+                for ( const Alternative & first : firstFinder.alternatives ) {
+                        for ( const Alternative & second : secondFinder.alternatives ) {
+                                TypeEnvironment compositeEnv;
+                                compositeEnv.simpleCombine( first.env );
+                                compositeEnv.simpleCombine( second.env );
                                 OpenVarSet openVars;
                                 AssertionSet needAssertions, haveAssertions;
                                 Alternative newAlt( 0, second->env, first->cost + second->cost );
+                                Alternative newAlt( 0, compositeEnv, first.cost + second.cost );
                                 Type* commonType = nullptr;
                                 if ( unify( first->expr->get_result(), second->expr->get_result(), newAlt.env, needAssertions, haveAssertions, openVars, indexer, commonType ) ) {
                                         RangeExpr *newExpr = new RangeExpr( first->expr->clone(), second->expr->clone() );
                                         newExpr->set_result( commonType ? commonType : first->expr->get_result()->clone() );
+                                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() );
+                                        newExpr->result = commonType ? commonType : first.expr->result->clone();
                                         newAlt.expr = newExpr;
                                         inferParameters( needAssertions, haveAssertions, newAlt, openVars, back_inserter( alternatives ) );
 …
+        }
         void AlternativeFinder::visit( UntypedTupleExpr *tupleExpr ) {
+        void AlternativeFinder::Finder::postvisit( UntypedTupleExpr *tupleExpr ) {
                 std::vector< AlternativeFinder > subExprAlternatives;
                 findSubExprs( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end(),
+                altFinder.findSubExprs( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end(),
                         back_inserter( subExprAlternatives ) );
                 std::vector< AltList > possibilities;
 …
+        }
         void AlternativeFinder::visit( TupleExpr *tupleExpr ) {
+        void AlternativeFinder::Finder::postvisit( TupleExpr *tupleExpr ) {
                 alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( ImplicitCopyCtorExpr * impCpCtorExpr ) {
+        void AlternativeFinder::Finder::postvisit( ImplicitCopyCtorExpr * impCpCtorExpr ) {
                 alternatives.push_back( Alternative( impCpCtorExpr->clone(), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( ConstructorExpr * ctorExpr ) {
+        void AlternativeFinder::Finder::postvisit( ConstructorExpr * ctorExpr ) {
                 AlternativeFinder finder( indexer, env );
                 // don't prune here, since it's guaranteed all alternatives will have the same type
 …
+        }
         void AlternativeFinder::visit( TupleIndexExpr *tupleExpr ) {
+        void AlternativeFinder::Finder::postvisit( TupleIndexExpr *tupleExpr ) {
                 alternatives.push_back( Alternative( tupleExpr->clone(), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( TupleAssignExpr *tupleAssignExpr ) {
+        void AlternativeFinder::Finder::postvisit( TupleAssignExpr *tupleAssignExpr ) {
                 alternatives.push_back( Alternative( tupleAssignExpr->clone(), env, Cost::zero ) );
+        }
         void AlternativeFinder::visit( UniqueExpr *unqExpr ) {
+        void AlternativeFinder::Finder::postvisit( UniqueExpr *unqExpr ) {
                 AlternativeFinder finder( indexer, env );
                 finder.findWithAdjustment( unqExpr->get_expr() );
 …
+        }
         void AlternativeFinder::visit( StmtExpr *stmtExpr ) {
+        void AlternativeFinder::Finder::postvisit( StmtExpr *stmtExpr ) {
                 StmtExpr * newStmtExpr = stmtExpr->clone();
                 ResolvExpr::resolveStmtExpr( newStmtExpr, indexer );
 …
+        }
         void AlternativeFinder::visit( UntypedInitExpr *initExpr ) {
+        void AlternativeFinder::Finder::postvisit( UntypedInitExpr *initExpr ) {
                 // handle each option like a cast
                 AltList candidates;
+                PRINT( std::cerr << "untyped init expr: " << initExpr << std::endl; )
+                PRINT(
+                        std::cerr << "untyped init expr: " << initExpr << std::endl;
+                )
                 // O(N^2) checks of d-types with e-types
                 for ( InitAlternative & initAlt : initExpr->get_initAlts() ) {
 …
                         AlternativeFinder finder( indexer, env );
                         finder.targetType = toType;
                         finder.findWithAdjustment( initExpr->get_expr() );
+                        finder.findWithAdjustment( initExpr->expr );
                         for ( Alternative & alt : finder.get_alternatives() ) {
                                 TypeEnvironment newEnv( alt.env );
                                 AssertionSet needAssertions, haveAssertions;
                                 OpenVarSet openVars;  // find things in env that don't have a "representative type" and claim those are open vars?
+                                PRINT( std::cerr << "  @ " << toType << " " << initAlt.designation << std::endl; )
+                                PRINT(
+                                        std::cerr << "  @ " << toType << " " << initAlt.designation << std::endl;
+                                )
                                 // It's possible that a cast can throw away some values in a multiply-valued expression.  (An example is a
                                 // cast-to-void, which casts from one value to zero.)  Figure out the prefix of the subexpression results
                                 // that are cast directly.  The candidate is invalid if it has fewer results than there are types to cast
                                 // to.
                                 int discardedValues = alt.expr->get_result()->size() - toType->size();
+                                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]))
                                 // unification run for side-effects
                                 unify( toType, alt.expr->get_result(), newEnv, needAssertions, haveAssertions, openVars, indexer ); // xxx - do some inspecting on this line... why isn't result bound to initAlt.type??
                                 Cost thisCost = castCost( alt.expr->get_result(), toType, indexer, newEnv );
+                                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 );
                                 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 ), initAlt.designation->clone() ), newEnv, alt.cost, thisCost );
+                                        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 ) );
+                                }
 …
                 findMinCost( minArgCost.begin(), minArgCost.end(), std::back_inserter( alternatives ) );
+        }
+        void AlternativeFinder::Finder::postvisit( InitExpr * ) {
+                assertf( false, "AlternativeFinder should never see a resolved InitExpr." );
+        }
+        void AlternativeFinder::Finder::postvisit( DeletedExpr * ) {
+                assertf( false, "AlternativeFinder should never see a DeletedExpr." );
+        }
+        void AlternativeFinder::Finder::postvisit( GenericExpr * ) {
+                assertf( false, "_Generic is not yet supported." );
+        }
 } // namespace ResolvExpr

src/ResolvExpr/AlternativeFinder.h

-              rf9feab8
+              r90152a4
         using ExplodedArgs = std::vector< std::vector< ExplodedActual > >;
         class AlternativeFinder : public Visitor {
+        class AlternativeFinder {
           public:
                 AlternativeFinder( const SymTab::Indexer &indexer, const TypeEnvironment &env );
 …
                 void findSubExprs( InputIterator begin, InputIterator end, OutputIterator out );
           private:
+                virtual void visit( ApplicationExpr *applicationExpr );
+                virtual void visit( UntypedExpr *untypedExpr );
+                virtual void visit( AddressExpr *addressExpr );
+                virtual void visit( LabelAddressExpr *labelExpr );
+                virtual void visit( CastExpr *castExpr );
+                virtual void visit( VirtualCastExpr *castExpr );
+                virtual void visit( UntypedMemberExpr *memberExpr );
+                virtual void visit( MemberExpr *memberExpr );
+                virtual void visit( NameExpr *variableExpr );
+                virtual void visit( VariableExpr *variableExpr );
+                virtual void visit( ConstantExpr *constantExpr );
+                virtual void visit( SizeofExpr *sizeofExpr );
+                virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( UntypedOffsetofExpr *offsetofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
+                virtual void visit( OffsetPackExpr *offsetPackExpr );
+                virtual void visit( AttrExpr *attrExpr );
+                virtual void visit( LogicalExpr *logicalExpr );
+                virtual void visit( ConditionalExpr *conditionalExpr );
+                virtual void visit( CommaExpr *commaExpr );
+                virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
+                virtual void visit( ConstructorExpr * ctorExpr );
+                virtual void visit( RangeExpr * rangeExpr );
+                virtual void visit( UntypedTupleExpr *tupleExpr );
+                virtual void visit( TupleExpr *tupleExpr );
+                virtual void visit( TupleIndexExpr *tupleExpr );
+                virtual void visit( TupleAssignExpr *tupleExpr );
+                virtual void visit( UniqueExpr *unqExpr );
+                virtual void visit( StmtExpr *stmtExpr );
+                virtual void visit( UntypedInitExpr *initExpr );
+                /// Adds alternatives for anonymous members
+                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, Expression * member );
+                /// 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 );
+                /// 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 );
+                /// Takes a final result and checks if its assertions can be satisfied
+                template<typename OutputIterator>
+                void validateFunctionAlternative( const Alternative &func, ArgPack& result, const std::vector<ArgPack>& results, OutputIterator out );
+                /// 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
+                template< typename OutputIterator >
+                void inferParameters( const AssertionSet &need, AssertionSet &have, const Alternative &newAlt, OpenVarSet &openVars, OutputIterator out );
+                struct Finder;
                 const SymTab::Indexer &indexer;
                 AltList alternatives;
 …
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt = 0 );
+        /// Adds type variables to the open variable set and marks their assertions
+        void makeUnifiableVars( Type *type, OpenVarSet &unifiableVars, AssertionSet &needAssertions );
         template< typename InputIterator >
         void simpleCombineEnvironments( InputIterator begin, InputIterator end, TypeEnvironment &result ) {

src/ResolvExpr/CastCost.cc

-              rf9feab8
+              r90152a4
 namespace ResolvExpr {
         class CastCost : public ConversionCost {
+        struct CastCost : public ConversionCost {
           public:
                 CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+                CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
+                virtual void visit( BasicType *basicType );
+                virtual void visit( PointerType *pointerType );
+                using ConversionCost::previsit;
+                using ConversionCost::postvisit;
+                void postvisit( BasicType * basicType );
+                void postvisit( PointerType * pointerType );
         };
         Cost castCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
+                        EqvClass eqvClass;
+                        NamedTypeDecl *namedType;
+                        if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
+                                if ( eqvClass.type ) {
+                                        return castCost( src, eqvClass.type, indexer, env );
+                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+                                if ( eqvClass->type ) {
+                                        return castCost( src, eqvClass->type, indexer, env );
                                 } else {
                                         return Cost::infinity;
+                                }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
+                        } else if ( NamedTypeDecl *namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) {
                                 // all typedefs should be gone by this point
                                 TypeDecl *type = strict_dynamic_cast< TypeDecl* >( namedType );
                                 if ( type->get_base() ) {
                                         return castCost( src, type->get_base(), indexer, env ) + Cost::safe;
+                                if ( type->base ) {
+                                        return castCost( src, type->base, indexer, env ) + Cost::safe;
                                 } // if
                         } // if
 …
                 } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
                         return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const TypeEnvironment & env, const SymTab::Indexer & indexer) {
+                        return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const SymTab::Indexer & indexer, const TypeEnvironment & env ) {
                                 return ptrsCastable( t1, t2, env, indexer );
                         });
                 } else {
                         CastCost converter( dest, indexer, env );
+                        PassVisitor<CastCost> converter( dest, indexer, env, castCost );
                         src->accept( converter );
                         if ( converter.get_cost() == Cost::infinity ) {
+                        if ( converter.pass.get_cost() == Cost::infinity ) {
                                 return Cost::infinity;
                         } else {
                                 // xxx - why are we adding cost 0 here?
                                 return converter.get_cost() + Cost::zero;
+                                return converter.pass.get_cost() + Cost::zero;
                         } // if
                 } // if
+        }
         CastCost::CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env )
                 : ConversionCost( dest, indexer, env ) {
+        CastCost::CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+                : ConversionCost( dest, indexer, env, costFunc ) {
+        }
         void CastCost::visit( BasicType *basicType ) {
+        void CastCost::postvisit( BasicType *basicType ) {
                 PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
                 if ( destAsPointer && basicType->isInteger() ) {
 …
+        }
         void CastCost::visit( PointerType *pointerType ) {
+        void CastCost::postvisit( PointerType *pointerType ) {
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
+                        if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
                                 cost = Cost::safe;
                         } else {
                                 TypeEnvironment newEnv( env );
                                 newEnv.add( pointerType->get_forall() );
                                 newEnv.add( pointerType->get_base()->get_forall() );
                                 int castResult = ptrsCastable( pointerType->get_base(), destAsPtr->get_base(), newEnv, indexer );
+                                newEnv.add( pointerType->forall );
+                                newEnv.add( pointerType->base->forall );
+                                int castResult = ptrsCastable( pointerType->base, destAsPtr->base, newEnv, indexer );
                                 if ( castResult > 0 ) {
                                         cost = Cost::safe;

src/ResolvExpr/CommonType.cc

-              rf9feab8
+              r90152a4
 #include <utility>                       // for pair
+#include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for OpenVarSet, AssertionSet
 #include "SymTab/Indexer.h"              // for Indexer
 …
 #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
 // #define DEBUG
+#ifdef DEBUG
+#define PRINT(x) x
+#else
+#define PRINT(x)
+#endif
 namespace ResolvExpr {
+        class CommonType : public Visitor {
+          public:
+        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; }
+                void previsit( 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 );
           private:
-                virtual void visit( VoidType *voidType );
-                virtual void visit( BasicType *basicType );
-                virtual void visit( PointerType *pointerType );
-                virtual void visit( ArrayType *arrayType );
-                virtual void visit( ReferenceType *refType );
-                virtual void visit( FunctionType *functionType );
-                virtual void visit( StructInstType *aggregateUseType );
-                virtual void visit( UnionInstType *aggregateUseType );
-                virtual void visit( EnumInstType *aggregateUseType );
-                virtual void visit( TraitInstType *aggregateUseType );
-                virtual void visit( TypeInstType *aggregateUseType );
-                virtual void visit( TupleType *tupleType );
-                virtual void visit( VarArgsType *varArgsType );
-                virtual void visit( ZeroType *zeroType );
-                virtual void visit( OneType *oneType );
                 template< typename Pointer > void getCommonWithVoidPointer( Pointer* voidPointer, Pointer* otherPointer );
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
 …
                 // need unify to bind type variables
                 if ( unify( t1, t2, env, have, need, newOpen, indexer, common ) ) {
+                        // std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                        PRINT(
+                                std::cerr << "unify success: " << widenFirst << " " << widenSecond << std::endl;
+                        )
                         if ( (widenFirst || t2->get_qualifiers() <= t1->get_qualifiers()) && (widenSecond || t1->get_qualifiers() <= t2->get_qualifiers()) ) {
+                                // std::cerr << "widen okay" << std::endl;
+                                PRINT(
+                                        std::cerr << "widen okay" << std::endl;
+                                )
                                 common->get_qualifiers() |= t1->get_qualifiers();
                                 common->get_qualifiers() |= t2->get_qualifiers();
 …
+                        }
+                }
+                // std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+                PRINT(
+                        std::cerr << "exact unify failed: " << t1 << " " << t2 << std::endl;
+                )
                 return nullptr;
+        }
         Type *commonType( Type *type1, Type *type2, bool widenFirst, bool widenSecond, const SymTab::Indexer &indexer, TypeEnvironment &env, const OpenVarSet &openVars ) {
                 CommonType visitor( type2, widenFirst, widenSecond, indexer, env, openVars );
+                PassVisitor<CommonType> visitor( type2, widenFirst, widenSecond, indexer, env, openVars );
                 int depth1 = type1->referenceDepth();
 …
                         int diff = depth1-depth2;
                         // TODO: should it be possible for commonType to generate complicated conversions? I would argue no, only conversions that involve types of the same reference level or a difference of 1 should be allowed.
                         if ( diff > 1 || diff < -1 ) return nullptr;
+                        // if ( diff > 1 || diff < -1 ) return nullptr;
                         // special case where one type has a reference depth of 1 larger than the other
                         if ( diff > 0 || diff < 0 ) {
+                                PRINT(
+                                        std::cerr << "reference depth diff: " << diff << std::endl;
+                                )
                                 Type * result = nullptr;
+                                if ( ReferenceType * ref1 = dynamic_cast< ReferenceType * >( type1 ) ) {
+                                        // formal is reference, so result should be reference
+                                ReferenceType * ref1 = dynamic_cast< ReferenceType * >( type1 );
+                                ReferenceType * ref2 = dynamic_cast< ReferenceType * >( type2 );
+                                if ( diff > 0 ) {
+                                        // deeper on the left
+                                        assert( ref1 );
                                         result = handleReference( ref1->base, type2, widenFirst, widenSecond, indexer, env, openVars );
-                                        if ( result ) result = new ReferenceType( ref1->get_qualifiers(), result );
                                 } else {
                                         // formal is value, so result should be value
                                         ReferenceType * ref2 = strict_dynamic_cast< ReferenceType * > ( type2 );
+                                        // deeper on the right
+                                        assert( ref2 );
                                         result = handleReference( type1, ref2->base, widenFirst, widenSecond, indexer, env, openVars );
+                                }
+                                // std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
+                                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 ReferenceType( ref1->get_qualifiers(), result );
+                                }
+                                PRINT(
+                                        std::cerr << "common type of reference [" << type1 << "] and [" << type2 << "] is [" << result << "]" << std::endl;
+                                )
                                 return result;
+                        }
 …
                 type1->accept( visitor );
                 Type *result = visitor.get_result();
+                Type *result = visitor.pass.get_result();
                 if ( ! result ) {
                         // this appears to be handling for opaque type declarations
 …
+        }
         static const BasicType::Kind combinedType[ BasicType::NUMBER_OF_BASIC_TYPES ][ BasicType::NUMBER_OF_BASIC_TYPES ] =
+        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 */
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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, },
+                /* 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 },
+                /* 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, },
+                /* 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, },
+/*              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 },
         };
+        static_assert(
+                sizeof(combinedType)/sizeof(combinedType[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 )
 …
+        }
         void CommonType::visit( __attribute((unused)) VoidType *voidType ) {}
         void CommonType::visit( BasicType *basicType ) {
+        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() ];
 …
                                 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;
+                        }
+                }
 …
+        }
         void CommonType::visit( PointerType *pointerType ) {
+        void CommonType::postvisit( PointerType *pointerType ) {
                 if ( PointerType *otherPointer = dynamic_cast< PointerType* >( type2 ) ) {
                         // std::cerr << "commonType: two pointers: " << pointerType << " / " << otherPointer << std::endl;
 …
                                                 result = otherPointer->clone();
                                         } // if
                                         result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<PointerType*>(result)->base->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;
 …
+        }
         void CommonType::visit( __attribute((unused)) ArrayType *arrayType ) {}
         void CommonType::visit( ReferenceType *refType ) {
+        void CommonType::postvisit( ArrayType * ) {}
+        void CommonType::postvisit( ReferenceType *refType ) {
                 if ( ReferenceType *otherRef = dynamic_cast< ReferenceType* >( type2 ) ) {
                         // std::cerr << "commonType: both references: " << refType << " / " << otherRef << std::endl;
 …
                                                 result = otherRef->clone();
                                         } // if
                                         result->get_qualifiers() = tq1 | tq2;
+                                        strict_dynamic_cast<ReferenceType*>(result)->base->get_qualifiers() = tq1 | tq2;
                                 } else {
                                         /// std::cerr << "place for ptr-to-type" << std::endl;
 …
+        }
         void CommonType::visit( __attribute((unused)) FunctionType *functionType ) {}
         void CommonType::visit( __attribute((unused)) StructInstType *aggregateUseType ) {}
         void CommonType::visit( __attribute((unused)) UnionInstType *aggregateUseType ) {}
         void CommonType::visit( EnumInstType *enumInstType ) {
+        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 ) ) {
                         // reuse BasicType, EnumInstType code by swapping type2 with enumInstType
+                        ValueGuard< Type * > temp( type2 );
+                        type2 = enumInstType;
+                        temp.old->accept( *this );
+                } // if
+        }
+        void CommonType::visit( __attribute((unused)) TraitInstType *aggregateUseType ) {
+        }
+        void CommonType::visit( TypeInstType *inst ) {
+                        result = commonType( type2, enumInstType, widenSecond, widenFirst, indexer, env, openVars );
+                } // if
+        }
+        void CommonType::postvisit( TraitInstType * ) {
+        }
+        void CommonType::postvisit( TypeInstType *inst ) {
                 if ( widenFirst ) {
                         NamedTypeDecl *nt = indexer.lookupType( inst->get_name() );
 …
+        }
         void CommonType::visit( __attribute((unused)) TupleType *tupleType ) {}
         void CommonType::visit( __attribute((unused)) VarArgsType *varArgsType ) {}
         void CommonType::visit( ZeroType *zeroType ) {
+        void CommonType::postvisit( TupleType * ) {}
+        void CommonType::postvisit( VarArgsType * ) {}
+        void CommonType::postvisit( ZeroType *zeroType ) {
                 if ( widenFirst ) {
                         if ( dynamic_cast< BasicType* >( type2 ) || dynamic_cast< PointerType* >( type2 ) || dynamic_cast< EnumInstType* >( type2 ) ) {
 …
+        }
         void CommonType::visit( OneType *oneType ) {
+        void CommonType::postvisit( OneType *oneType ) {
                 if ( widenFirst ) {
                         if ( dynamic_cast< BasicType* >( type2 ) || dynamic_cast< EnumInstType* >( type2 ) ) {

src/ResolvExpr/ConversionCost.cc

-              rf9feab8
+              r90152a4
         Cost conversionCost( Type *src, Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
+                        EqvClass eqvClass;
+                        NamedTypeDecl *namedType;
+                        PRINT( std::cerr << "type inst " << destAsTypeInst->get_name(); )
+                        if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
+                                if ( eqvClass.type ) {
+                                        return conversionCost( src, eqvClass.type, indexer, env );
+                        PRINT( std::cerr << "type inst " << destAsTypeInst->name; )
+                        if ( const EqvClass* eqvClass = env.lookup( destAsTypeInst->name ) ) {
+                                if ( eqvClass->type ) {
+                                        return conversionCost( src, eqvClass->type, indexer, env );
                                 } else {
                                         return Cost::infinity;
+                                }
                         } else if ( ( namedType = indexer.lookupType( destAsTypeInst->get_name() ) ) ) {
+                        } else if ( NamedTypeDecl *namedType = indexer.lookupType( destAsTypeInst->name ) ) {
                                 PRINT( std::cerr << " found" << std::endl; )
                                 TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
                                 // all typedefs should be gone by this point
                                 assert( type );
                                 if ( type->get_base() ) {
                                         return conversionCost( src, type->get_base(), indexer, env ) + Cost::safe;
+                                if ( type->base ) {
+                                        return conversionCost( src, type->base, indexer, env ) + Cost::safe;
                                 } // if
                         } // if
 …
                 } else if ( ReferenceType * refType = dynamic_cast< ReferenceType * > ( dest ) ) {
                         PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
                         return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const TypeEnvironment & env, const SymTab::Indexer &){
+                        return convertToReferenceCost( src, refType, indexer, env, [](Type * t1, Type * t2, const SymTab::Indexer &, const TypeEnvironment & env ){
                                 return ptrsAssignable( t1, t2, env );
                         });
                 } else {
                         ConversionCost converter( dest, indexer, env );
+                        PassVisitor<ConversionCost> converter( dest, indexer, env, conversionCost );
                         src->accept( converter );
                         if ( converter.get_cost() == Cost::infinity ) {
+                        if ( converter.pass.get_cost() == Cost::infinity ) {
                                 return Cost::infinity;
                         } else {
                                 return converter.get_cost() + Cost::zero;
+                                return converter.pass.get_cost() + Cost::zero;
                         } // if
                 } // if
 …
         Cost convertToReferenceCost( Type * src, Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 PRINT( std::cerr << "convert to reference cost... diff " << diff << std::endl; )
+                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 )->get_base(), dest, diff-1, indexer, env, func );
+                        Cost cost = convertToReferenceCost( strict_dynamic_cast< ReferenceType * >( src )->base, dest, 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 )->get_base(), diff+1, indexer, env, func );
+                        Cost cost = convertToReferenceCost( src, strict_dynamic_cast< ReferenceType * >( dest )->base, diff+1, indexer, env, func );
                         cost.incReference();
                         return cost;
 …
                         if ( srcAsRef && destAsRef ) { // pointer-like conversions between references
                                 PRINT( std::cerr << "converting between references" << std::endl; )
+                                if ( srcAsRef->get_base()->get_qualifiers() <= destAsRef->get_base()->get_qualifiers() && typesCompatibleIgnoreQualifiers( srcAsRef->get_base(), destAsRef->get_base(), indexer, env ) ) {
+                                        return Cost::safe;
+                                Type::Qualifiers tq1 = srcAsRef->base->get_qualifiers();
+                                Type::Qualifiers tq2 = destAsRef->base->get_qualifiers();
+                                if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers( srcAsRef->base, destAsRef->base, indexer, env ) ) {
+                                        PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
+                                        if ( tq1 == tq2 ) {
+                                                // types are the same
+                                                return Cost::zero;
+                                        } else {
+                                                // types are the same, except otherPointer has more qualifiers
+                                                return Cost::safe;
+                                        }
                                 } else {  // xxx - this discards reference qualifiers from consideration -- reducing qualifiers is a safe conversion; is this right?
                                         int assignResult = func( srcAsRef->get_base(), destAsRef->get_base(), env, indexer );
+                                        int assignResult = func( srcAsRef->base, destAsRef->base, indexer, env );
                                         PRINT( std::cerr << "comparing references: " << assignResult << " " << srcAsRef << " " << destAsRef << std::endl; )
                                         if ( assignResult > 0 ) {
 …
                         } else {
                                 PRINT( std::cerr << "reference to rvalue conversion" << std::endl; )
                                 ConversionCost converter( dest, indexer, env );
+                                PassVisitor<ConversionCost> converter( dest, indexer, env, conversionCost );
                                 src->accept( converter );
                                 return converter.get_cost();
+                                return converter.pass.get_cost();
                         } // if
                 } else {
 …
                         assert( diff == -1 && destAsRef );
                         PRINT( std::cerr << "dest is: " << dest << " / src is: " << src << std::endl; )
                         if ( typesCompatibleIgnoreQualifiers( src, destAsRef->get_base(), indexer, env ) ) {
+                        if ( typesCompatibleIgnoreQualifiers( src, destAsRef->base, indexer, env ) ) {
                                 PRINT( std::cerr << "converting compatible base type" << std::endl; )
                                 if ( src->get_lvalue() ) {
 …
+                                        )
                                         // lvalue-to-reference conversion:  cv lvalue T => cv T &
                                         if ( src->get_qualifiers() == destAsRef->get_base()->get_qualifiers() ) {
+                                        if ( src->get_qualifiers() == destAsRef->base->get_qualifiers() ) {
                                                 return Cost::reference; // cost needs to be non-zero to add cast
                                         } if ( src->get_qualifiers() < destAsRef->get_base()->get_qualifiers() ) {
+                                        } if ( src->get_qualifiers() < destAsRef->base->get_qualifiers() ) {
                                                 return Cost::safe; // cost needs to be higher than previous cast to differentiate adding qualifiers vs. keeping same
                                         } else {
                                                 return Cost::unsafe;
                                         } // if
                                 } else if ( destAsRef->get_base()->get_const() ) {
+                                } else if ( destAsRef->base->get_const() ) {
                                         PRINT( std::cerr << "rvalue to const ref conversion" << std::endl; )
                                         // rvalue-to-const-reference conversion: T => const T &
 …
         Cost convertToReferenceCost( Type * src, ReferenceType * dest, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 int sdepth = src->referenceDepth(), ddepth = dest->referenceDepth();
+                return convertToReferenceCost( src, dest, sdepth-ddepth, indexer, env, func );
+        }
+        ConversionCost::ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env )
+                : dest( dest ), indexer( indexer ), cost( Cost::infinity ), env( env ) {
+                Cost cost = convertToReferenceCost( src, dest, 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 ) {
+        }
 …
 */
+        static const int costMatrix[ BasicType::NUMBER_OF_BASIC_TYPES ][ 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 */
+                /* Bool */      { 0,    1,              1,              2,              3,              4,              5,              6,              6,              7,              8,              9,              12,             13,             14,             12,             13,             14,             -1,             -1,             -1,             10,             11,     },
+                /* Char */      { -1,   0,              -1,             1,              2,              3,              4,              5,              5,              6,              7,              8,              11,             12,             13,             11,             12,             13,             -1,             -1,             -1,             9,              10,     },
+                /* SChar */ { -1,       -1,             0,              1,              2,              3,              4,              5,              5,              6,              7,              8,              11,             12,             13,             11,             12,             13,             -1,             -1,             -1,             9,              10,     },
+                /* UChar */ { -1,       -1,             -1,             0,              1,              2,              3,              4,              4,              5,              6,              7,              10,             11,             12,             10,             11,             12,             -1,             -1,             -1,             8,              9,      },
+                /* Short */ { -1,       -1,             -1,             -1,             0,              1,              2,              3,              3,              4,              5,              6,              9,              10,             11,             9,              10,             11,             -1,             -1,             -1,             7,              8,      },
+                /* UShort */{ -1,       -1,             -1,             -1,             -1,             0,              1,              2,              2,              3,              4,              5,              8,              9,              10,             8,              9,              10,             -1,             -1,             -1,             6,              7,      },
+                /* Int */       { -1,   -1,             -1,             -1,             -1,             -1,             0,              1,              1,              2,              3,              4,              7,              8,              9,              7,              8,              9,              -1,             -1,             -1,             5,              6,      },
+                /* UInt */      { -1,   -1,             -1,             -1,             -1,             -1,             -1,             0,              -1,             1,              2,              3,              6,              7,              8,              6,              7,              8,              -1,             -1,             -1,             4,              5,      },
+                /* Long */      { -1,   -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              2,              3,              6,              7,              8,              6,              7,              8,              -1,             -1,             -1,             4,              5,      },
+                /* ULong */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              2,              5,              6,              7,              5,              6,              7,              -1,             -1,             -1,             3,              4,      },
+                /* LLong */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              4,              5,              6,              4,              5,              6,              -1,             -1,             -1,             2,              3,      },
+                /* ULLong */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              3,              4,              5,              3,              4,              5,              -1,             -1,             -1,             1,              2,      },
+                /* Float */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              2,              1,              2,              3,              -1,             -1,             -1,             -1,             -1,     },
+                /* Double */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              1,              -1,             1,              2,              -1,             -1,             -1,             -1,             -1,     },
+                /* LDbl */      { -1,   -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              -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,     },
+                /* DCplex */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             0,              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,     },
+                /* FImag */ { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              2,              3,              0,              1,              2,              -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,     },
+                /* LDImag */{ -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              -1,             -1,             0,              -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,      },
+                /* U128 */  { -1,       -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             -1,             1,              2,              3,              2,              3,              4,              -1,             -1,             -1,             -1,             0,      },
+        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},
         };
+        void ConversionCost::visit( __attribute((unused)) VoidType *voidType ) {
+        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"
+        );
+        void ConversionCost::postvisit( VoidType * ) {
                 cost = Cost::infinity;
+        }
         void ConversionCost::visit(BasicType *basicType) {
+        void ConversionCost::postvisit(BasicType *basicType) {
                 if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
                         int tableResult = costMatrix[ basicType->get_kind() ][ destAsBasic->get_kind() ];
 …
                         // xxx - not positive this is correct, but appears to allow casting int => enum
                         cost = Cost::unsafe;
+                } else if ( dynamic_cast< ZeroType* >( dest ) != nullptr || dynamic_cast< OneType* >( dest ) != nullptr ) {
+                        cost = Cost::unsafe;
+                } // if
+        }
+        void ConversionCost::visit( PointerType * pointerType ) {
+                } // if
+                // no cases for zero_t/one_t because it should not be possible to convert int, etc. to zero_t/one_t.
+        }
+        void ConversionCost::postvisit( PointerType * pointerType ) {
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
+                        PRINT( std::cerr << pointerType << " ===> " << destAsPtr; )
+                        Type::Qualifiers tq1 = pointerType->get_base()->get_qualifiers();
+                        Type::Qualifiers tq2 = destAsPtr->get_base()->get_qualifiers();
+                        if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers( pointerType->get_base(), destAsPtr->get_base(), indexer, env ) ) {
+                        PRINT( std::cerr << pointerType << " ===> " << destAsPtr << std::endl; )
+                        Type::Qualifiers tq1 = pointerType->base->get_qualifiers();
+                        Type::Qualifiers tq2 = destAsPtr->base->get_qualifiers();
+                        if ( tq1 <= tq2 && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
+                                PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
                                 if ( tq1 == tq2 ) {
                                         // types are the same
 …
                                 } else {
                                         // types are the same, except otherPointer has more qualifiers
-                                        PRINT( std::cerr << " :: compatible and good qualifiers" << std::endl; )
                                         cost = Cost::safe;
+                                }
                         } else {  // xxx - this discards qualifiers from consideration -- reducing qualifiers is a safe conversion; is this right?
+                        } else {
                                 int assignResult = ptrsAssignable( pointerType->base, destAsPtr->base, env );
                                 PRINT( std::cerr << " :: " << assignResult << std::endl; )
+                                if ( assignResult > 0 && pointerType->get_base()->get_qualifiers() <= destAsPtr->get_qualifiers() ) {
+                                        cost = Cost::safe;
+                                if ( assignResult > 0 && tq1 <= tq2 ) {
+                                        // xxx - want the case where qualifiers are added to be more expensive than the case where qualifiers are the same. Is 1 safe vs. 2 safe correct?
+                                        if ( tq1 == tq2 ) {
+                                                cost = Cost::safe;
+                                        } else if ( tq1 < tq2 ) {
+                                                cost = Cost::safe+Cost::safe;
+                                        }
                                 } else if ( assignResult < 0 ) {
                                         cost = Cost::unsafe;
 …
                                 // assignResult == 0 means Cost::Infinity
                         } // if
+                } else if ( dynamic_cast< ZeroType * >( dest ) ) {
+                        cost = Cost::unsafe;
+                } // if
+        }
+        void ConversionCost::visit( ArrayType * ) {}
+        void ConversionCost::visit( ReferenceType * refType ) {
+                        // case case for zero_t because it should not be possible to convert pointers to zero_t.
+                } // if
+        }
+        void ConversionCost::postvisit( ArrayType * ) {}
+        void ConversionCost::postvisit( ReferenceType * refType ) {
                 // Note: dest can never be a reference, since it would have been caught in an earlier check
                 assert( ! dynamic_cast< ReferenceType * >( dest ) );
 …
                 // recursively compute conversion cost from T1 to T2.
                 // cv can be safely dropped because of 'implicit dereference' behavior.
                 refType->base->accept( *this );
+                cost = costFunc( refType->base, dest, indexer, env );
                 if ( refType->base->get_qualifiers() == dest->get_qualifiers() ) {
                         cost.incReference();  // prefer exact qualifiers
 …
+        }
         void ConversionCost::visit( FunctionType * ) {}
         void ConversionCost::visit( StructInstType * inst ) {
+        void ConversionCost::postvisit( FunctionType * ) {}
+        void ConversionCost::postvisit( StructInstType * inst ) {
                 if ( StructInstType *destAsInst = dynamic_cast< StructInstType* >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
 …
+        }
         void ConversionCost::visit( UnionInstType * inst ) {
+        void ConversionCost::postvisit( UnionInstType * inst ) {
                 if ( UnionInstType *destAsInst = dynamic_cast< UnionInstType* >( dest ) ) {
                         if ( inst->name == destAsInst->name ) {
 …
+        }
         void ConversionCost::visit( EnumInstType * ) {
+        void ConversionCost::postvisit( EnumInstType * ) {
                 static Type::Qualifiers q;
                 static BasicType integer( q, BasicType::SignedInt );
                 integer.accept( *this );  // safe if dest >= int
+                cost = costFunc( &integer, dest, indexer, env );  // safe if dest >= int
                 if ( cost < Cost::unsafe ) {
                         cost.incSafe();
 …
+        }
+        void ConversionCost::visit( TraitInstType * ) {}
+        void ConversionCost::visit( TypeInstType *inst ) {
+                EqvClass eqvClass;
+                NamedTypeDecl *namedType;
+                if ( env.lookup( inst->get_name(), eqvClass ) ) {
+                        cost = conversionCost( eqvClass.type, dest, indexer, env );
+        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 ) ) {
                         if ( inst->get_name() == destAsInst->get_name() ) {
+                        if ( inst->name == destAsInst->name ) {
                                 cost = Cost::zero;
+                        }
                 } else if ( ( namedType = indexer.lookupType( inst->get_name() ) ) ) {
+                } else if ( NamedTypeDecl *namedType = indexer.lookupType( inst->name ) ) {
                         TypeDecl *type = dynamic_cast< TypeDecl* >( namedType );
                         // all typedefs should be gone by this point
                         assert( type );
                         if ( type->get_base() ) {
                                 cost = conversionCost( type->get_base(), dest, indexer, env ) + Cost::safe;
                         } // if
                 } // if
+        }
         void ConversionCost::visit( TupleType * tupleType ) {
+                        if ( type->base ) {
+                                cost = costFunc( type->base, dest, indexer, env ) + Cost::safe;
+                        } // if
+                } // if
+        }
+        void ConversionCost::postvisit( TupleType * tupleType ) {
                 Cost c = Cost::zero;
                 if ( TupleType * destAsTuple = dynamic_cast< TupleType * >( dest ) ) {
                         std::list< Type * >::const_iterator srcIt = tupleType->get_types().begin();
                         std::list< Type * >::const_iterator destIt = destAsTuple->get_types().begin();
                         while ( srcIt != tupleType->get_types().end() && destIt != destAsTuple->get_types().end() ) {
                                 Cost newCost = conversionCost( *srcIt++, *destIt++, indexer, env );
+                        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 );
                                 if ( newCost == Cost::infinity ) {
                                         return;
 …
                                 c += newCost;
                         } // while
                         if ( destIt != destAsTuple->get_types().end() ) {
+                        if ( destIt != destAsTuple->types.end() ) {
                                 cost = Cost::infinity;
                         } else {
 …
+        }
         void ConversionCost::visit( VarArgsType * ) {
+        void ConversionCost::postvisit( VarArgsType * ) {
                 if ( dynamic_cast< VarArgsType* >( dest ) ) {
                         cost = Cost::zero;
 …
+        }
         void ConversionCost::visit( ZeroType * ) {
+        void ConversionCost::postvisit( ZeroType * ) {
                 if ( dynamic_cast< ZeroType * >( dest ) ) {
                         cost = Cost::zero;
 …
+        }
         void ConversionCost::visit( OneType * ) {
+        void ConversionCost::postvisit( OneType * ) {
                 if ( dynamic_cast< OneType * >( dest ) ) {
                         cost = Cost::zero;

src/ResolvExpr/ConversionCost.h

-              rf9feab8
+              r90152a4
 #include "Cost.h"             // for Cost
+#include "Common/PassVisitor.h"
 #include "SynTree/Visitor.h"  // for Visitor
 #include "SynTree/SynTree.h"  // for Visitor Nodes
 …
         class TypeEnvironment;
+        class ConversionCost : public Visitor {
+        typedef std::function<Cost(Type *, Type *, const SymTab::Indexer &, const TypeEnvironment &)> CostFunction;
+        struct ConversionCost : public WithShortCircuiting {
           public:
                 ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env );
+                ConversionCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction );
                 Cost get_cost() const { return cost; }
+                virtual void visit(VoidType *voidType);
+                virtual void visit(BasicType *basicType);
+                virtual void visit(PointerType *pointerType);
+                virtual void visit(ArrayType *arrayType);
+                virtual void visit(ReferenceType *refType);
+                virtual void visit(FunctionType *functionType);
+                virtual void visit(StructInstType *aggregateUseType);
+                virtual void visit(UnionInstType *aggregateUseType);
+                virtual void visit(EnumInstType *aggregateUseType);
+                virtual void visit(TraitInstType *aggregateUseType);
+                virtual void visit(TypeInstType *aggregateUseType);
+                virtual void visit(TupleType *tupleType);
+                virtual void visit(VarArgsType *varArgsType);
+                virtual void visit(ZeroType *zeroType);
+                virtual void visit(OneType *oneType);
+                void previsit( 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 );
           protected:
                 Type *dest;
 …
                 Cost cost;
                 const TypeEnvironment &env;
+                CostFunction costFunc;
         };
         typedef std::function<int(Type *, Type *, const TypeEnvironment &, const SymTab::Indexer &)> PtrsFunction;
+        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 );
 } // namespace ResolvExpr

src/ResolvExpr/CurrentObject.cc

-              rf9feab8
+              r90152a4
 namespace ResolvExpr {
-        long long int getConstValue( ConstantExpr * constExpr ) {
-                if ( BasicType * basicType = dynamic_cast< BasicType * >( constExpr->get_result() ) ) {
-                        if ( basicType->isInteger() ) {
-                                return constExpr->get_constant()->get_ival();
-                        } else {
-                                assertf( false, "Non-integer constant expression in getConstValue %s", toString( constExpr ).c_str() ); // xxx - might be semantic error
+                        }
-                } else if ( dynamic_cast< OneType * >( constExpr->get_result() ) ) {
-                        return 1;
-                } else if ( dynamic_cast< ZeroType * >( constExpr->get_result() ) ) {
-                        return 0;
-                } else {
-                        assertf( false, "unhandled type on getConstValue %s", toString( constExpr->get_result() ).c_str() ); // xxx - might be semantic error
+                }
+        }
         template< typename AggrInst >
         TypeSubstitution makeGenericSubstitution( AggrInst * inst ) {
 …
                 virtual ~MemberIterator() {}
+                /// walks the current object using the given designators as a guide
                 virtual void setPosition( std::list< Expression * > & designators ) = 0;
+                /// retrieve the list of possible Type/Designaton pairs for the current position in the currect object
                 virtual std::list<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 Type * getType() = 0;
+                /// the type of the current subobject
                 virtual Type * getNext() = 0;
+                /// printing for debug
                 virtual void print( std::ostream & out, Indenter indent ) const = 0;
+                /// helper for operator*; aggregates must add designator to each init alternative, but
+                /// adding designators in operator* creates duplicates.
                 virtual std::list<InitAlternative> first() const = 0; // should be protected
         };
 …
                 ArrayIterator( ArrayType * at ) : array( at ) {
                         PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
                         base = at->get_base();
+                        base = at->base;
                         memberIter = createMemberIterator( base );
+                        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 ) ) {
+                                size = getConstValue( constExpr );
+                                PRINT( std::cerr << "array type with size: " << size << std::endl; )
+                        }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
+                                setSize( castExpr->get_arg() ); // xxx - need to perform the conversion specified by the cast
+                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) );
+                        }
+                }
 …
                         // need to permit integer-constant-expressions, including: integer constants, enumeration constants, character constants, sizeof expressions, _Alignof expressions, cast expressions
                         if ( ConstantExpr * constExpr = dynamic_cast< ConstantExpr * >( expr ) ) {
+                                index = getConstValue( constExpr );
+                                try {
+                                        index = constExpr->intValue();
+                                } catch( SemanticErrorException & ) {
+                                        SemanticError( expr, "Constant expression of non-integral type in array designator: " );
+                                }
                         } else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
                                 setPosition( castExpr->get_arg() );
                         } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
+                                assertf( dynamic_cast<EnumInstType *> ( varExpr->get_result() ), "ArrayIterator given variable that isn't an enum constant : %s", toString( expr ).c_str() );
+                                index = 0; // xxx - get actual value of enum constant
+                                EnumInstType * inst = dynamic_cast<EnumInstType *>( varExpr->get_result() );
+                                assertf( inst, "ArrayIterator given variable that isn't an enum constant : %s", toString( expr ).c_str() );
+                                long long int value;
+                                if ( inst->baseEnum->valueOf( varExpr->var, value ) ) {
+                                        index = value;
+                                }
                         } else if ( dynamic_cast< SizeofExpr * >( expr ) || dynamic_cast< AlignofExpr * >( expr ) ) {
                                 index = 0; // xxx - get actual sizeof/alignof value?
 …
+                                }
+                        }
+                        // if ( curMember == std::next( decl->get_members().begin(), 1 ) ) { // xxx - this never triggers because curMember is incremented immediately on construction
+                        if ( atbegin ) { // xxx - this never triggers because curMember is incremented immediately on construction
+                        if ( atbegin ) {
                                 // xxx - what about case of empty struct??
                                 // only add self if at the very beginning of the structure
 …
                         return *this;
+                }
-                virtual std::list<InitAlternative> first() const { return std::list<InitAlternative>{}; }
         };
 …
                                 return new UnionIterator( uit );
                         } else {
                                 assertf( dynamic_cast< TypeInstType * >( type ), "some other reftotype" );
+                                assertf( dynamic_cast< EnumInstType * >( type ) || dynamic_cast< TypeInstType * >( type ), "Encountered unhandled ReferenceToType in createMemberIterator: %s", toString( type ).c_str() );
                                 return new SimpleIterator( type );
+                        }
 …
                 } // for
                 if ( desigAlts.size() > 1 ) {
                         throw SemanticError( toString("Too many alternatives (", desigAlts.size(), ") for designation: "), designation );
+                        SemanticError( designation, toString("Too many alternatives (", desigAlts.size(), ") for designation: ") );
                 } else if ( desigAlts.size() == 0 ) {
                         throw SemanticError( "No reasonable alternatives for designation: ", designation );
+                        SemanticError( designation, "No reasonable alternatives for designation: " );
+                }
                 DesignatorChain & d = desigAlts.back();

src/ResolvExpr/ExplodedActual.h

-              rf9feab8
+              r90152a4
                 ExplodedActual() : env(), cost(Cost::zero), exprs() {}
                 ExplodedActual( const Alternative& actual, const SymTab::Indexer& indexer );
+                ExplodedActual(ExplodedActual&&) = default;
+                ExplodedActual& operator= (ExplodedActual&&) = default;
         };
+}

src/ResolvExpr/FindOpenVars.cc

-              rf9feab8
+              r90152a4
 #include <map>                    // for map<>::mapped_type
+#include "Common/PassVisitor.h"
 #include "SynTree/Declaration.h"  // for TypeDecl, DeclarationWithType (ptr ...
 #include "SynTree/Type.h"         // for Type, Type::ForallList, ArrayType
-#include "SynTree/Visitor.h"      // for Visitor
 namespace ResolvExpr {
+        class FindOpenVars : public Visitor {
+          public:
+        struct FindOpenVars : public WithGuards {
                 FindOpenVars( OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen );
+          private:
+                virtual void visit(PointerType *pointerType);
+                virtual void visit(ArrayType *arrayType);
+                virtual void visit(FunctionType *functionType);
+                virtual void visit(TupleType *tupleType);
+                void previsit( PointerType * pointerType );
+                void previsit( ArrayType * arrayType );
+                void previsit( FunctionType * functionType );
+                void previsit( TupleType * tupleType );
                 void common_action( Type *type );
 …
         void findOpenVars( Type *type, OpenVarSet &openVars, OpenVarSet &closedVars, AssertionSet &needAssertions, AssertionSet &haveAssertions, bool firstIsOpen ) {
                 FindOpenVars finder( openVars, closedVars, needAssertions, haveAssertions, firstIsOpen );
+                PassVisitor<FindOpenVars> finder( openVars, closedVars, needAssertions, haveAssertions, firstIsOpen );
                 type->accept( finder );
+        }
 …
                         } // for
                 } // if
 ///   std::cout << "type is ";
 ///   type->print( std::cout );
 ///   std::cout << std::endl << "need is" << std::endl;
 ///   printAssertionSet( needAssertions, std::cout );
 ///   std::cout << std::endl << "have is" << std::endl;
 ///   printAssertionSet( haveAssertions, std::cout );
+///   std::cerr << "type is ";
+///   type->print( std::cerr );
+///   std::cerr << std::endl << "need is" << std::endl;
+///   printAssertionSet( needAssertions, std::cerr );
+///   std::cerr << std::endl << "have is" << std::endl;
+///   printAssertionSet( haveAssertions, std::cerr );
+        }
         void FindOpenVars::visit(PointerType *pointerType) {
+        void FindOpenVars::previsit(PointerType *pointerType) {
                 common_action( pointerType );
-                Visitor::visit( pointerType );
+        }
         void FindOpenVars::visit(ArrayType *arrayType) {
+        void FindOpenVars::previsit(ArrayType *arrayType) {
                 common_action( arrayType );
-                Visitor::visit( arrayType );
+        }
         void FindOpenVars::visit(FunctionType *functionType) {
+        void FindOpenVars::previsit(FunctionType *functionType) {
                 common_action( functionType );
                 nextIsOpen = ! nextIsOpen;
+                Visitor::visit( functionType );
+                nextIsOpen = ! nextIsOpen;
+                GuardAction( [this](){ nextIsOpen = ! nextIsOpen; } );
+        }
         void FindOpenVars::visit(TupleType *tupleType) {
+        void FindOpenVars::previsit(TupleType *tupleType) {
                 common_action( tupleType );
-                Visitor::visit( tupleType );
+        }
 } // namespace ResolvExpr

src/ResolvExpr/Occurs.cc

-              rf9feab8
+              r90152a4
 // file "LICENCE" distributed with Cforall.
 //
 // Occurs.cc --
+// Occurs.cc --
 //
 // Author           : Richard C. Bilson
 …
 #include <string>             // for string
+#include "Common/PassVisitor.h"
 #include "SynTree/Type.h"     // for TypeInstType, Type
-#include "SynTree/Visitor.h"  // for Visitor
 #include "TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 namespace ResolvExpr {
+        class Occurs : public Visitor {
+          public:
+        struct Occurs : public WithVisitorRef<Occurs> {
                 Occurs( std::string varName, const TypeEnvironment &env );
+                bool get_result() const { return result; }
+                virtual void visit( TypeInstType *typeInst );
+          private:
+                void previsit( TypeInstType * typeInst );
                 bool result;
                 std::set< std::string > eqvVars;
                 const TypeEnvironment &env;
+                const TypeEnvironment &tenv;
         };
         bool occurs( Type *type, std::string varName, const TypeEnvironment &env ) {
                 Occurs occur( varName, env );
+                PassVisitor<Occurs> occur( varName, env );
                 type->accept( occur );
                 return occur.get_result();
+                return occur.pass.result;
+        }
+        Occurs::Occurs( std::string varName, const TypeEnvironment &env ) : result( false ), env( env ) {
+                EqvClass eqvClass;
+                if ( env.lookup( varName, eqvClass ) ) {
+                        eqvVars = eqvClass.vars;
+        Occurs::Occurs( std::string varName, const TypeEnvironment & env ) : result( false ), tenv( env ) {
+                if ( const EqvClass *eqvClass = tenv.lookup( varName ) ) {
+                        eqvVars = eqvClass->vars;
                 } else {
                         eqvVars.insert( varName );
 …
+        }
+        void Occurs::visit( TypeInstType *typeInst ) {
+                EqvClass eqvClass;
+///   std::cout << "searching for vars: ";
+///   std::copy( eqvVars.begin(), eqvVars.end(), std::ostream_iterator< std::string >( std::cout, " " ) );
+///   std::cout << std::endl;
+        void Occurs::previsit( TypeInstType * typeInst ) {
+                ///   std::cerr << "searching for vars: ";
+///   std::copy( eqvVars.begin(), eqvVars.end(), std::ostream_iterator< std::string >( std::cerr, " " ) );
+///   std::cerr << std::endl;
                 if ( eqvVars.find( typeInst->get_name() ) != eqvVars.end() ) {
                         result = true;
                 } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
                         if ( eqvClass.type ) {
 ///       std::cout << typeInst->get_name() << " is bound to";
 ///       eqvClass.type->print( std::cout );
 ///       std::cout << std::endl;
                                 eqvClass.type->accept( *this );
+                } else if ( const EqvClass *eqvClass = tenv.lookup( typeInst->get_name() ) ) {
+                        if ( eqvClass->type ) {
+///       std::cerr << typeInst->get_name() << " is bound to";
+///       eqvClass.type->print( std::cerr );
+///       std::cerr << std::endl;
+                                eqvClass->type->accept( *visitor );
                         } // if
                 } // if

src/ResolvExpr/PolyCost.cc

-              rf9feab8
+              r90152a4
 //
+#include "Common/PassVisitor.h"
 #include "SymTab/Indexer.h"   // for Indexer
 #include "SynTree/Type.h"     // for TypeInstType, Type
-#include "SynTree/Visitor.h"  // for Visitor
 #include "TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 namespace ResolvExpr {
+        class PolyCost : public Visitor {
+          public:
+        struct PolyCost {
                 PolyCost( const TypeEnvironment &env, const SymTab::Indexer &indexer );
+                int get_result() const { return result; }
+          private:
+                virtual void visit(TypeInstType *aggregateUseType);
+                void previsit( TypeInstType * aggregateUseType );
                 int result;
                 const TypeEnvironment &env;
+                const TypeEnvironment &tenv;
                 const SymTab::Indexer &indexer;
         };
         int polyCost( Type *type, const TypeEnvironment & env, const SymTab::Indexer &indexer ) {
                 PolyCost coster( env, indexer );
+                PassVisitor<PolyCost> coster( env, indexer );
                 type->accept( coster );
                 return coster.get_result();
+                return coster.pass.result;
+        }
         PolyCost::PolyCost( const TypeEnvironment & env, const SymTab::Indexer & indexer ) : result( 0 ), env( env ), indexer( indexer ) {
+        PolyCost::PolyCost( const TypeEnvironment & env, const SymTab::Indexer & indexer ) : result( 0 ), tenv( env ), indexer( indexer ) {
+        }
+        void PolyCost::visit(TypeInstType * typeInst) {
+                EqvClass eqvClass;
+                if ( env.lookup( typeInst->name, eqvClass ) ) {
+                        if ( eqvClass.type ) {
+                                if ( TypeInstType * otherTypeInst = dynamic_cast< TypeInstType* >( eqvClass.type ) ) {
+        void PolyCost::previsit(TypeInstType * typeInst) {
+                if ( const EqvClass *eqvClass = tenv.lookup( typeInst->name ) ) {
+                        if ( eqvClass->type ) {
+                                if ( TypeInstType * otherTypeInst = dynamic_cast< TypeInstType* >( eqvClass->type ) ) {
                                         if ( indexer.lookupType( otherTypeInst->name ) ) {
                                                 // bound to opaque type

src/ResolvExpr/PtrsAssignable.cc

-              rf9feab8
+              r90152a4
 //
+#include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 #include "SynTree/Type.h"                // for TypeInstType, Type, BasicType
 …
 namespace ResolvExpr {
+        class PtrsAssignable : public Visitor {
+          public:
+        struct PtrsAssignable : public WithShortCircuiting {
                 PtrsAssignable( Type *dest, const TypeEnvironment &env );
                 int get_result() const { return result; }
+                virtual void visit( VoidType *voidType );
+                virtual void visit( BasicType *basicType );
+                virtual void visit( PointerType *pointerType );
+                virtual void visit( ArrayType *arrayType );
+                virtual void visit( FunctionType *functionType );
+                virtual void visit( StructInstType *inst );
+                virtual void visit( UnionInstType *inst );
+                virtual void visit( EnumInstType *inst );
+                virtual void visit( TraitInstType *inst );
+                virtual void visit( TypeInstType *inst );
+                virtual void visit( TupleType *tupleType );
+                virtual void visit( VarArgsType *varArgsType );
+                virtual void visit( ZeroType *zeroType );
+                virtual void visit( OneType *oneType );
+                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 );
           private:
                 Type *dest;
 …
                 // std::cerr << "assignable: " << src << " | " << dest << std::endl;
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
+                        EqvClass eqvClass;
+                        if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
+                                return ptrsAssignable( src, eqvClass.type, env );
+                        if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+                                return ptrsAssignable( src, eqvClass->type, env );
                         } // if
                 } // if
 …
                         return -1;
                 } else {
                         PtrsAssignable ptrs( dest, env );
+                        PassVisitor<PtrsAssignable> ptrs( dest, env );
                         src->accept( ptrs );
                         return ptrs.get_result();
+                        return ptrs.pass.get_result();
                 } // if
+        }
 …
         PtrsAssignable::PtrsAssignable( Type *dest, const TypeEnvironment &env ) : dest( dest ), result( 0 ), env( env ) {}
         void PtrsAssignable::visit( __attribute((unused)) VoidType *voidType ) {
+        void PtrsAssignable::postvisit( 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::visit( __attribute__((unused)) BasicType *basicType ) {}
         void PtrsAssignable::visit( __attribute__((unused)) PointerType *pointerType ) {}
         void PtrsAssignable::visit( __attribute__((unused)) ArrayType *arrayType ) {}
         void PtrsAssignable::visit( __attribute__((unused)) FunctionType *functionType ) {}
+        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::visit(  __attribute__((unused)) StructInstType *inst ) {}
         void PtrsAssignable::visit(  __attribute__((unused)) UnionInstType *inst ) {}
+        void PtrsAssignable::postvisit(  __attribute__((unused)) StructInstType *inst ) {}
+        void PtrsAssignable::postvisit(  __attribute__((unused)) UnionInstType *inst ) {}
         void PtrsAssignable::visit( EnumInstType * ) {
+        void PtrsAssignable::postvisit( EnumInstType * ) {
                 if ( dynamic_cast< BasicType* >( dest ) ) {
                         // int * = E *, etc. is safe. This isn't technically correct, as each
 …
+        }
+        void PtrsAssignable::visit(  __attribute__((unused)) TraitInstType *inst ) {}
+        void PtrsAssignable::visit( TypeInstType *inst ) {
+                EqvClass eqvClass;
+                if ( env.lookup( inst->get_name(), eqvClass ) && eqvClass.type ) {
+                        // T * = S * for any S depends on the type bound to T
+                        result = ptrsAssignable( eqvClass.type, dest, env );
+        void PtrsAssignable::postvisit(  __attribute__((unused)) TraitInstType *inst ) {}
+        void PtrsAssignable::postvisit( TypeInstType *inst ) {
+                if ( const EqvClass *eqvClass = env.lookup( inst->get_name() ) ) {
+                        if ( eqvClass->type ) {
+                                // T * = S * for any S depends on the type bound to T
+                                result = ptrsAssignable( eqvClass->type, dest, env );
+                        }
                 } // if
+        }
         void PtrsAssignable::visit(  __attribute__((unused)) TupleType *tupleType ) {}
         void PtrsAssignable::visit(  __attribute__((unused)) VarArgsType *varArgsType ) {}
         void PtrsAssignable::visit(  __attribute__((unused)) ZeroType *zeroType ) {}
         void PtrsAssignable::visit(  __attribute__((unused)) OneType *oneType ) {}
+        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 ) {}
 } // namespace ResolvExpr

src/ResolvExpr/PtrsCastable.cc

-              rf9feab8
+              r90152a4
 //
+#include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
 #include "SymTab/Indexer.h"              // for Indexer
 …
 #include "typeops.h"                     // for ptrsAssignable
 namespace ResolvExpr {
         class PtrsCastable : public Visitor {
+        struct PtrsCastable : public WithShortCircuiting  {
           public:
                 PtrsCastable( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
 …
                 int get_result() const { return result; }
+                virtual void visit(VoidType *voidType);
+                virtual void visit(BasicType *basicType);
+                virtual void visit(PointerType *pointerType);
+                virtual void visit(ArrayType *arrayType);
+                virtual void visit(FunctionType *functionType);
+                virtual void visit(StructInstType *inst);
+                virtual void visit(UnionInstType *inst);
+                virtual void visit(EnumInstType *inst);
+                virtual void visit(TraitInstType *inst);
+                virtual void visit(TypeInstType *inst);
+                virtual void visit(TupleType *tupleType);
+                virtual void visit(VarArgsType *varArgsType);
+                virtual void visit(ZeroType *zeroType);
+                virtual void visit(OneType *oneType);
+                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 );
           private:
                 Type *dest;
 …
                                 return -1;
                         } else if ( TypeInstType *typeInst = dynamic_cast< TypeInstType* >( src ) ) {
-                                EqvClass eqvClass;
                                 if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
                                         if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
 …
                                                 } // if
                                         } //if
                                 } else if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
                                         if ( eqvClass.data.kind == TypeDecl::Ftype ) {
+                                } else if ( const EqvClass *eqvClass = env.lookup( typeInst->get_name() ) ) {
+                                        if ( eqvClass->data.kind == TypeDecl::Ftype ) {
                                                 return -1;
                                         } // if
 …
         int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
                         EqvClass eqvClass;
                         if ( env.lookup( destAsTypeInst->get_name(), eqvClass ) ) {
                                 return ptrsAssignable( src, eqvClass.type, env );
+                        if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+                                // xxx - should this be ptrsCastable?
+                                return ptrsAssignable( src, eqvClass->type, env );
                         } // if
                 } // if
 …
                         return objectCast( src, env, indexer );
                 } else {
                         PtrsCastable ptrs( dest, env, indexer );
+                        PassVisitor<PtrsCastable> ptrs( dest, env, indexer );
                         src->accept( ptrs );
                         return ptrs.get_result();
+                        return ptrs.pass.get_result();
                 } // if
+        }
 …
+        }
         void PtrsCastable::visit( VoidType * ) {
+        void PtrsCastable::postvisit( VoidType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( BasicType * ) {
+        void PtrsCastable::postvisit( BasicType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( PointerType * ) {
+        void PtrsCastable::postvisit( PointerType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( ArrayType * ) {
+        void PtrsCastable::postvisit( ArrayType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( FunctionType * ) {
+        void PtrsCastable::postvisit( FunctionType * ) {
                 // result = -1;
                 result = functionCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( StructInstType * ) {
+        void PtrsCastable::postvisit( StructInstType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( UnionInstType * ) {
+        void PtrsCastable::postvisit( UnionInstType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( EnumInstType * ) {
+        void PtrsCastable::postvisit( EnumInstType * ) {
                 if ( dynamic_cast< EnumInstType* >( dest ) ) {
                         result = 1;
 …
+        }
         void PtrsCastable::visit( TraitInstType * ) {}
+        void PtrsCastable::postvisit( TraitInstType * ) {}
         void PtrsCastable::visit(TypeInstType *inst) {
+        void PtrsCastable::postvisit(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::visit( TupleType * ) {
+        void PtrsCastable::postvisit( TupleType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( VarArgsType * ) {
+        void PtrsCastable::postvisit( VarArgsType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( ZeroType * ) {
+        void PtrsCastable::postvisit( ZeroType * ) {
                 result = objectCast( dest, env, indexer );
+        }
         void PtrsCastable::visit( OneType * ) {
+        void PtrsCastable::postvisit( OneType * ) {
                 result = objectCast( dest, env, indexer );
+        }

src/ResolvExpr/RenameVars.cc

-              rf9feab8
+              r90152a4
 #include <utility>                 // for pair
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"  // for SemanticError
 #include "RenameVars.h"
 …
 namespace ResolvExpr {
+        RenameVars global_renamer;
+        namespace {
+                struct RenameVars {
+                        RenameVars();
+                        void reset();
+        RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
+                mapStack.push_front( std::map< std::string, std::string >() );
+                        void previsit( TypeInstType * instType );
+                        void previsit( Type * );
+                        void postvisit( Type * );
+                  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 RenameVars::reset() {
+                level = 0;
+                resetCount++;
+        void resetTyVarRenaming() {
+                global_renamer.pass.reset();
+        }
         void RenameVars::visit( VoidType *voidType ) {
                 typeBefore( voidType );
                 typeAfter( voidType );
+        }
+        namespace {
+                RenameVars::RenameVars() : level( 0 ), resetCount( 0 ) {
+                        mapStack.push_front( std::map< std::string, std::string >() );
+                }
         void RenameVars::visit( BasicType *basicType ) {
                 typeBefore( basicType );
                 typeAfter( basicType );
+        }
+                void RenameVars::reset() {
+                        level = 0;
+                        resetCount++;
+                }
+        void RenameVars::visit( PointerType *pointerType ) {
+                typeBefore( pointerType );
+                maybeAccept( pointerType->get_base(), *this );
+                typeAfter( pointerType );
+        }
+                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::visit( ArrayType *arrayType ) {
+                typeBefore( arrayType );
+                maybeAccept( arrayType->get_dimension(), *this );
+                maybeAccept( arrayType->get_base(), *this );
+                typeAfter( arrayType );
+        }
+                void RenameVars::previsit( Type * type ) {
+                        if ( ! type->forall.empty() ) {
+                                // copies current name mapping into new mapping
+                                mapStack.push_front( mapStack.front() );
+                                // renames all "forall" type names to `_${level}_${name}'
+                                for ( auto td : type->forall ) {
+                                        std::ostringstream output;
+                                        output << "_" << resetCount << "_" << level << "_" << td->name;
+                                        std::string newname( output.str() );
+                                        mapStack.front()[ td->get_name() ] = newname;
+                                        td->name = newname;
+                                        // ditto for assertion names, the next level in
+                                        level++;
+                                        // acceptAll( td->assertions, *this );
+                                } // for
+                        } // if
+                }
+        void RenameVars::visit( FunctionType *functionType ) {
+                typeBefore( functionType );
+                acceptAll( functionType->get_returnVals(), *this );
+                acceptAll( functionType->get_parameters(), *this );
+                typeAfter( functionType );
+        }
+        void RenameVars::visit( StructInstType *aggregateUseType ) {
+                typeBefore( aggregateUseType );
+                acceptAll( aggregateUseType->get_parameters(), *this );
+                typeAfter( aggregateUseType );
+        }
+        void RenameVars::visit( UnionInstType *aggregateUseType ) {
+                typeBefore( aggregateUseType );
+                acceptAll( aggregateUseType->get_parameters(), *this );
+                typeAfter( aggregateUseType );
+        }
+        void RenameVars::visit( EnumInstType *aggregateUseType ) {
+                typeBefore( aggregateUseType );
+                acceptAll( aggregateUseType->get_parameters(), *this );
+                typeAfter( aggregateUseType );
+        }
+        void RenameVars::visit( TraitInstType *aggregateUseType ) {
+                typeBefore( aggregateUseType );
+                acceptAll( aggregateUseType->get_parameters(), *this );
+                typeAfter( aggregateUseType );
+        }
+        void RenameVars::visit( TypeInstType *instType ) {
+                typeBefore( instType );
+                std::map< std::string, std::string >::const_iterator i = mapStack.front().find( instType->get_name() );
+                if ( i != mapStack.front().end() ) {
+                        instType->set_name( i->second );
+                } else {
+                } // if
+                acceptAll( instType->get_parameters(), *this );
+                typeAfter( instType );
+        }
+        void RenameVars::visit( TupleType *tupleType ) {
+                typeBefore( tupleType );
+                acceptAll( tupleType->get_types(), *this );
+                typeAfter( tupleType );
+        }
+        void RenameVars::visit( VarArgsType *varArgsType ) {
+                typeBefore( varArgsType );
+                typeAfter( varArgsType );
+        }
+        void RenameVars::visit( ZeroType *zeroType ) {
+                typeBefore( zeroType );
+                typeAfter( zeroType );
+        }
+        void RenameVars::visit( OneType *oneType ) {
+                typeBefore( oneType );
+                typeAfter( oneType );
+        }
+        void RenameVars::typeBefore( Type *type ) {
+                if ( ! type->get_forall().empty() ) {
+                        // copies current name mapping into new mapping
+                        mapStack.push_front( mapStack.front() );
+                        // renames all "forall" type names to `_${level}_${name}'
+                        for ( Type::ForallList::iterator i = type->get_forall().begin(); i != type->get_forall().end(); ++i ) {
+                                std::ostringstream output;
+                                output << "_" << resetCount << "_" << level << "_" << (*i)->get_name();
+                                std::string newname( output.str() );
+                                mapStack.front()[ (*i)->get_name() ] = newname;
+                                (*i)->set_name( newname );
+                                // ditto for assertion names, the next level in
+                                level++;
+                                acceptAll( (*i)->get_assertions(), *this );
+                        } // for
+                } // if
+        }
+        void RenameVars::typeAfter( Type *type ) {
+                // clears name mapping added by typeBefore()
+                if ( ! type->get_forall().empty() ) {
+                        mapStack.pop_front();
+                } // if
+        }
+                void RenameVars::postvisit( Type * type ) {
+                        // clears name mapping added by typeBefore()
+                        if ( ! type->forall.empty() ) {
+                                mapStack.pop_front();
+                        } // if
+                }
+        } // namespace
 } // namespace ResolvExpr

src/ResolvExpr/RenameVars.h

-              rf9feab8
+              r90152a4
 namespace ResolvExpr {
+        /// Provides a consistent renaming of forall type names in a hierarchy by prefixing them with a unique "level" ID
+        void renameTyVars( Type * );
+        /// Provides a consistent renaming of forall type names in a hierarchy by prefixing them with a unique "level" ID
+        class RenameVars : public Visitor {
+          public:
+                RenameVars();
+                void reset();
+          private:
+                virtual void visit( VoidType *basicType );
+                virtual void visit( BasicType *basicType );
+                virtual void visit( PointerType *pointerType );
+                virtual void visit( ArrayType *arrayType );
+                virtual void visit( FunctionType *functionType );
+                virtual void visit( StructInstType *aggregateUseType );
+                virtual void visit( UnionInstType *aggregateUseType );
+                virtual void visit( EnumInstType *aggregateUseType );
+                virtual void visit( TraitInstType *aggregateUseType );
+                virtual void visit( TypeInstType *aggregateUseType );
+                virtual void visit( TupleType *tupleType );
+                virtual void visit( VarArgsType *varArgsType );
+                virtual void visit( ZeroType *zeroType );
+                virtual void visit( OneType *oneType );
+                void typeBefore( Type *type );
+                void typeAfter( Type *type );
+                int level, resetCount;
+                std::list< std::map< std::string, std::string > > mapStack;
+        };
+        extern RenameVars global_renamer;
+        /// resets internal state of renamer to avoid overflow
+        void resetTyVarRenaming();
 } // namespace ResolvExpr

src/ResolvExpr/Resolver.cc

-              rf9feab8
+              r90152a4
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Andrew Beach
 // Last Modified On : Tus Aug  8 16:06:00 2017
 // Update Count     : 212
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Feb 17 11:19:40 2018
+// Update Count     : 213
 //
 …
 #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
 …
                 void postvisit( FunctionDecl *functionDecl );
                 void previsit( ObjectDecl *objectDecll );
-                void previsit( TypeDecl *typeDecl );
                 void previsit( EnumDecl * enumDecl );
+                void previsit( StaticAssertDecl * assertDecl );
                 void previsit( ArrayType * at );
 …
                 void previsit( CatchStmt *catchStmt );
                 void previsit( WaitForStmt * stmt );
-                void previsit( WithStmt * withStmt );
                 void previsit( SingleInit *singleInit );
 …
                 void previsit( ConstructorInit *ctorInit );
           private:
         typedef std::list< Initializer * >::iterator InitIterator;
+                typedef std::list< Initializer * >::iterator InitIterator;
                 template< typename PtrType >
                 void handlePtrType( PtrType * type );
+          void resolveAggrInit( ReferenceToType *, InitIterator &, InitIterator & );
+          void resolveSingleAggrInit( Declaration *, InitIterator &, InitIterator &, TypeSubstitution sub );
+          void fallbackInit( ConstructorInit * ctorInit );
+                void fallbackInit( ConstructorInit * ctorInit );
                 Type * functionReturn = nullptr;
 …
         };
+        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;
 …
+        }
-        // used in resolveTypeof
-        Expression *resolveInVoidContext( Expression *expr, const SymTab::Indexer &indexer ) {
-                TypeEnvironment env;
-                return resolveInVoidContext( expr, indexer, env );
+        }
         namespace {
+                void finishExpr( Expression *expr, const TypeEnvironment &env, TypeSubstitution * oldenv = nullptr ) {
+                struct DeleteFinder : public WithShortCircuiting        {
+                        DeletedExpr * delExpr = nullptr;
+                        void previsit( DeletedExpr * expr ) {
+                                if ( delExpr ) visit_children = false;
+                                else delExpr = expr;
+                        }
+                        void previsit( Expression * ) {
+                                if ( delExpr ) visit_children = false;
+                        }
+                };
+        }
+        DeletedExpr * findDeletedExpr( Expression * expr ) {
+                PassVisitor<DeleteFinder> finder;
+                expr->accept( finder );
+                return finder.pass.delExpr;
+        }
+        namespace {
+                struct StripCasts {
+                        Expression * postmutate( CastExpr * castExpr ) {
+                                if ( castExpr->isGenerated && ResolvExpr::typesCompatible( castExpr->arg->result, castExpr->result, SymTab::Indexer() ) ) {
+                                        // generated cast is to the same type as its argument, so it's unnecessary -- remove it
+                                        Expression * expr = castExpr->arg;
+                                        castExpr->arg = nullptr;
+                                        std::swap( expr->env, castExpr->env );
+                                        return expr;
+                                }
+                                return castExpr;
+                        }
+                        static void strip( Expression *& expr ) {
+                                PassVisitor<StripCasts> stripper;
+                                expr = expr->acceptMutator( stripper );
+                        }
+                };
+                void finishExpr( Expression *&expr, const TypeEnvironment &env, TypeSubstitution * oldenv = nullptr ) {
                         expr->env = oldenv ? oldenv->clone() : new TypeSubstitution;
+                        env.makeSubstitution( *expr->get_env() );
+                        env.makeSubstitution( *expr->env );
+                        StripCasts::strip( expr ); // remove unnecessary casts that may be buried in an expression
+                }
 …
         } // namespace
+        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) {
+                        assertf( untyped, "expected a non-null expression." );
+                        TypeEnvironment env;
+                        AlternativeFinder finder( indexer, env );
+                        finder.find( untyped, adjust, prune, failFast );
+                        #if 0
+                        if ( finder.get_alternatives().size() != 1 ) {
+                                std::cerr << "untyped expr is ";
+                                untyped->print( std::cerr );
+                                std::cerr << std::endl << "alternatives are:";
+                                for ( const Alternative & alt : finder.get_alternatives() ) {
+                                        alt.print( std::cerr );
+                                } // for
+                        } // if
+                        #endif
+                        AltList candidates;
+                        for ( Alternative & alt : finder.get_alternatives() ) {
+                                if ( pred( alt ) ) {
+                                        candidates.push_back( std::move( alt ) );
+                                }
+                        }
+                        // xxx - if > 1 alternative with same cost, ignore deleted and pick from remaining
+                        // choose the lowest cost expression among the candidates
+                        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 ) {
+                                std::ostringstream stream;
+                                stream << "Cannot choose between " << winners.size() << " alternatives for " << kindStr << (kindStr != "" ? " " : "") << "expression\n";
+                                untyped->print( stream );
+                                stream << " Alternatives are:\n";
+                                printAlts( winners, stream, 1 );
+                                SemanticError( untyped->location, stream.str() );
+                        }
+                        // there is one unambiguous interpretation - move the expression into the with statement
+                        Alternative & choice = winners.front();
+                        if ( findDeletedExpr( choice.expr ) ) {
+                                SemanticError( untyped->location, choice.expr, "Unique best alternative includes deleted identifier in " );
+                        }
+                        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) {
+                        if ( ! untyped ) return;
+                        Alternative choice;
+                        findUnfinishedKindExpression( untyped, choice, indexer, kindStr, pred, adjust, prune, failFast );
+                        finishExpr( choice.expr, choice.env, untyped->env );
+                        delete untyped;
+                        untyped = choice.expr;
+                        choice.expr = nullptr;
+                }
+                bool standardAlternativeFilter( const Alternative & ) {
+                        // currently don't need to filter, under normal circumstances.
+                        // in the future, this may be useful for removing deleted expressions
+                        return true;
+                }
+        } // namespace
+        // used in resolveTypeof
+        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 ) {
+                // 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;
+                // set up and resolve expression cast to void
+                untyped.arg = expr;
+                Alternative choice;
+                findUnfinishedKindExpression( &untyped, choice, indexer, "", standardAlternativeFilter, true );
+                CastExpr * castExpr = strict_dynamic_cast< CastExpr * >( choice.expr );
+                env = std::move( choice.env );
+                // clean up resolved expression
+                Expression * ret = castExpr->arg;
+                castExpr->arg = nullptr;
+                // unlink the arg so that it isn't deleted twice at the end of the program
+                untyped.arg = nullptr;
+                return ret;
+        }
         void findVoidExpression( Expression *& untyped, const SymTab::Indexer &indexer ) {
                 global_renamer.reset();
+                resetTyVarRenaming();
                 TypeEnvironment env;
                 Expression *newExpr = resolveInVoidContext( untyped, indexer, env );
+                Expression * newExpr = resolveInVoidContext( untyped, indexer, env );
                 finishExpr( newExpr, env, untyped->env );
                 delete untyped;
 …
         void findSingleExpression( Expression *&untyped, const SymTab::Indexer &indexer ) {
+                if ( ! untyped ) return;
+                TypeEnvironment env;
+                AlternativeFinder finder( indexer, env );
+                finder.find( untyped );
+                #if 0
+                if ( finder.get_alternatives().size() != 1 ) {
+                        std::cerr << "untyped expr is ";
+                        untyped->print( std::cerr );
+                        std::cerr << std::endl << "alternatives are:";
+                        for ( const Alternative & alt : finder.get_alternatives() ) {
+                                alt.print( std::cerr );
+                        } // for
+                } // if
+                #endif
+                assertf( finder.get_alternatives().size() == 1, "findSingleExpression: must have exactly one alternative at the end." );
+                Alternative &choice = finder.get_alternatives().front();
+                Expression *newExpr = choice.expr->clone();
+                finishExpr( newExpr, choice.env, untyped->env );
+                delete untyped;
+                untyped = newExpr;
+                findKindExpression( untyped, indexer, "", standardAlternativeFilter );
+        }
         void findSingleExpression( Expression *& untyped, Type * type, const SymTab::Indexer & indexer ) {
                 assert( untyped && type );
+                // transfer location to generated cast for error purposes
+                CodeLocation location = untyped->location;
                 untyped = new CastExpr( untyped, type );
+                untyped->location = location;
                 findSingleExpression( untyped, indexer );
                 removeExtraneousCast( untyped, indexer );
 …
         namespace {
+                bool isIntegralType( Type *type ) {
+                bool isIntegralType( const Alternative & alt ) {
+                        Type * type = alt.expr->result;
                         if ( dynamic_cast< EnumInstType * >( type ) ) {
                                 return true;
 …
                 void findIntegralExpression( Expression *& untyped, const SymTab::Indexer &indexer ) {
+                        TypeEnvironment env;
+                        AlternativeFinder finder( indexer, env );
+                        finder.find( untyped );
+#if 0
+                        if ( finder.get_alternatives().size() != 1 ) {
+                                std::cout << "untyped expr is ";
+                                untyped->print( std::cout );
+                                std::cout << std::endl << "alternatives are:";
+                                for ( std::list< Alternative >::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
+                                        i->print( std::cout );
+                                } // for
+                        } // if
+#endif
+                        Expression *newExpr = 0;
+                        const TypeEnvironment *newEnv = 0;
+                        for ( AltList::const_iterator i = finder.get_alternatives().begin(); i != finder.get_alternatives().end(); ++i ) {
+                                if ( i->expr->get_result()->size() == 1 && isIntegralType( i->expr->get_result() ) ) {
+                                        if ( newExpr ) {
+                                                throw SemanticError( "Too many interpretations for case control expression", untyped );
+                                        } else {
+                                                newExpr = i->expr->clone();
+                                                newEnv = &i->env;
+                                        } // if
+                                } // if
+                        } // for
+                        if ( ! newExpr ) {
+                                throw SemanticError( "No interpretations for case control expression", untyped );
+                        } // if
+                        finishExpr( newExpr, *newEnv, untyped->env );
+                        delete untyped;
+                        untyped = newExpr;
+                }
+                        findKindExpression( untyped, indexer, "condition", isIntegralType );
+                }
+        }
+        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
+                        // front of the function body.
+                        auto guard = makeFuncGuard( [this]() { indexer.enterScope(); }, [this](){ indexer.leaveScope(); } );
+                        indexer.addFunctionType( functionDecl->type );
+                        std::list< Statement * > newStmts;
+                        resolveWithExprs( functionDecl->withExprs, newStmts );
+                        if ( functionDecl->statements ) {
+                                functionDecl->statements->kids.splice( functionDecl->statements->kids.begin(), newStmts );
+                        } else {
+                                assertf( functionDecl->withExprs.empty() && newStmts.empty(), "Function %s without a body has with-clause and/or generated with declarations.", functionDecl->name.c_str() );
+                        }
+                }
+        }
         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
 …
+        }
-        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 << std::endl;
 #endif
-                Type *new_type = resolveTypeof( functionDecl->get_type(), indexer );
-                functionDecl->set_type( new_type );
                 GuardValue( functionReturn );
                 functionReturn = ResolvExpr::extractResultType( functionDecl->get_functionType() );
+                functionReturn = ResolvExpr::extractResultType( functionDecl->type );
+        }
 …
                 // 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->get_functionType()->get_parameters() ) {
+                for ( Declaration * d : functionDecl->type->parameters ) {
                         if ( ObjectDecl * obj = dynamic_cast< ObjectDecl * >( d ) ) {
                                 if ( SingleInit * init = dynamic_cast< SingleInit * >( obj->get_init() ) ) {
                                         delete init->get_value()->get_env();
                                         init->get_value()->set_env( nullptr );
+                                if ( SingleInit * init = dynamic_cast< SingleInit * >( obj->init ) ) {
+                                        delete init->value->env;
+                                        init->value->env = nullptr;
+                                }
+                        }
 …
+        }
+        void Resolver::previsit( StaticAssertDecl * assertDecl ) {
+                findIntegralExpression( assertDecl->condition, indexer );
+        }
         void Resolver::previsit( ExprStmt *exprStmt ) {
                 visit_children = false;
 …
         void Resolver::previsit( IfStmt *ifStmt ) {
                 findSingleExpression( ifStmt->condition, indexer );
+                findIntegralExpression( ifStmt->condition, indexer );
+        }
         void Resolver::previsit( WhileStmt *whileStmt ) {
                 findSingleExpression( whileStmt->condition, indexer );
+                findIntegralExpression( whileStmt->condition, indexer );
+        }
         void Resolver::previsit( ForStmt *forStmt ) {
                 if ( forStmt->condition ) {
                         findSingleExpression( forStmt->condition, indexer );
+                        findIntegralExpression( forStmt->condition, indexer );
                 } // if
 …
         void Resolver::previsit( CaseStmt *caseStmt ) {
                 if ( caseStmt->get_condition() ) {
+                if ( caseStmt->condition ) {
                         std::list< InitAlternative > initAlts = currentObject.getOptions();
                         assertf( initAlts.size() == 1, "SwitchStmt did not correctly resolve an integral expression." );
 …
                         Expression * newExpr = new CastExpr( caseStmt->condition, initAlts.front().type->clone() );
                         findSingleExpression( newExpr, indexer );
+                        CastExpr * castExpr = strict_dynamic_cast< CastExpr * >( newExpr );
+                        caseStmt->condition = castExpr->arg;
+                        castExpr->arg = nullptr;
+                        delete castExpr;
+                        // case condition cannot have a cast in C, so it must be removed, regardless of whether it performs a conversion.
+                        // Ideally we would perform the conversion internally here.
+                        if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( newExpr ) ) {
+                                newExpr = castExpr->arg;
+                                castExpr->arg = nullptr;
+                                std::swap( newExpr->env, castExpr->env );
+                                delete castExpr;
+                        }
+                        caseStmt->condition = newExpr;
+                }
+        }
 …
                                 ss << strict_dynamic_cast<NameExpr*>( clause.target.function )->name;
                                 ss << "' in call to waitfor";
+                                throw SemanticError( ss.str() );
+                                SemanticError( stmt->location, ss.str() );
+                        }
+                        if(clause.target.arguments.empty()) {
+                                SemanticError( stmt->location, "Waitfor clause must have at least one mutex parameter");
+                        }
 …
                         //      try matching the arguments to the parameters
                         //      not the other way around because we have more arguments than parameters
                         SemanticError errors;
+                        SemanticErrorException errors;
                         for ( Alternative & func : funcFinder.get_alternatives() ) {
                                 try {
                                         PointerType * pointer = dynamic_cast< PointerType* >( func.expr->get_result()->stripReferences() );
                                         if( !pointer ) {
                                                 throw SemanticError( "candidate not viable: not a pointer type\n", func.expr->get_result() );
+                                                SemanticError( func.expr->get_result(), "candidate not viable: not a pointer type\n" );
+                                        }
                                         FunctionType * function = dynamic_cast< FunctionType* >( pointer->get_base() );
                                         if( !function ) {
                                                 throw SemanticError( "candidate not viable: not a function type\n", pointer->get_base() );
+                                                SemanticError( pointer->get_base(), "candidate not viable: not a function type\n" );
+                                        }
 …
                                                 if( !advance_to_mutex( param, param_end ) ) {
                                                         throw SemanticError("candidate function not viable: no mutex parameters\n", function);
+                                                        SemanticError(function, "candidate function not viable: no mutex parameters\n");
+                                                }
+                                        }
 …
                                         Alternative newFunc( func );
                                         // Strip reference from function
                                         referenceToRvalueConversion( newFunc.expr );
+                                        referenceToRvalueConversion( newFunc.expr, newFunc.cost );
                                         // For all the set of arguments we have try to match it with the parameter of the current function alternative
 …
                                                         OpenVarSet openVars;
                                                         AssertionSet resultNeed, resultHave;
+                                                        TypeEnvironment resultEnv;
+                                                        TypeEnvironment resultEnv( func.env );
+                                                        makeUnifiableVars( function, openVars, resultNeed );
+                                                        // add all type variables as open variables now so that those not used in the parameter
+                                                        // list are still considered open.
+                                                        resultEnv.add( function->forall );
                                                         // Load type variables from arguemnts into one shared space
 …
                                                         // 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     = function->parameters.begin();
                                                         auto param_end = function->parameters.end();
+                                                        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
                                                                         throw SemanticError("candidate function not viable: too many mutex arguments\n", function);
+                                                                        SemanticError( function, 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
                                                                 if( ! unify( (*param)->get_type(), arg.expr->get_result(), resultEnv, resultNeed, resultHave, openVars, this->indexer ) ) {
+                                                                if( ! unify( arg.expr->get_result(), (*param)->get_type(), resultEnv, resultNeed, resultHave, openVars, this->indexer ) ) {
                                                                         // Type doesn't match
                                                                         stringstream ss;
                                                                         ss << "candidate function not viable: no known convertion from '";
+                                                                        (*param)->get_type()->print( ss );
+                                                                        ss << "' to '";
                                                                         arg.expr->get_result()->print( ss );
                                                                         ss << "' to '";
                                                                         (*param)->get_type()->print( ss );
+                                                                        ss << "' with env '";
+                                                                        resultEnv.print(ss);
                                                                         ss << "'\n";
                                                                         throw SemanticError(ss.str(), function);
+                                                                        SemanticError( function, ss.str() );
+                                                                }
 …
                                                         // 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
                                                                 throw SemanticError("candidate function not viable: too few mutex arguments\n", function);
+                                                                SemanticError( function, toString("candidate function not viable: too few mutex arguments, expected ", n_mutex_param, "\n" ));
+                                                        }
 …
+                                                }
                                                 catch( SemanticError &e ) {
+                                                catch( SemanticErrorException &e ) {
                                                         errors.append( e );
+                                                }
+                                        }
+                                }
                                 catch( SemanticError &e ) {
+                                catch( SemanticErrorException &e ) {
                                         errors.append( e );
+                                }
 …
                         // Make sure we got the right number of arguments
                         if( func_candidates.empty() )    { SemanticError top( "No alternatives for function in call to waitfor"  ); top.append( errors ); throw top; }
                         if( args_candidates.empty() )    { SemanticError top( "No alternatives for arguments in call to waitfor" ); top.append( errors ); throw top; }
                         if( func_candidates.size() > 1 ) { SemanticError top( "Ambiguous function in call to waitfor"            ); top.append( errors ); throw top; }
                         if( args_candidates.size() > 1 ) { SemanticError top( "Ambiguous arguments in call to waitfor"           ); top.append( errors ); throw top; }
+                        if( func_candidates.empty() )    { SemanticErrorException top( stmt->location, "No alternatives for function in call to waitfor"  ); top.append( errors ); throw top; }
+                        if( args_candidates.empty() )    { SemanticErrorException top( stmt->location, "No alternatives for arguments in call to waitfor" ); top.append( errors ); throw top; }
+                        if( func_candidates.size() > 1 ) { SemanticErrorException top( stmt->location, "Ambiguous function in call to waitfor"            ); top.append( errors ); throw top; }
+                        if( args_candidates.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.
                         // Swap the results from the alternative with the unresolved values.
 …
+        }
-        bool isStructOrUnion( Type * t ) {
-                t = t->stripReferences();
-                return dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t );
+        }
-        void Resolver::previsit( WithStmt * withStmt ) {
-                for ( Expression *& expr : withStmt->exprs )  {
-                        TypeEnvironment env;
-                        AlternativeFinder finder( indexer, env );
-                        finder.findWithAdjustment( expr );
-                        // only struct- and union-typed expressions are viable candidates
-                        AltList candidates;
-                        for ( Alternative & alt : finder.get_alternatives() ) {
-                                if ( isStructOrUnion( alt.expr->result ) ) {
-                                        candidates.push_back( std::move( alt ) );
+                                }
+                        }
-                        // choose the lowest cost expression among the candidates
-                        AltList winners;
-                        findMinCost( candidates.begin(), candidates.end(), back_inserter( winners ) );
-                        if ( winners.size() == 0 ) {
-                                throw SemanticError( "No reasonable alternatives for with statement expression: ", expr );
-                        } else if ( winners.size() != 1 ) {
-                                std::ostringstream stream;
-                                stream << "Cannot choose between " << winners.size() << " alternatives for with statement expression\n";
-                                expr->print( stream );
-                                stream << "Alternatives are:\n";
-                                printAlts( winners, stream, 1 );
-                                throw SemanticError( stream.str() );
+                        }
-                        // there is one unambiguous interpretation - move the expression into the with statement
-                        Alternative & alt = winners.front();
-                        finishExpr( alt.expr, alt.env, expr->env );
-                        delete expr;
-                        expr = alt.expr;
-                        alt.expr = nullptr;
-                        // 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 );
-                                stmtsToAddBefore.push_back( new DeclStmt( tmp ) );
-                                if ( InitTweak::isConstructable( tmp->type ) ) {
-                                        // generate ctor/dtor and resolve them
-                                        tmp->init = InitTweak::genCtorInit( tmp );
-                                        tmp->accept( *visitor );
+                                }
+                        }
+                }
+        }
         template< typename T >
         bool isCharType( T t ) {
 …
                 initExpr->expr = nullptr;
                 std::swap( initExpr->env, newExpr->env );
+                std::swap( initExpr->inferParams, newExpr->inferParams ) ;
+                // 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;
 …
                 PassVisitor<Resolver> resolver( indexer );
                 stmtExpr->accept( resolver );
+                stmtExpr->computeResult();
+                // xxx - aggregate the environments from all statements? Possibly in AlternativeFinder instead?
+        }
 …
                 visit_children = false;
                 // xxx - fallback init has been removed => remove fallbackInit function and remove complexity from FixInit and remove C-init from ConstructorInit
                 maybeAccept( ctorInit->get_ctor(), *visitor );
                 maybeAccept( ctorInit->get_dtor(), *visitor );
+                maybeAccept( ctorInit->ctor, *visitor );
+                maybeAccept( ctorInit->dtor, *visitor );
                 // found a constructor - can get rid of C-style initializer
                 delete ctorInit->get_init();
                 ctorInit->set_init( NULL );
+                delete ctorInit->init;
+                ctorInit->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->get_ctor() ) ) {
                         delete ctorInit->get_ctor();
                         ctorInit->set_ctor( NULL );
+                }
                 if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->get_dtor() ) ) {
                         delete ctorInit->get_dtor();
                         ctorInit->set_dtor( NULL );
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->ctor ) ) {
+                        delete ctorInit->ctor;
+                        ctorInit->ctor = nullptr;
+                }
+                if ( InitTweak::isIntrinsicSingleArgCallStmt( ctorInit->dtor ) ) {
+                        delete ctorInit->dtor;
+                        ctorInit->dtor = nullptr;
+                }

src/ResolvExpr/Resolver.h

-              rf9feab8
+              r90152a4
         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 );
 } // namespace ResolvExpr

src/ResolvExpr/TypeEnvironment.cc

-              rf9feab8
+              r90152a4
 // 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 : Aaron B. Moss
+// Last Modified On : Mon Jun 18 11:58:00 2018
+// Update Count     : 4
 //
 …
 #include <algorithm>                   // for copy, set_intersection
 #include <iterator>                    // for ostream_iterator, insert_iterator
+#include <utility>                     // for pair
+#include <memory>                      // for unique_ptr
+#include <utility>                     // for pair, move
 #include "Common/utility.h"            // for maybeClone
 #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 {
 …
         void EqvClass::initialize( const EqvClass &src, EqvClass &dest ) {
+                initialize( src, dest, src.type );
+        }
+        void EqvClass::initialize( const EqvClass &src, EqvClass &dest, const Type *ty ) {
                 dest.vars = src.vars;
                 dest.type = maybeClone( src.type );
+                dest.type = maybeClone( ty );
                 dest.allowWidening = src.allowWidening;
                 dest.data = src.data;
+        }
         EqvClass::EqvClass() : type( 0 ), allowWidening( true ) {
+        EqvClass::EqvClass() : type( nullptr ), allowWidening( true ) {
+        }
         EqvClass::EqvClass( const EqvClass &other ) {
                 initialize( other, *this );
+        }
+        EqvClass::EqvClass( const EqvClass &other, const Type *ty ) {
+                initialize( other, *this, ty );
+        }
+        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=( 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;
+        }
 …
+        }
         bool TypeEnvironment::lookup( const std::string &var, EqvClass &eqvClass ) const {
+        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 );
+                                eqvClass = *i;
+                                return true;
+                        }
+///     std::cout << var << " is not in class ";
+///     i->print( std::cout );
+                } // for
+                return false;
+        }
+        void TypeEnvironment::add( const EqvClass &eqvClass ) {
+                std::list< EqvClass >::iterator i = env.begin();
+                while ( i != env.end() ) {
+                        std::list< EqvClass >::iterator next = i;
+                        next++;
+                        std::set< std::string > intersection;
+                        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 );
+                        } // if
+                        if ( i->vars.find( var ) != i->vars.end() ) return &*i;
+                } // for
+                return nullptr;
+        }
+        /// Removes any class from env that intersects eqvClass
+        void filterOverlappingClasses( std::list<EqvClass> &env, const EqvClass &eqvClass ) {
+                for ( auto i = env.begin(); i != env.end(); ) {
+                        auto next = i;
+                        ++next;
+                        std::set<std::string> intersection;
+                        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;
+                } // while
+                env.insert( env.end(), eqvClass );
+                }
+        }
+        void TypeEnvironment::add( EqvClass &&eqvClass ) {
+                filterOverlappingClasses( env, eqvClass );
+                env.push_back( std::move(eqvClass) );
+        }
 …
                         newClass.vars.insert( (*i)->get_name() );
                         newClass.data = TypeDecl::Data{ (*i) };
+                        env.push_back( newClass );
+                } // for
+                        env.push_back( std::move(newClass) );
+                } // for
+        }
+        void TypeEnvironment::add( const TypeSubstitution & sub ) {
+                EqvClass newClass;
+                for ( auto p : sub ) {
+                        newClass.vars.insert( p.first );
+                        newClass.type = p.second->clone();
+                        newClass.allowWidening = false;
+                        // Minimal assumptions. Not technically correct, but might be good enough, and
+                        // is the best we can do at the moment since information is lost in the
+                        // transition to TypeSubstitution
+                        newClass.data = TypeDecl::Data{ TypeDecl::Dtype, false };
+                        add( std::move(newClass) );
+                }
+        }
 …
                 for ( std::list< EqvClass >::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();
+        }
         void TypeEnvironment::print( std::ostream &os, Indenter indent ) const {
                 for ( std::list< EqvClass >::const_iterator i = env.begin(); i != env.end(); ++i ) {
                         i->print( os, indent );
+                for ( const EqvClass & theClass : env ) {
+                        theClass.print( os, indent );
                 } // for
+        }
 …
         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
+                        if ( i->vars.count( var ) ) return i;
                 } // for
                 return env.end();
 …
         void TypeEnvironment::simpleCombine( const TypeEnvironment &second ) {
                 env.insert( env.end(), second.env.begin(), second.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
+        }
 …
+        }
+        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 );
+                  default:
+                        assertf(false, "Unhandled tyvar kind: %d", data.kind);
+                } // switch
+                return false;
+        }
+        bool TypeEnvironment::bindVar( TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, 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->get_qualifiers() = typeInst->get_qualifiers();
+                                if ( unifyInexact( newType.get(), bindTo, *this, need, have, openVars, widenMode & 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 = widenMode.widenFirst && widenMode.widenSecond;
+                        } // if
+                } else {
+                        EqvClass newClass;
+                        newClass.vars.insert( typeInst->get_name() );
+                        newClass.type = bindTo->clone();
+                        newClass.type->get_qualifiers() = Type::Qualifiers();
+                        newClass.allowWidening = widenMode.widenFirst && widenMode.widenSecond;
+                        newClass.data = data;
+                        env.push_back( std::move(newClass) );
+                } // if
+                return true;
+        }
+        bool TypeEnvironment::bindVarToVar( TypeInstType *var1, TypeInstType *var2, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, 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 &= widenMode;
+                        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 = widenMode.widenFirst && 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 = widenMode.widenSecond && 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 );
+                                }
+                                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;
+                                env.erase( class2 );
+                        } else {
+                                class2->vars.insert( class1->vars.begin(), class1->vars.end() );
+                                class2->allowWidening = widen2;
+                                env.erase( class1 );
+                        } // if
+                } else if ( class1 != env.end() ) {
+                        // var2 unbound, add to class1
+                        class1->vars.insert( var2->get_name() );
+                        class1->allowWidening = widen1;
+                } else if ( class2 != env.end() ) {
+                        // var1 unbound, add to class2
+                        class2->vars.insert( var1->get_name() );
+                        class2->allowWidening = widen2;
+                } 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

-              rf9feab8
+              r90152a4
 // 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 : Aaron B. Moss
+// Last Modified On : Mon Jun 18 11:58:00 2018
+// Update Count     : 4
 //
 …
 #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...
 …
         //
         // 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.
         struct AssertCompare {
                 bool operator()( DeclarationWithType * d1, DeclarationWithType * d2 ) const {
 …
                 void initialize( const EqvClass &src, EqvClass &dest );
+                void initialize( const EqvClass &src, EqvClass &dest, const Type *ty );
                 EqvClass();
                 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 {
           public:
+                bool lookup( const std::string &var, EqvClass &eqvClass ) const;
+                void add( const EqvClass &eqvClass );
+                const EqvClass* lookup( const std::string &var ) const;
+          private:
+                void add( EqvClass &&eqvClass  );
+          public:
                 void add( const Type::ForallList &tyDecls );
+                void add( const TypeSubstitution & sub );
                 template< typename SynTreeClass > int apply( SynTreeClass *&type ) const;
                 template< typename SynTreeClass > int applyFree( SynTreeClass *&type ) const;
 …
                 bool isEmpty() const { return env.empty(); }
                 void print( std::ostream &os, Indenter indent = {} ) const;
                 void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) );
+                // void combine( const TypeEnvironment &second, Type *(*combineFunc)( Type*, Type* ) );
                 void simpleCombine( const TypeEnvironment &second );
                 void extractOpenVars( OpenVarSet &openVars ) const;
 …
                 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( TypeInstType *typeInst, Type *bindTo, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, 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( TypeInstType *var1, TypeInstType *var2, const TypeDecl::Data & data, AssertionSet &need, AssertionSet &have, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
+                /// Disallows widening for all bindings in the environment
+                void forbidWidening();
+                using iterator = std::list< EqvClass >::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 );
         };

src/ResolvExpr/Unify.cc

-              rf9feab8
+              r90152a4
 // 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 : Aaron B. Moss
+// Last Modified On : Mon Jun 18 11:58:00 2018
+// Update Count     : 43
 //
 …
 #include <set>                    // for set
 #include <string>                 // for string, operator==, operator!=, bas...
 #include <utility>                // for pair
+#include <utility>                // for pair, move
 #include "Common/PassVisitor.h"   // for PassVisitor
 …
 namespace ResolvExpr {
+        class Unify : public Visitor {
+          public:
+        struct Unify : public WithShortCircuiting {
                 Unify( Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, const OpenVarSet &openVars, WidenMode widenMode, const SymTab::Indexer &indexer );
                 bool get_result() const { return result; }
+                void previsit( 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 );
           private:
-                virtual void visit(VoidType *voidType);
-                virtual void visit(BasicType *basicType);
-                virtual void visit(PointerType *pointerType);
-                virtual void visit(ArrayType *arrayType);
-                virtual void visit(ReferenceType *refType);
-                virtual void visit(FunctionType *functionType);
-                virtual void visit(StructInstType *aggregateUseType);
-                virtual void visit(UnionInstType *aggregateUseType);
-                virtual void visit(EnumInstType *aggregateUseType);
-                virtual void visit(TraitInstType *aggregateUseType);
-                virtual void visit(TypeInstType *aggregateUseType);
-                virtual void visit(TupleType *tupleType);
-                virtual void visit(VarArgsType *varArgsType);
-                virtual void visit(ZeroType *zeroType);
-                virtual void visit(OneType *oneType);
                 template< typename RefType > void handleRefType( RefType *inst, Type *other );
                 template< typename RefType > void handleGenericRefType( RefType *inst, Type *other );
 …
+        }
-        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
-                EqvClass curClass;
-                if ( env.lookup( typeInst->get_name(), curClass ) ) {
-                        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();
-                                                delete curClass.type;
-                                                curClass.type = common;
-                                                env.add( curClass );
-                                        } // if
-                                        return true;
-                                } else {
-                                        return false;
-                                } // if
-                        } else {
-                                curClass.type = other->clone();
-                                curClass.type->get_qualifiers() = Type::Qualifiers();
-                                curClass.allowWidening = widenMode.widenFirst && widenMode.widenSecond;
-                                env.add( curClass );
-                        } // 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;
-                EqvClass class1, class2;
-                bool hasClass1 = false, hasClass2 = false;
-                bool widen1 = false, widen2 = false;
-                Type *type1 = 0, *type2 = 0;
-                if ( env.lookup( var1->get_name(), class1 ) ) {
-                        hasClass1 = true;
-                        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 ( env.lookup( var2->get_name(), class2 ) ) {
-                        hasClass2 = true;
-                        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 ) ) {
-                                class1.vars.insert( class2.vars.begin(), class2.vars.end() );
-                                class1.allowWidening = widen1 && widen2;
-                                if ( common ) {
-                                        common->get_qualifiers() = Type::Qualifiers();
-                                        delete class1.type;
-                                        class1.type = common;
-                                } // if
-                                env.add( class1 );
-                        } else {
-                                result = false;
-                        } // if
-                } else if ( hasClass1 && hasClass2 ) {
-                        if ( type1 ) {
-                                class1.vars.insert( class2.vars.begin(), class2.vars.end() );
-                                class1.allowWidening = widen1;
-                                env.add( class1 );
-                        } else {
-                                class2.vars.insert( class1.vars.begin(), class1.vars.end() );
-                                class2.allowWidening = widen2;
-                                env.add( class2 );
-                        } // if
-                } else if ( hasClass1 ) {
-                        class1.vars.insert( var2->get_name() );
-                        class1.allowWidening = widen1;
-                        env.add( class1 );
-                } else if ( hasClass2 ) {
-                        class2.vars.insert( var1->get_name() );
-                        class2.allowWidening = widen2;
-                        env.add( class2 );
-                } 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 unify( Type *type1, Type *type2, TypeEnvironment &env, AssertionSet &needAssertions, AssertionSet &haveAssertions, OpenVarSet &openVars, const SymTab::Indexer &indexer ) {
                 OpenVarSet closedVars;
 …
                 if ( isopen1 && isopen2 && entry1->second == entry2->second ) {
                         result = bindVarToVar( var1, var2, entry1->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                        result = env.bindVarToVar( var1, var2, entry1->second, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else if ( isopen1 ) {
                         result = bindVar( var1, type2, entry1->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else if ( isopen2 ) {
                         result = bindVar( var2, type1, entry2->second, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                        result = env.bindVar( var1, type2, entry1->second, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                } else if ( isopen2 ) { // TODO: swap widenMode values in call, since type positions are flipped?
+                        result = env.bindVar( var2, type1, entry2->second, needAssertions, haveAssertions, openVars, widenMode, indexer );
                 } else {
                         Unify comparator( type2, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
+                        PassVisitor<Unify> comparator( type2, env, needAssertions, haveAssertions, openVars, widenMode, indexer );
                         type1->accept( comparator );
                         result = comparator.get_result();
+                        result = comparator.pass.get_result();
                 } // if
 #ifdef DEBUG
 …
+        }
         void Unify::visit( __attribute__((unused)) VoidType *voidType) {
+        void Unify::postvisit( __attribute__((unused)) VoidType *voidType) {
                 result = dynamic_cast< VoidType* >( type2 );
+        }
         void Unify::visit(BasicType *basicType) {
+        void Unify::postvisit(BasicType *basicType) {
                 if ( BasicType *otherBasic = dynamic_cast< BasicType* >( type2 ) ) {
                         result = basicType->get_kind() == otherBasic->get_kind();
 …
+        }
         void Unify::visit(PointerType *pointerType) {
+        void Unify::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::visit(ReferenceType *refType) {
+        void Unify::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::visit(ArrayType *arrayType) {
+        void Unify::postvisit(ArrayType *arrayType) {
                 ArrayType *otherArray = dynamic_cast< ArrayType* >( type2 );
                 // to unify, array types must both be VLA or both not VLA
 …
                 void premutate( TypeInstType * ) { visit_children = false; }
                 Type * postmutate( TypeInstType * typeInst ) {
+                        EqvClass eqvClass;
+                        if ( tenv.lookup( typeInst->get_name(), eqvClass ) ) {
+                                if ( eqvClass.data.kind == TypeDecl::Ttype ) {
+                                        // expand ttype parameter into its actual type
+                                        if ( eqvClass.type ) {
+                                                delete typeInst;
+                                                return eqvClass.type->clone();
+                                        }
+                        if ( const EqvClass *eqvClass = tenv.lookup( typeInst->get_name() ) ) {
+                                // expand ttype parameter into its actual type
+                                if ( eqvClass->data.kind == TypeDecl::Ttype && eqvClass->type ) {
+                                        delete typeInst;
+                                        return eqvClass->type->clone();
+                                }
+                        }
 …
                         flatten( dcl->get_type(), back_inserter( types ) );
                         for ( 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.
+                                t->get_qualifiers() -= Type::Qualifiers(Type::Const | Type::Volatile | Type::Atomic);
                                 dst.push_back( new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::C, nullptr, t, nullptr ) );
+                        }
 …
+        }
         void Unify::visit(FunctionType *functionType) {
+        void Unify::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->get_parameters().size() == flatOther->get_parameters().size() && flatFunc->get_returnVals().size() == flatOther->get_returnVals().size()) || flatFunc->isTtype() || flatOther->isTtype() ) {
                                 if ( unifyDeclList( flatFunc->get_parameters().begin(), flatFunc->get_parameters().end(), flatOther->get_parameters().begin(), flatOther->get_parameters().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
                                         if ( unifyDeclList( flatFunc->get_returnVals().begin(), flatFunc->get_returnVals().end(), flatOther->get_returnVals().begin(), flatOther->get_returnVals().end(), env, needAssertions, haveAssertions, openVars, indexer ) ) {
+                        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 ) ) {
                                                 // the original types must be used in mark assertions, since pointer comparisons are used
 …
                 // check that other type is compatible and named the same
                 RefType *otherStruct = dynamic_cast< RefType* >( other );
                 result = otherStruct && inst->get_name() == otherStruct->get_name();
+                result = otherStruct && inst->name == otherStruct->name;
+        }
 …
                 if ( ! result ) return;
                 // Check that parameters of types unify, if any
                 std::list< Expression* > params = inst->get_parameters();
                 std::list< Expression* > otherParams = ((RefType*)other)->get_parameters();
+                std::list< Expression* > params = inst->parameters;
+                std::list< Expression* > otherParams = ((RefType*)other)->parameters;
                 std::list< Expression* >::const_iterator it = params.begin(), jt = otherParams.begin();
 …
+        }
         void Unify::visit(StructInstType *structInst) {
+        void Unify::postvisit(StructInstType *structInst) {
                 handleGenericRefType( structInst, type2 );
+        }
         void Unify::visit(UnionInstType *unionInst) {
+        void Unify::postvisit(UnionInstType *unionInst) {
                 handleGenericRefType( unionInst, type2 );
+        }
         void Unify::visit(EnumInstType *enumInst) {
+        void Unify::postvisit(EnumInstType *enumInst) {
                 handleRefType( enumInst, type2 );
+        }
         void Unify::visit(TraitInstType *contextInst) {
+        void Unify::postvisit(TraitInstType *contextInst) {
                 handleRefType( contextInst, type2 );
+        }
         void Unify::visit(TypeInstType *typeInst) {
+        void Unify::postvisit(TypeInstType *typeInst) {
                 assert( openVars.find( typeInst->get_name() ) == openVars.end() );
                 TypeInstType *otherInst = dynamic_cast< TypeInstType* >( type2 );
 …
+        }
         void Unify::visit(TupleType *tupleType) {
+        void Unify::postvisit(TupleType *tupleType) {
                 if ( TupleType *otherTuple = dynamic_cast< TupleType* >( type2 ) ) {
                         std::unique_ptr<TupleType> flat1( tupleType->clone() );
 …
+        }
         void Unify::visit( __attribute__((unused)) VarArgsType *varArgsType ) {
+        void Unify::postvisit( __attribute__((unused)) VarArgsType *varArgsType ) {
                 result = dynamic_cast< VarArgsType* >( type2 );
+        }
         void Unify::visit( __attribute__((unused)) ZeroType *zeroType ) {
+        void Unify::postvisit( __attribute__((unused)) ZeroType *zeroType ) {
                 result = dynamic_cast< ZeroType* >( type2 );
+        }
         void Unify::visit( __attribute__((unused)) OneType *oneType ) {
+        void Unify::postvisit( __attribute__((unused)) OneType *oneType ) {
                 result = dynamic_cast< OneType* >( type2 );
+        }

src/ResolvExpr/Unify.h

-              rf9feab8
+              r90152a4
 // 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 "SynTree/Declaration.h"  // for TypeDecl, TypeDecl::Data
 #include "TypeEnvironment.h"      // for AssertionSet, OpenVarSet
+#include "WidenMode.h"            // for WidenMode
 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 widenMode, const SymTab::Indexer &indexer, Type *&common );
         template< typename Iterator1, typename Iterator2 >

src/ResolvExpr/typeops.h

-              rf9feab8
+              r90152a4
         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
+        void adjustExprType( Type *& type );
         template< typename ForwardIterator >
         void adjustExprTypeList( ForwardIterator begin, ForwardIterator end, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
 …
         // in AlternativeFinder.cc
         void referenceToRvalueConversion( Expression *& expr );
+        void referenceToRvalueConversion( Expression *& expr, Cost & cost );
         // flatten tuple type into list of types

src/SymTab/Autogen.cc

-              rf9feab8
+              r90152a4
 // Author           : Rob Schluntz
 // Created On       : Thu Mar 03 15:45:56 2016
 // Last Modified By : Andrew Beach
 // Last Modified On : Fri Jul 14 16:41:00 2017
 // Update Count     : 62
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Apr 27 14:39:06 2018
+// Update Count     : 63
 //
 …
 #include <vector>                  // for vector
-#include "AddVisit.h"              // for addVisit
 #include "CodeGen/OperatorTable.h" // for isCtorDtor, isCtorDtorAssign
 #include "Common/PassVisitor.h"    // for PassVisitor
 …
                         definitions.push_back( dcl );
                         indexer.addId( dcl );
                 } catch ( SemanticError err ) {
+                } catch ( SemanticErrorException & ) {
                         // okay if decl does not resolve - that means the function should not be generated
                         delete dcl;
 …
                         paramType->attributes.clear();
                         // add a parameter corresponding to this field
+                        memCtorType->parameters.push_back( new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType, nullptr ) );
+                        ObjectDecl * param = new ObjectDecl( field->name, Type::StorageClasses(), LinkageSpec::Cforall, nullptr, paramType, nullptr );
+                        cloneAll_if( field->attributes, param->attributes, [](Attribute * attr) { return attr->isValidOnFuncParam(); } );
+                        memCtorType->parameters.push_back( param );
                         FunctionDecl * ctor = genFunc( "?{}", memCtorType->clone(), functionNesting );
                         makeFieldCtorBody( aggregateDecl->members.begin(), aggregateDecl->members.end(), ctor );

src/SymTab/FixFunction.cc

-              rf9feab8
+              r90152a4
                 // 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;
 …
+        }
+        // xxx - this passes on void[], e.g.
+        //   void foo(void [10]);
+        // does not cause an error
         Type * FixFunction::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(ZeroType *) { visit_children = false; }
         void FixFunction::premutate(OneType *) { visit_children = false; }
+        bool fixFunction( DeclarationWithType *& dwt ) {
+                PassVisitor<FixFunction> fixer;
+                dwt = dwt->acceptMutator( fixer );
+                return fixer.pass.isVoid;
+        }
 } // namespace SymTab

src/SymTab/FixFunction.h

rf9feab8	r90152a4
47	47	bool isVoid;
48	48	};
	49
	50	bool fixFunction( DeclarationWithType *& );
49	51	} // namespace SymTab
50	52

src/SymTab/Indexer.cc

-              rf9feab8
+              r90152a4
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for cloneAll
+#include "GenPoly/GenPoly.h"
 #include "InitTweak/InitTweak.h"   // for isConstructor, isCopyFunction, isC...
 #include "Mangler.h"               // for Mangler
 …
                 if ( ! CodeGen::isCtorDtorAssign( id ) ) return;
                 // helpful data structure
+                // helpful data structure to organize properties for a type
                 struct ValueType {
                         struct DeclBall {
+                        struct DeclBall { // properties for this particular decl
                                 IdData decl;
+                                bool isUserDefinedFunc; // properties for this particular decl
+                                bool isDefaultCtor;
+                                bool isDtor;
+                                bool isUserDefinedFunc;
                                 bool isCopyFunc;
                         };
                         // properties for this type
-                        bool existsUserDefinedFunc = false;    // any user-defined function found
-                        bool existsUserDefinedCtor = false;    // any user-defined constructor found
-                        bool existsUserDefinedDtor = false;    // any user-defined destructor found
                         bool existsUserDefinedCopyFunc = false;    // user-defined copy ctor found
                         bool existsUserDefinedDefaultCtor = false; // user-defined default ctor found
+                        BaseSyntaxNode * deleteStmt = nullptr;     // non-null if a user-defined function is found
                         std::list< DeclBall > decls;
 …
                         ValueType & operator+=( IdData data ) {
                                 DeclarationWithType * function = data.id;
+                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->get_linkage() );
+                                bool isDefaultCtor = InitTweak::isDefaultConstructor( function );
+                                bool isDtor = InitTweak::isDestructor( function );
+                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->get_name() );
+                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isDefaultCtor, isDtor, isCopyFunc } );
+                                existsUserDefinedFunc = existsUserDefinedFunc || isUserDefinedFunc;
+                                existsUserDefinedCtor = existsUserDefinedCtor || (isUserDefinedFunc && CodeGen::isConstructor( function->get_name() ) );
+                                existsUserDefinedDtor = existsUserDefinedDtor || (isUserDefinedFunc && isDtor);
+                                bool isUserDefinedFunc = ! LinkageSpec::isOverridable( function->linkage );
+                                bool isCopyFunc = InitTweak::isCopyFunction( function, function->name );
+                                decls.push_back( DeclBall{ data, isUserDefinedFunc, isCopyFunc } );
                                 existsUserDefinedCopyFunc = existsUserDefinedCopyFunc || (isUserDefinedFunc && isCopyFunc);
+                                existsUserDefinedDefaultCtor = existsUserDefinedDefaultCtor || (isUserDefinedFunc && isDefaultCtor);
+                                if ( isUserDefinedFunc && ! 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;
+                        }
 …
                 for ( auto decl : copy ) {
                         if ( FunctionDecl * function = dynamic_cast< FunctionDecl * >( decl.id ) ) {
                                 std::list< DeclarationWithType * > & params = function->get_functionType()->get_parameters();
+                                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.
 …
                 // if a type contains user defined ctor/dtor/assign, then special rules trigger, which determine
+                // the set of ctor/dtor/assign that are seen by the requester. In particular, if the user defines
+                // a default ctor, then the generated default ctor should never be seen, likewise for copy ctor
+                // and dtor. If the user defines any ctor/dtor, then no generated field ctors should be seen.
+                // If the user defines any ctor then the generated default ctor should not be seen (intrinsic default
+                // ctor must be overridden exactly).
+                // 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 noUserDefinedFunc = ! val.existsUserDefinedFunc;
+                                bool isUserDefinedFunc = ball.isUserDefinedFunc;
+                                bool isAcceptableDefaultCtor = (! val.existsUserDefinedCtor || (! val.existsUserDefinedDefaultCtor && ball.decl.id->get_linkage() == LinkageSpec::Intrinsic)) && ball.isDefaultCtor; // allow default constructors only when no user-defined constructors exist, except in the case of intrinsics, which require exact overrides
+                                bool isAcceptableCopyFunc = ! val.existsUserDefinedCopyFunc && ball.isCopyFunc; // handles copy ctor and assignment operator
+                                bool isAcceptableDtor = ! val.existsUserDefinedDtor && ball.isDtor;
+                                if ( noUserDefinedFunc || isUserDefinedFunc || isAcceptableDefaultCtor || isAcceptableCopyFunc || isAcceptableDtor ) {
+                                        // decl conforms to the rules described above, so it should be seen by the requester
+                                        out.push_back( ball.decl );
+                                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). If a  user-defined copy function exists,
+                                // do not pass along the non-user-defined copy functions since signatures do not have to match,
+                                // and the generated functions will often be cheaper.
+                                if ( isNotUserDefinedFunc ) {
+                                        if ( isCopyFunc ) {
+                                                // Skip over non-user-defined copy functions when there is a user-defined copy function.
+                                                // Since their signatures do not have to be exact, deleting them is the wrong choice.
+                                                if ( existsUserDefinedCopyFunc ) continue;
+                                        } else {
+                                                // delete non-user-defined non-copy functions if applicable.
+                                                // deleteStmt will be non-null only if a user-defined function is found.
+                                                ball.decl.deleteStmt = val.deleteStmt;
+                                        }
+                                }
+                                out.push_back( ball.decl );
+                        }
+                }
 …
+        }
+        NamedTypeDecl *Indexer::globalLookupType( const std::string &id ) const {
+                return lookupTypeAtScope( id, 0 );
+        }
+        StructDecl *Indexer::globalLookupStruct( const std::string &id ) const {
+                return lookupStructAtScope( id, 0 );
+        }
+        UnionDecl *Indexer::globalLookupUnion( const std::string &id ) const {
+                return lookupUnionAtScope( id, 0 );
+        }
+        EnumDecl *Indexer::globalLookupEnum( const std::string &id ) const {
+                return lookupEnumAtScope( id, 0 );
+        }
         EnumDecl *Indexer::lookupEnum( const std::string &id ) const {
                 if ( ! tables ) return 0;
 …
+        }
         DeclarationWithType *Indexer::lookupIdAtScope( const std::string &id, const std::string &mangleName, unsigned long scope ) const {
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+        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 );
 …
                         const MangleTable &mangleTable = decls->second;
                         MangleTable::const_iterator decl = mangleTable.find( mangleName );
                         if ( decl != mangleTable.end() ) return decl->second.id;
+                        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 ));
+        }
 …
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTypeAtScope( id, scope );
                 TypeTable::const_iterator ret = tables->typeTable.find( id );
 …
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupStructAtScope( id, scope );
                 StructTable::const_iterator ret = tables->structTable.find( id );
 …
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupEnumAtScope( id, scope );
                 EnumTable::const_iterator ret = tables->enumTable.find( id );
 …
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupUnionAtScope( id, scope );
                 UnionTable::const_iterator ret = tables->unionTable.find( id );
 …
                 if ( ! tables ) return 0;
                 if ( tables->scope < scope ) return 0;
+                if ( tables->scope > scope ) return tables->base.lookupTraitAtScope( id, scope );
                 TraitTable::const_iterator ret = tables->traitTable.find( id );
 …
+        }
+        bool addedIdConflicts( DeclarationWithType *existing, DeclarationWithType *added ) {
+        bool isFunction( DeclarationWithType * decl ) {
+                return GenPoly::getFunctionType( decl->get_type() );
+        }
+        bool isObject( DeclarationWithType * decl ) {
+                return ! isFunction( decl );
+        }
+        bool isDefinition( DeclarationWithType * decl ) {
+                if ( FunctionDecl * func = dynamic_cast< FunctionDecl * >( decl ) ) {
+                        // a function is a definition if it has a body
+                        return func->statements;
+                } else {
+                        // an object is a definition if it is not marked extern.
+                        // both objects must be marked extern
+                        return ! decl->get_storageClasses().is_extern;
+                }
+        }
+        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
                 assert( (dynamic_cast<ObjectDecl*>( added ) && dynamic_cast<ObjectDecl*>( existing ) )
                         || (dynamic_cast<FunctionDecl*>( added ) && dynamic_cast<FunctionDecl*>( existing ) ) );
                 if ( LinkageSpec::isOverridable( existing->get_linkage() ) ) {
+                assert( (isObject( added ) && isObject( existing.id ) )
+                        || ( isFunction( added ) && isFunction( existing.id ) ) );
+                if ( LinkageSpec::isOverridable( existing.id->get_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->get_type(), Indexer() ) ) {
+                        // typesCompatible doesn't really do the right thing here. When checking compatibility of function types,
+                        // we should ignore outermost pointer qualifiers, except _Atomic?
+                        FunctionDecl *newentry = dynamic_cast< FunctionDecl* >( added );
+                        FunctionDecl *oldentry = dynamic_cast< FunctionDecl* >( existing );
+                        if ( newentry && oldentry ) {
+                                if ( newentry->get_statements() && oldentry->get_statements() ) {
+                                        throw SemanticError( "duplicate function definition for ", added );
+                                } // if
+                        } else {
+                                // two objects with the same mangled name defined in the same scope.
+                                // both objects must be marked extern or both must be intrinsic for this to be okay
+                                // xxx - perhaps it's actually if either is intrinsic then this is okay?
+                                //       might also need to be same storage class?
+                                ObjectDecl *newobj = dynamic_cast< ObjectDecl* >( added );
+                                ObjectDecl *oldobj = dynamic_cast< ObjectDecl* >( existing );
+                                if ( ! newobj->get_storageClasses().is_extern && ! oldobj->get_storageClasses().is_extern ) {
+                                        throw SemanticError( "duplicate object definition for ", added );
+                } else if ( LinkageSpec::isMangled( added->get_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 " );
+                        } else if ( ! deleteStmt && existing.deleteStmt ) {
+                                return handleConflicts( existing, "definition of deleted identifier " );
+                        }
+                        if ( isDefinition( added ) && isDefinition( existing.id ) ) {
+                                if ( isFunction( added ) ) {
+                                        return handleConflicts( existing, "duplicate function definition for " );
+                                } else {
+                                        return handleConflicts( existing, "duplicate object definition for " );
                                 } // if
                         } // if
                 } else {
                         throw SemanticError( "duplicate definition for ", added );
+                        return handleConflicts( existing, "duplicate definition for " );
                 } // if
 …
+        }
+        void Indexer::addId( DeclarationWithType *decl, Expression * baseExpr ) {
+        void Indexer::addId( DeclarationWithType *decl, ConflictFunction handleConflicts, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) {
+                if ( decl->name == "" ) return;
                 debugPrint( "Adding Id " << decl->name << std::endl );
                 makeWritable();
 …
                         // isomorphic to C type-compatibility, which it may not be.
                         if ( hasIncompatibleCDecl( name, mangleName, scope ) ) {
                                 throw SemanticError( "conflicting overload of C function ", decl );
+                        }
                 } else {
                         // Check that a Cforall declaration doesn't overload any C declaration
+                                SemanticError( decl, "conflicting overload of C function " );
+                        }
+                } else {
+                        // Check that a Cforall declaration doesn't override any C declaration
                         if ( hasCompatibleCDecl( name, mangleName, scope ) ) {
                                 throw SemanticError( "Cforall declaration hides C function ", decl );
+                                SemanticError( decl, "Cforall declaration hides C function " );
+                        }
+                }
                 // Skip repeat declarations of the same identifier
                 DeclarationWithType *existing = lookupIdAtScope( name, mangleName, scope );
                 if ( existing && addedIdConflicts( existing, decl ) ) return;
+                IdData * existing = lookupIdAtScope( name, mangleName, scope );
+                if ( existing && existing->id && addedIdConflicts( *existing, decl, deleteStmt, handleConflicts ) ) return;
                 // add to indexer
                 tables->idTable[ name ][ mangleName ] = { decl, baseExpr };
+                tables->idTable[ name ][ mangleName ] = IdData{ decl, baseExpr, deleteStmt };
                 ++tables->size;
+        }
+        void Indexer::addId( DeclarationWithType * decl, 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 ) {
+                // 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 ) {
+                if ( existing->base == nullptr ) {
                         return false;
                 } else if ( added->get_base() == 0 ) {
+                } else if ( added->base == nullptr ) {
                         return true;
                 } else {
+                        throw SemanticError( "redeclaration of ", 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;
+        }
 …
                 makeWritable();
                 const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TypeTable::iterator existing = tables->typeTable.find( id );
                 if ( existing == tables->typeTable.end() ) {
 …
         bool addedDeclConflicts( AggregateDecl *existing, AggregateDecl *added ) {
                 if ( existing->get_members().empty() ) {
+                if ( ! existing->body ) {
                         return false;
                 } else if ( ! added->get_members().empty() ) {
                         throw SemanticError( "redeclaration of ", added );
+                } else if ( added->body ) {
+                        SemanticError( added, "redeclaration of " );
                 } // if
                 return true;
 …
                 makeWritable();
                 const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 StructTable::iterator existing = tables->structTable.find( id );
                 if ( existing == tables->structTable.end() ) {
 …
                 makeWritable();
                 const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 EnumTable::iterator existing = tables->enumTable.find( id );
                 if ( existing == tables->enumTable.end() ) {
 …
                 makeWritable();
                 const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 UnionTable::iterator existing = tables->unionTable.find( id );
                 if ( existing == tables->unionTable.end() ) {
 …
                 makeWritable();
                 const std::string &id = decl->get_name();
+                const std::string &id = decl->name;
                 TraitTable::iterator existing = tables->traitTable.find( id );
                 if ( existing == tables->traitTable.end() ) {
 …
+        }
+        void Indexer::addWith( WithStmt * stmt ) {
+                for ( Expression * expr : stmt->exprs ) {
+        void Indexer::addMembers( AggregateDecl * aggr, Expression * expr, ConflictFunction 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 ) ) {
+                                                Expression * base = expr->clone();
+                                                ResolvExpr::Cost cost = ResolvExpr::Cost::zero; // xxx - carry this cost into the indexer as a base cost?
+                                                ResolvExpr::referenceToRvalueConversion( base, cost );
+                                                addMembers( t->getAggr(), new MemberExpr( dwt, base ), handleConflicts );
+                                        }
+                                }
+                        }
+                }
+        }
+        void Indexer::addWith( std::list< Expression * > & withExprs, BaseSyntaxNode * withStmt ) {
+                for ( 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() );
                                 for ( Declaration * decl : aggr->members ) {
                                         if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
                                                 addId( dwt, expr );
+                                        }
+                                }
+                                addMembers( aggr, expr, [withStmt](IdData & existing, const std::string &) {
+                                        // on conflict, delete the identifier
+                                        existing.deleteStmt = withStmt;
+                                        return true;
+                                });
+                        }
+                }
 …
         void Indexer::print( std::ostream &os, int indent ) const {
             using std::cerr;
+                using std::cerr;
                 if ( tables ) {
 …
+        }
+        Expression * Indexer::IdData::combine() const {
+        Expression * Indexer::IdData::combine( ResolvExpr::Cost & cost ) const {
+                Expression * ret = nullptr;
                 if ( baseExpr ) {
                         Expression * base = baseExpr->clone();
                         ResolvExpr::referenceToRvalueConversion( base );
                         Expression * ret = new MemberExpr( id, base );
+                        ResolvExpr::referenceToRvalueConversion( base, cost );
+                        ret = new MemberExpr( id, base );
                         // xxx - this introduces hidden environments, for now remove them.
                         // std::swap( base->env, ret->env );
                         delete base->env;
                         base->env = nullptr;
+                        return ret;
+                } else {
+                        return new VariableExpr( id );
+                }
+                } else {
+                        ret = new VariableExpr( id );
+                }
+                if ( deleteStmt ) ret = new DeletedExpr( ret, deleteStmt );
+                return ret;
+        }
 } // namespace SymTab

src/SymTab/Indexer.h

-              rf9feab8
+              r90152a4
 #include <list>               // for list
 #include <string>             // for string
+#include <functional>         // for function
 #include "SynTree/Visitor.h"  // for Visitor
 #include "SynTree/SynTree.h"  // for AST nodes
+namespace ResolvExpr {
+class Cost;
+}
 namespace SymTab {
 …
                 struct IdData {
                         DeclarationWithType * id;
                         Expression * baseExpr; // WithExpr
+                        DeclarationWithType * id = nullptr;
+                        Expression * baseExpr = nullptr; // WithExpr
+                        Expression * combine() const;
+                        /// non-null if this declaration is deleted
+                        BaseSyntaxNode * deleteStmt = nullptr;
+                        // 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 ) {}
+                        Expression * combine( ResolvExpr::Cost & cost ) const;
                 };
 …
                 TraitDecl *lookupTrait( const std::string &id ) const;
+                /// Gets the type declaration with the given ID at global scope
+                NamedTypeDecl *globalLookupType( const std::string &id ) const;
+                /// Gets the struct declaration with the given ID at global scope
+                StructDecl *globalLookupStruct( const std::string &id ) const;
+                /// Gets the union declaration with the given ID at global scope
+                UnionDecl *globalLookupUnion( const std::string &id ) const;
+                /// Gets the enum declaration with the given ID at global scope
+                EnumDecl *globalLookupEnum( const std::string &id ) const;
                 void print( std::ostream &os, int indent = 0 ) const;
                 /// looks up a specific mangled ID at the given scope
+                DeclarationWithType *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 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;
 …
                 TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
+                void addId( DeclarationWithType *decl, Expression * baseExpr = nullptr );
+                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 );
 …
                 /// adds all of the IDs from WithStmt exprs
+                void addWith( WithStmt * );
+                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 );
                 /// convenience function for adding a list of Ids to the indexer
 …
                 /// Ensures that tables variable is writable (i.e. allocated, uniquely owned by this Indexer, and at the current scope)
                 void makeWritable();
+                /// common code for addId, addDeletedId, etc.
+                void addId( DeclarationWithType * decl, ConflictFunction, Expression * baseExpr = nullptr, BaseSyntaxNode * deleteStmt = nullptr );
         };
 } // namespace SymTab

src/SymTab/Mangler.cc

-              rf9feab8
+              r90152a4
 #include "CodeGen/OperatorTable.h"  // for OperatorInfo, operatorLookup
+#include "Common/PassVisitor.h"
 #include "Common/SemanticError.h"   // for SemanticError
 #include "Common/utility.h"         // for toString
 …
 namespace SymTab {
+        std::string Mangler::mangleType( Type * ty ) {
+                Mangler mangler( false, true, true );
+                maybeAccept( ty, mangler );
+                return mangler.get_mangleName();
+        }
+        std::string Mangler::mangleConcrete( Type* ty ) {
+                Mangler mangler( false, false, false );
+                maybeAccept( ty, mangler );
+                return mangler.get_mangleName();
+        }
+        Mangler::Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams )
+                : nextVarNum( 0 ), isTopLevel( true ), mangleOverridable( mangleOverridable ), typeMode( typeMode ), mangleGenericParams( mangleGenericParams ) {}
+        Mangler::Mangler( const Mangler &rhs ) : mangleName() {
+                varNums = rhs.varNums;
+                nextVarNum = rhs.nextVarNum;
+                isTopLevel = rhs.isTopLevel;
+                mangleOverridable = rhs.mangleOverridable;
+                typeMode = rhs.typeMode;
+        }
+        void Mangler::mangleDecl( DeclarationWithType * declaration ) {
+                bool wasTopLevel = isTopLevel;
+                if ( isTopLevel ) {
+                        varNums.clear();
+                        nextVarNum = 0;
+                        isTopLevel = false;
+                } // if
+                mangleName << "__";
+                CodeGen::OperatorInfo opInfo;
+                if ( operatorLookup( declaration->get_name(), opInfo ) ) {
+                        mangleName << opInfo.outputName;
+                } else {
+                        mangleName << declaration->get_name();
+                } // if
+                mangleName << "__";
+                maybeAccept( declaration->get_type(), *this );
+                if ( mangleOverridable && LinkageSpec::isOverridable( declaration->get_linkage() ) ) {
+                        // want to be able to override autogenerated and intrinsic routines,
+                        // so they need a different name mangling
+                        if ( declaration->get_linkage() == LinkageSpec::AutoGen ) {
+                                mangleName << "autogen__";
+                        } else if ( declaration->get_linkage() == LinkageSpec::Intrinsic ) {
+                                mangleName << "intrinsic__";
+                        } else {
+                                // if we add another kind of overridable function, this has to change
+                                assert( false && "unknown overrideable linkage" );
+                        } // if
+        namespace Mangler {
+                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 );
+                                void postvisit( 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
+                                void mangleDecl( DeclarationWithType *declaration );
+                                void mangleRef( ReferenceToType *refType, std::string prefix );
+                                void printQualifiers( Type *type );
+                        }; // Mangler
+                } // namespace
+                std::string mangle( BaseSyntaxNode * decl, bool mangleOverridable, bool typeMode, bool mangleGenericParams ) {
+                        PassVisitor<Mangler> mangler( mangleOverridable, typeMode, mangleGenericParams );
+                        maybeAccept( decl, mangler );
+                        return mangler.pass.get_mangleName();
+                }
+                isTopLevel = wasTopLevel;
+        }
+        void Mangler::visit( ObjectDecl * declaration ) {
+                mangleDecl( declaration );
+        }
+        void Mangler::visit( FunctionDecl * declaration ) {
+                mangleDecl( declaration );
+        }
+        void Mangler::visit( VoidType * voidType ) {
+                printQualifiers( voidType );
+                mangleName << "v";
+        }
+        void Mangler::visit( 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
+                };
+                printQualifiers( basicType );
+                mangleName << btLetter[ basicType->get_kind() ];
+        }
+        void Mangler::visit( PointerType * pointerType ) {
+                printQualifiers( pointerType );
+                mangleName << "P";
+                maybeAccept( pointerType->get_base(), *this );
+        }
+        void Mangler::visit( ArrayType * arrayType ) {
+                // TODO: encode dimension
+                printQualifiers( arrayType );
+                mangleName << "A0";
+                maybeAccept( arrayType->get_base(), *this );
+        }
+        void Mangler::visit( ReferenceType * refType ) {
+                printQualifiers( refType );
+                mangleName << "R";
+                maybeAccept( refType->get_base(), *this );
+        }
+        namespace {
+                inline std::list< Type* > getTypes( const std::list< DeclarationWithType* > decls ) {
+                        std::list< Type* > ret;
+                        std::transform( decls.begin(), decls.end(), std::back_inserter( ret ),
+                                                        std::mem_fun( &DeclarationWithType::get_type ) );
+                        return ret;
+                std::string mangleType( Type * ty ) {
+                        PassVisitor<Mangler> mangler( false, true, true );
+                        maybeAccept( ty, mangler );
+                        return mangler.pass.get_mangleName();
+                }
+        }
+        void Mangler::visit( FunctionType * functionType ) {
+                printQualifiers( functionType );
+                mangleName << "F";
+                std::list< Type* > returnTypes = getTypes( functionType->get_returnVals() );
+                acceptAll( returnTypes, *this );
+                mangleName << "_";
+                std::list< Type* > paramTypes = getTypes( functionType->get_parameters() );
+                acceptAll( paramTypes, *this );
+                mangleName << "_";
+        }
+        void Mangler::mangleRef( ReferenceToType * refType, std::string prefix ) {
+                printQualifiers( refType );
+                mangleName << ( refType->get_name().length() + prefix.length() ) << prefix << refType->get_name();
+                if ( mangleGenericParams ) {
+                        std::list< Expression* >& params = refType->get_parameters();
+                        if ( ! params.empty() ) {
+                std::string mangleConcrete( Type * ty ) {
+                        PassVisitor<Mangler> 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 ) {
+                                bool wasTopLevel = isTopLevel;
+                                if ( isTopLevel ) {
+                                        varNums.clear();
+                                        nextVarNum = 0;
+                                        isTopLevel = false;
+                                } // if
+                                mangleName << Encoding::manglePrefix;
+                                CodeGen::OperatorInfo opInfo;
+                                if ( operatorLookup( declaration->get_name(), opInfo ) ) {
+                                        mangleName << opInfo.outputName.size() << opInfo.outputName;
+                                } else {
+                                        mangleName << declaration->name.size() << declaration->name;
+                                } // if
+                                maybeAccept( declaration->get_type(), *visitor );
+                                if ( mangleOverridable && LinkageSpec::isOverridable( declaration->get_linkage() ) ) {
+                                        // want to be able to override autogenerated and intrinsic routines,
+                                        // so they need a different name mangling
+                                        if ( declaration->get_linkage() == LinkageSpec::AutoGen ) {
+                                                mangleName << Encoding::autogen;
+                                        } else if ( declaration->get_linkage() == LinkageSpec::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::postvisit( ObjectDecl * declaration ) {
+                                mangleDecl( declaration );
+                        }
+                        void Mangler::postvisit( FunctionDecl * declaration ) {
+                                mangleDecl( declaration );
+                        }
+                        void Mangler::postvisit( VoidType * voidType ) {
+                                printQualifiers( voidType );
+                                mangleName << Encoding::void_t;
+                        }
+                        void Mangler::postvisit( BasicType * basicType ) {
+                                printQualifiers( basicType );
+                                assertf( basicType->get_kind() < BasicType::NUMBER_OF_BASIC_TYPES, "Unhandled basic type: %d", basicType->get_kind() );
+                                mangleName << Encoding::basicTypes[ basicType->get_kind() ];
+                        }
+                        void Mangler::postvisit( 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 << Encoding::pointer;
+                                maybeAccept( pointerType->base, *visitor );
+                        }
+                        void Mangler::postvisit( ArrayType * arrayType ) {
+                                // TODO: encode dimension
+                                printQualifiers( arrayType );
+                                mangleName << Encoding::array << "0";
+                                maybeAccept( arrayType->base, *visitor );
+                        }
+                        void Mangler::postvisit( 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, *visitor );
+                        }
+                        namespace {
+                                inline std::list< Type* > getTypes( const std::list< DeclarationWithType* > decls ) {
+                                        std::list< Type* > ret;
+                                        std::transform( decls.begin(), decls.end(), std::back_inserter( ret ),
+                                                                        std::mem_fun( &DeclarationWithType::get_type ) );
+                                        return ret;
+                                }
+                        }
+                        void Mangler::postvisit( 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::list< Type* > returnTypes = getTypes( functionType->returnVals );
+                                if (returnTypes.empty()) mangleName << Encoding::void_t;
+                                else acceptAll( returnTypes, *visitor );
                                 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", toString(*param).c_str());
+                                        maybeAccept( paramType->get_type(), *this );
+                                }
+                                std::list< Type* > paramTypes = getTypes( functionType->parameters );
+                                acceptAll( paramTypes, *visitor );
                                 mangleName << "_";
+                        }
+                }
+        }
+        void Mangler::visit( StructInstType * aggregateUseType ) {
+                mangleRef( aggregateUseType, "s" );
+        }
+        void Mangler::visit( UnionInstType * aggregateUseType ) {
+                mangleRef( aggregateUseType, "u" );
+        }
+        void Mangler::visit( EnumInstType * aggregateUseType ) {
+                mangleRef( aggregateUseType, "e" );
+        }
+        void Mangler::visit( TypeInstType * typeInst ) {
+                VarMapType::iterator varNum = varNums.find( typeInst->get_name() );
+                if ( varNum == varNums.end() ) {
+                        mangleRef( typeInst, "t" );
+                } 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::visit( TupleType * tupleType ) {
+                printQualifiers( tupleType );
+                mangleName << "T";
+                acceptAll( tupleType->types, *this );
+                mangleName << "_";
+        }
+        void Mangler::visit( VarArgsType * varArgsType ) {
+                printQualifiers( varArgsType );
+                mangleName << "VARGS";
+        }
+        void Mangler::visit( ZeroType * ) {
+                mangleName << "Z";
+        }
+        void Mangler::visit( OneType * ) {
+                mangleName << "O";
+        }
+        void Mangler::visit( TypeDecl * decl ) {
+                static const char *typePrefix[] = { "BT", "BD", "BF" };
+                mangleName << typePrefix[ decl->get_kind() ] << ( decl->name.length() + 1 ) << decl->name;
+        }
+        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::printQualifiers( Type * type ) {
+                // skip if not including qualifiers
+                if ( typeMode ) return;
+                if ( ! type->get_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() ) {
+                                  case TypeDecl::Dtype:
+                                        dcount++;
+                                        break;
+                                  case TypeDecl::Ftype:
+                                        fcount++;
+                                        break;
+                                  case TypeDecl::Ttype:
+                                        vcount++;
+                                        break;
+                                  default:
+                                        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 ) {
+                                        Mangler sub_mangler( mangleOverridable, typeMode, mangleGenericParams );
+                                        sub_mangler.nextVarNum = nextVarNum;
+                                        sub_mangler.isTopLevel = false;
+                                        sub_mangler.varNums = varNums;
+                                        (*assert)->accept( sub_mangler );
+                                        assertionNames.push_back( sub_mangler.mangleName.str() );
+                        void Mangler::mangleRef( ReferenceToType * refType, std::string prefix ) {
+                                printQualifiers( refType );
+                                mangleName << prefix << refType->name.length() << refType->name;
+                                if ( mangleGenericParams ) {
+                                        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));
+                                                        maybeAccept( paramType->type, *visitor );
+                                                }
+                                                mangleName << "_";
+                                        }
+                                }
+                        }
+                        void Mangler::postvisit( StructInstType * aggregateUseType ) {
+                                mangleRef( aggregateUseType, Encoding::struct_t );
+                        }
+                        void Mangler::postvisit( UnionInstType * aggregateUseType ) {
+                                mangleRef( aggregateUseType, Encoding::union_t );
+                        }
+                        void Mangler::postvisit( EnumInstType * aggregateUseType ) {
+                                mangleRef( aggregateUseType, Encoding::enum_t );
+                        }
+                        void Mangler::postvisit( TypeInstType * typeInst ) {
+                                VarMapType::iterator varNum = varNums.find( typeInst->get_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::postvisit( TraitInstType * inst ) {
+                                printQualifiers( inst );
+                                mangleName << inst->name.size() << inst->name;
+                        }
+                        void Mangler::postvisit( TupleType * tupleType ) {
+                                printQualifiers( tupleType );
+                                mangleName << Encoding::tuple << tupleType->types.size();
+                                acceptAll( tupleType->types, *visitor );
+                        }
+                        void Mangler::postvisit( VarArgsType * varArgsType ) {
+                                printQualifiers( varArgsType );
+                                static const std::string vargs = "__builtin_va_list";
+                                mangleName << Encoding::type << vargs.size() << vargs;
+                        }
+                        void Mangler::postvisit( ZeroType * ) {
+                                mangleName << Encoding::zero;
+                        }
+                        void Mangler::postvisit( OneType * ) {
+                                mangleName << Encoding::one;
+                        }
+                        void Mangler::postvisit( 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::postvisit( 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 should not visit typedecl: %s", toCString(decl));
+                                assertf( decl->get_kind() < TypeDecl::NUMBER_OF_KINDS, "Unhandled type variable kind: %d", decl->get_kind() );
+                                mangleName << Encoding::typeVariables[ decl->get_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
+                        } // for
+                        mangleName << tcount << "_" << dcount << "_" << fcount << "_" << vcount << "_";
+                        std::copy( assertionNames.begin(), assertionNames.end(), std::ostream_iterator< std::string >( mangleName, "" ) );
+                        mangleName << "_";
+                } // if
+                if ( type->get_const() ) {
+                        mangleName << "C";
+                } // if
+                if ( type->get_volatile() ) {
+                        mangleName << "V";
+                } // if
+                if ( type->get_mutex() ) {
+                        mangleName << "M";
+                } // if
+                // Removed due to restrict not affecting function compatibility in GCC
+//              if ( type->get_isRestrict() ) {
+//                      mangleName << "E";
+//              } // if
+                if ( type->get_lvalue() ) {
+                        // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
+                        mangleName << "L";
+                }
+                if ( type->get_atomic() ) {
+                        mangleName << "A";
+                } // if
+        }
+                        }
+                        void Mangler::printQualifiers( Type * type ) {
+                                // skip if not including qualifiers
+                                if ( typeMode ) return;
+                                if ( ! type->get_forall().empty() ) {
+                                        std::list< std::string > assertionNames;
+                                        int dcount = 0, fcount = 0, vcount = 0, acount = 0;
+                                        mangleName << Encoding::forall;
+                                        for ( Type::ForallList::iterator i = type->forall.begin(); i != type->forall.end(); ++i ) {
+                                                switch ( (*i)->get_kind() ) {
+                                                  case TypeDecl::Dtype:
+                                                        dcount++;
+                                                        break;
+                                                  case TypeDecl::Ftype:
+                                                        fcount++;
+                                                        break;
+                                                  case TypeDecl::Ttype:
+                                                        vcount++;
+                                                        break;
+                                                  default:
+                                                        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() );
+                                                        acount++;
+                                                } // for
+                                        } // for
+                                        mangleName << dcount << "_" << fcount << "_" << vcount << "_" << acount << "_";
+                                        std::copy( assertionNames.begin(), assertionNames.end(), std::ostream_iterator< std::string >( mangleName, "" ) );
+                                        mangleName << "_";
+                                } // if
+                                if ( ! inFunctionType ) {
+                                        // these qualifiers do not distinguish the outermost type of a function parameter
+                                        if ( type->get_const() ) {
+                                                mangleName << Encoding::qualifiers.at(Type::Const);
+                                        } // if
+                                        if ( type->get_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->get_atomic() ) {
+                                                mangleName << Encoding::qualifiers.at(Type::Atomic);
+                                        } // if
+                                }
+                                if ( type->get_mutex() ) {
+                                        mangleName << Encoding::qualifiers.at(Type::Mutex);
+                                } // if
+                                if ( type->get_lvalue() ) {
+                                        // mangle based on whether the type is lvalue, so that the resolver can differentiate lvalues and rvalues
+                                        mangleName << Encoding::qualifiers.at(Type::Lvalue);
+                                }
+                                if ( inFunctionType ) {
+                                        // turn off inFunctionType so that types can be differentiated for nested qualifiers
+                                        GuardValue( inFunctionType );
+                                        inFunctionType = false;
+                                }
+                        }
+                }       // namespace
+        } // namespace Mangler
 } // namespace SymTab

src/SymTab/Mangler.h

-              rf9feab8
+              r90152a4
 #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 SymTab {
+        /// Mangles names to a unique C identifier
+        class Mangler : public Visitor {
+          public:
+        namespace Mangler {
                 /// Mangle syntax tree object; primary interface to clients
                 template< typename SynTreeClass >
+            static std::string mangle( SynTreeClass *decl, bool mangleOverridable = true, bool typeMode = false, bool mangleGenericParams = true );
+                std::string mangle( BaseSyntaxNode * decl, bool mangleOverridable = true, bool typeMode = false, bool mangleGenericParams = true );
                 /// Mangle a type name; secondary interface
                 static std::string mangleType( Type* ty );
+                std::string mangleType( Type* ty );
                 /// Mangle ignoring generic type parameters
                 static std::string mangleConcrete( Type* ty );
+                std::string mangleConcrete( Type* ty );
+                namespace Encoding {
+                        extern const std::string manglePrefix;
+                        extern const std::string basicTypes[];
+                        extern const std::map<int, std::string> qualifiers;
                 virtual void visit( ObjectDecl *declaration );
                 virtual void visit( FunctionDecl *declaration );
                 virtual void visit( TypeDecl *declaration );
+                        extern const std::string void_t;
+                        extern const std::string zero;
+                        extern const std::string one;
+                virtual void visit( VoidType *voidType );
+                virtual void visit( BasicType *basicType );
+                virtual void visit( PointerType *pointerType );
+                virtual void visit( ArrayType *arrayType );
+                virtual void visit( ReferenceType *refType );
+                virtual void visit( FunctionType *functionType );
+                virtual void visit( StructInstType *aggregateUseType );
+                virtual void visit( UnionInstType *aggregateUseType );
+                virtual void visit( EnumInstType *aggregateUseType );
+                virtual void visit( TypeInstType *aggregateUseType );
+                virtual void visit( TupleType *tupleType );
+                virtual void visit( VarArgsType *varArgsType );
+                virtual void visit( ZeroType *zeroType );
+                virtual void visit( OneType *oneType );
+                        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;
+                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
+                        extern const std::string forall;
+                        extern const std::string typeVariables[];
+                Mangler( bool mangleOverridable, bool typeMode, bool mangleGenericParams );
+                Mangler( const Mangler & );
+                        extern const std::string struct_t;
+                        extern const std::string union_t;
+                        extern const std::string enum_t;
+                        extern const std::string type;
+                void mangleDecl( DeclarationWithType *declaration );
+                void mangleRef( ReferenceToType *refType, std::string prefix );
+                        extern const std::string autogen;
+                        extern const std::string intrinsic;
+                };
+        } // Mangler
+} // SymTab
+                void printQualifiers( Type *type );
+        }; // Mangler
+        template< typename SynTreeClass >
+        std::string Mangler::mangle( SynTreeClass *decl, bool mangleOverridable, bool typeMode, bool mangleGenericParams ) {
+                Mangler mangler( mangleOverridable, typeMode, mangleGenericParams );
+                maybeAccept( decl, mangler );
+                return mangler.get_mangleName();
+        }
+} // SymTab
+extern "C" {
+        char * cforall_demangle(const char *, int);
+}
 // Local Variables: //

src/SymTab/Validate.cc

-              rf9feab8
+              r90152a4
 #include "CodeGen/CodeGenerator.h"     // for genName
 #include "CodeGen/OperatorTable.h"     // for isCtorDtor, isCtorDtorAssign
+#include "ControlStruct/Mutate.h"      // for ForExprMutator
 #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 "SymTab/AddVisit.h"           // for addVisit
+#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
 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 );
                 bool inStruct = false;
+                AggregateDecl * parentAggr = nullptr;
         };
 …
         /// Associates forward declarations of aggregates with their definitions
         struct LinkReferenceToTypes final : public WithIndexer, public WithGuards {
+        struct LinkReferenceToTypes final : public WithIndexer, public WithGuards, public WithVisitorRef<LinkReferenceToTypes>, public WithShortCircuiting {
                 LinkReferenceToTypes( const Indexer *indexer );
                 void postvisit( TypeInstType *typeInst );
 …
                 void postvisit( UnionInstType *unionInst );
                 void postvisit( TraitInstType *traitInst );
+                void previsit( QualifiedType * qualType );
+                void postvisit( QualifiedType * qualType );
                 void postvisit( EnumDecl *enumDecl );
 …
                 void previsit( ObjectDecl * object );
                 void previsit( FunctionDecl * func );
+                void previsit( FunctionType * ftype );
                 void previsit( StructDecl * aggrDecl );
                 void previsit( UnionDecl * aggrDecl );
 …
         };
         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 );
         };
 …
         };
+        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 );
         };
 …
                 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
+                PassVisitor<HoistTypeDecls> hoistDecls;
+                PassVisitor<FixQualifiedTypes> fixQual;
+                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 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
+                mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes, because aggregate members are accessed
+                HoistStruct::hoistStruct( translationUnit ); // must happen after EliminateTypedef, so that aggregate typedefs occur in the correct order
+                EliminateTypedef::eliminateTypedef( translationUnit ); //
                 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
 …
                 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 );
+                ResolvExpr::resolveWithExprs( translationUnit ); // must happen before FixObjectType because user-code is resolved and may contain with variables
+                FixObjectType::fix( translationUnit );
                 ArrayLength::computeLength( translationUnit );
                 acceptAll( translationUnit, finder ); // xxx - remove this pass soon
                 mutateAll( translationUnit, labelAddrFixer );
+                Validate::handleAttributes( translationUnit );
+        }
 …
+        }
+        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 ( StructInstType * inst = dynamic_cast< StructInstType * >( child ) ) {
+                                        if ( StructDecl * aggr = dynamic_cast< StructDecl * >( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        // TODO: is this case, and other non-TypeInstType cases, necessary?
+                                                        return new StructInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( UnionInstType * inst = dynamic_cast< UnionInstType * >( child ) ) {
+                                        if ( UnionDecl * aggr = dynamic_cast< UnionDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        return new UnionInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else if ( EnumInstType * inst = dynamic_cast< EnumInstType * >( child ) ) {
+                                        if ( EnumDecl * aggr = dynamic_cast< EnumDecl * > ( member ) ) {
+                                                if ( aggr->name == inst->name ) {
+                                                        return new EnumInstType( qualType->get_qualifiers(), aggr );
+                                                }
+                                        }
+                                } else 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();
+                                                        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 isStructOrUnion( Declaration *decl ) {
+                return dynamic_cast< StructDecl * >( decl ) || dynamic_cast< UnionDecl * >( 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 ) {
+                if ( inStruct ) {
+                if ( parentAggr ) {
+                        aggregateDecl->parent = parentAggr;
+                        aggregateDecl->name = qualifiedName( aggregateDecl );
                         // Add elements in stack order corresponding to nesting structure.
                         declsToAddBefore.push_front( aggregateDecl );
                 } else {
                         GuardValue( inStruct );
                         inStruct = true;
+                        GuardValue( parentAggr );
+                        parentAggr = aggregateDecl;
                 } // if
                 // Always remove the hoisted aggregate from the inner structure.
+                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, isStructOrUnion, false ); } );
+        }
+        void HoistStruct::previsit( EnumInstType * inst ) {
+                if ( inst->baseEnum ) {
+                        declsToAddBefore.push_front( inst->baseEnum );
+                }
+        }
+        void HoistStruct::previsit( StructInstType * inst ) {
+                if ( inst->baseStruct ) {
+                        declsToAddBefore.push_front( inst->baseStruct );
+                }
+        }
+        void HoistStruct::previsit( UnionInstType * inst ) {
+                if ( inst->baseUnion ) {
+                        declsToAddBefore.push_front( inst->baseUnion );
+                GuardAction( [aggregateDecl]() { filter( aggregateDecl->members, shouldHoist, false ); } );
+        }
+        void HoistStruct::previsit( StaticAssertDecl * assertDecl ) {
+                if ( parentAggr ) {
+                        declsToAddBefore.push_back( assertDecl );
+                }
+        }
 …
+        }
+        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::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 ) {
+                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
+        }
 …
         namespace {
                 template< typename DWTList >
+                void fixFunctionList( DWTList & dwts, FunctionType * func ) {
+                        // the only case in which "void" is valid is where it is the only one in the list; then it should be removed
+                        // entirely. other fix ups are handled by the FixFunction class
+                        typedef typename DWTList::iterator DWTIterator;
+                        DWTIterator begin( dwts.begin() ), end( dwts.end() );
+                        if ( begin == end ) return;
+                        PassVisitor<FixFunction> fixer;
+                        DWTIterator i = begin;
+                        *i = (*i)->acceptMutator( fixer );
+                        if ( fixer.pass.isVoid ) {
+                                DWTIterator j = i;
+                                ++i;
+                                delete *j;
+                                dwts.erase( j );
+                                if ( i != end ) {
+                                        throw SemanticError( "invalid type void in function type ", func );
+                                } // if
+                        } else {
+                                ++i;
+                                for ( ; i != end; ++i ) {
+                                        PassVisitor<FixFunction> fixer;
+                                        *i = (*i)->acceptMutator( fixer );
+                                        if ( fixer.pass.isVoid ) {
+                                                throw SemanticError( "invalid type void in function type ", func );
+                                        } // if
+                                } // for
+                        } // if
+                void fixFunctionList( DWTList & dwts, bool isVarArgs, FunctionType * func ) {
+                        auto nvals = dwts.size();
+                        bool containsVoid = false;
+                        for ( auto & dwt : dwts ) {
+                                // fix each DWT and record whether a void was found
+                                containsVoid |= fixFunction( dwt );
+                        }
+                        // the only case in which "void" is valid is where it is the only one in the list
+                        if ( containsVoid && ( nvals > 1 || isVarArgs ) ) {
+                                SemanticError( func, "invalid type void in function type " );
+                        }
+                        // one void is the only thing in the list; remove it.
+                        if ( containsVoid ) {
+                                delete dwts.front();
+                                dwts.clear();
+                        }
+                }
+        }
 …
         void EnumAndPointerDecay::previsit( FunctionType *func ) {
                 // Fix up parameters and return types
                 fixFunctionList( func->get_parameters(), func );
                 fixFunctionList( func->get_returnVals(), func );
+                fixFunctionList( func->parameters, func->isVarArgs, func );
+                fixFunctionList( func->returnVals, false, func );
+        }
 …
         void LinkReferenceToTypes::postvisit( EnumInstType *enumInst ) {
                 EnumDecl *st = local_indexer->lookupEnum( enumInst->get_name() );
+                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 = st;
+                } // if
+                if ( ! st || ! st->body ) {
                         // use of forward declaration
                         forwardEnums[ enumInst->get_name() ].push_back( enumInst );
+                        forwardEnums[ enumInst->name ].push_back( enumInst );
                 } // if
+        }
 …
                 for ( Expression * param : inst->parameters ) {
                         if ( ! dynamic_cast< TypeExpr * >( param ) ) {
                                 throw SemanticError( "Expression parameters for generic types are currently unsupported: ", inst );
+                                SemanticError( inst, "Expression parameters for generic types are currently unsupported: " );
+                        }
+                }
 …
         void LinkReferenceToTypes::postvisit( StructInstType *structInst ) {
                 StructDecl *st = local_indexer->lookupStruct( structInst->get_name() );
+                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 = st;
+                } // 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() );
+                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 = un;
+                } // 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::previsit( QualifiedType * ) {
+                visit_children = false;
+        }
+        void LinkReferenceToTypes::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 ) {
 …
                 TraitDecl *traitDecl = local_indexer->lookupTrait( traitInst->name );
                 if ( ! traitDecl ) {
                         throw SemanticError( "use of undeclared trait " + traitInst->name );
                 } // if
                 if ( traitDecl->get_parameters().size() != traitInst->get_parameters().size() ) {
                         throw SemanticError( "incorrect number of trait parameters: ", traitInst );
+                        SemanticError( traitInst->location, "use of undeclared trait " + traitInst->name );
+                } // if
+                if ( traitDecl->parameters.size() != traitInst->parameters.size() ) {
+                        SemanticError( traitInst, "incorrect number of trait parameters: " );
                 } // if
                 traitInst->baseTrait = traitDecl;
                 // 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 ) {
                                 throw SemanticError( "Expression parameters for trait instances are currently unsupported: ", std::get<1>(p) );
+                                SemanticError( std::get<1>(p), "Expression parameters for trait instances are currently unsupported: " );
+                        }
                         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 ) {
                 // 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
+                        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
+        }
 …
                 // 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() );
+                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 );
 …
                 // 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 ( NamedTypeDecl *namedTypeDecl = local_indexer->lookupType( typeInst->name ) ) {
                         if ( TypeDecl *typeDecl = dynamic_cast< TypeDecl * >( namedTypeDecl ) ) {
                                 typeInst->set_isFtype( typeDecl->get_kind() == TypeDecl::Ftype );
 …
                         // apply FixFunction to every assertion to check for invalid void type
                         for ( DeclarationWithType *& assertion : type->assertions ) {
+                                PassVisitor<FixFunction> fixer;
+                                assertion = assertion->acceptMutator( fixer );
+                                if ( fixer.pass.isVoid ) {
+                                        throw SemanticError( "invalid type void in assertion of function ", node );
+                                bool isVoid = fixFunction( assertion );
+                                if ( isVoid ) {
+                                        SemanticError( node, "invalid type void in assertion of function " );
                                 } // if
                         } // for
 …
         void ForallPointerDecay::previsit( ObjectDecl *object ) {
                 forallFixer( object->type->forall, object );
                 if ( PointerType *pointer = dynamic_cast< PointerType * >( object->type ) ) {
                         forallFixer( pointer->base->forall, object );
                 } // if
+                // ensure that operator names only apply to functions or function pointers
+                if ( CodeGen::isOperator( object->name ) && ! dynamic_cast< FunctionType * >( object->type->stripDeclarator() ) ) {
+                        SemanticError( object->location, toCString( "operator ", object->name.c_str(), " is not a function or function pointer." )  );
+                }
                 object->fixUniqueId();
+        }
         void ForallPointerDecay::previsit( FunctionDecl *func ) {
-                forallFixer( func->type->forall, func );
                 func->fixUniqueId();
+        }
+        void ForallPointerDecay::previsit( FunctionType * ftype ) {
+                forallFixer( ftype->forall, ftype );
+        }
 …
                 // were cast to void.
                 if ( ! returnStmt->get_expr() && returnVals.size() != 0 ) {
+                        throw SemanticError( "Non-void function returns no values: " , returnStmt );
+                }
+        }
+        bool isTypedef( Declaration *decl ) {
+                return dynamic_cast< TypedefDecl * >( decl );
+        }
+        void EliminateTypedef::eliminateTypedef( std::list< Declaration * > &translationUnit ) {
+                PassVisitor<EliminateTypedef> eliminator;
+                        SemanticError( returnStmt, "Non-void function returns no values: " );
+                }
+        }
+        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();
+                        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
 …
                         SizeType = new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt );
+                }
+                filter( translationUnit, isTypedef, true );
+        }
+        Type * EliminateTypedef::postmutate( TypeInstType * typeInst ) {
+        }
+        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();
+                        ret->location = typeInst->location;
                         ret->get_qualifiers() |= typeInst->get_qualifiers();
                         // attributes are not carried over from typedef to function parameters/return values
 …
                                 ReferenceToType *rtt = dynamic_cast<ReferenceToType*>(ret);
                                 if ( ! rtt ) {
                                         throw SemanticError("Cannot apply type parameters to base type of " + typeInst->name);
+                                        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
 …
                         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() ) ) {
+                                throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );
+                        }
+                        // cannot redefine VLA typedefs
+                                SemanticError( tyDecl->location, "Cannot redefine typedef: " + tyDecl->name );
+                        }
+                        // Cannot redefine VLA typedefs. Note: this is slightly incorrect, because our notion of VLAs
+                        // at this point in the translator is imprecise. In particular, this will disallow redefining typedefs
+                        // with arrays whose dimension is an enumerator or a cast of a constant/enumerator. The effort required
+                        // to fix this corner case likely outweighs the utility of allowing it.
                         if ( isVariableLength( t1 ) || isVariableLength( t2 ) ) {
                                 throw SemanticError( "Cannot redefine typedef: " + tyDecl->name );
+                                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
 …
                 // Note, qualifiers on the typedef are superfluous for the forward declaration.
                 Type *designatorType = tyDecl->get_base()->stripDeclarator();
+                Type *designatorType = tyDecl->base->stripDeclarator();
                 if ( StructInstType *aggDecl = dynamic_cast< StructInstType * >( designatorType ) ) {
                         return new StructDecl( aggDecl->get_name(), DeclarationNode::Struct, noAttributes, tyDecl->get_linkage() );
+                        declsToAddBefore.push_back( new StructDecl( aggDecl->name, DeclarationNode::Struct, noAttributes, tyDecl->linkage ) );
                 } else if ( UnionInstType *aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
                         return new UnionDecl( aggDecl->get_name(), noAttributes, tyDecl->get_linkage() );
+                        declsToAddBefore.push_back( new UnionDecl( aggDecl->name, noAttributes, tyDecl->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() );
+                        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 = new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() );
                         } // if
                         TypedefDeclPtr tyDecl( new TypedefDecl( aggDecl->get_name(), Type::StorageClasses(), type, aggDecl->get_linkage() ) );
+                        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);
+        }
 …
                 if ( CodeGen::isCtorDtorAssign( funcDecl->get_name() ) ) { // TODO: also check /=, etc.
                         if ( params.size() == 0 ) {
                                 throw SemanticError( "Constructors, destructors, and assignment functions require at least one parameter ", funcDecl );
+                                SemanticError( funcDecl, "Constructors, destructors, and assignment functions require at least one parameter " );
+                        }
                         ReferenceType * refType = dynamic_cast< ReferenceType * >( params.front()->get_type() );
                         if ( ! refType ) {
                                 throw SemanticError( "First parameter of a constructor, destructor, or assignment function must be a reference ", funcDecl );
+                                SemanticError( funcDecl, "First parameter of a constructor, destructor, or assignment function must be a reference " );
+                        }
                         if ( CodeGen::isCtorDtor( funcDecl->get_name() ) && returnVals.size() != 0 ) {
                                 throw SemanticError( "Constructors and destructors cannot have explicit return values ", funcDecl );
+                                SemanticError( funcDecl, "Constructors and destructors cannot have explicit return values " );
+                        }
+                }
 …
                         sub.apply( inst );
                         if ( args.size() < params->size() ) throw SemanticError( "Too few type arguments in generic type ", inst );
                         if ( args.size() > params->size() ) throw SemanticError( "Too many type arguments in generic type ", inst );
+                        if ( args.size() < params->size() ) SemanticError( inst, "Too few type arguments in generic type " );
+                        if ( args.size() > params->size() ) SemanticError( inst, "Too many type arguments in generic type " );
+                }
+        }
 …
+        }
+        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 );
+                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
+                objDecl->set_type( new_type );
+        }
+        void FixObjectType::previsit( FunctionDecl * funcDecl ) {
+                Type *new_type = ResolvExpr::resolveTypeof( funcDecl->type, indexer );
+                new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
+                funcDecl->set_type( new_type );
+        }
+        void FixObjectType::previsit( TypeDecl *typeDecl ) {
+                if ( typeDecl->get_base() ) {
+                        Type *new_type = ResolvExpr::resolveTypeof( typeDecl->get_base(), indexer );
+                        new_type->get_qualifiers() -= Type::Lvalue; // even if typeof is lvalue, variable can never have lvalue-qualified type
+                        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, SymTab::SizeType->clone(), indexer );
+                        // must re-evaluate whether a type is a VLA, now that more information is available
+                        // (e.g. the dimension may have been an enumerator, which was unknown prior to this step)
+                        type->isVarLen = ! InitTweak::isConstExpr( type->dimension );
+                }
+        }

src/SymTab/module.mk

rf9feab8	r90152a4
17	17	SRC += SymTab/Indexer.cc \
18	18	SymTab/Mangler.cc \
	19	SymTab/ManglerCommon.cc \
19	20	SymTab/Validate.cc \
20	21	SymTab/FixFunction.cc \

src/SynTree/AggregateDecl.cc

-              rf9feab8
+              r90152a4
 std::string TraitDecl::typeString() const { return "trait"; }
+bool EnumDecl::valueOf( Declaration * enumerator, long long int & value ) {
+        if ( enumValues.empty() ) {
+                long long int currentValue = 0;
+                for ( Declaration * member : members ) {
+                        ObjectDecl * field = strict_dynamic_cast< ObjectDecl * >( member );
+                        if ( field->init ) {
+                                SingleInit * init = strict_dynamic_cast< SingleInit * >( field->init );
+                                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() );
+                        enumValues[ field->name ] = currentValue;
+                        ++currentValue;
+                }
+        }
+        if ( enumValues.count( enumerator->name ) ) {
+                value = enumValues[ enumerator->name ];
+                return true;
+        }
+        return false;
+}
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/ApplicationExpr.cc

-              rf9feab8
+              r90152a4
+}
+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;
+}
+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 );
+        return *this;
+}
 ApplicationExpr::ApplicationExpr( Expression *funcExpr, const std::list<Expression *> & args ) : function( funcExpr ), args( args ) {
         PointerType *pointer = strict_dynamic_cast< PointerType* >( funcExpr->get_result() );

src/SynTree/Attribute.cc

-              rf9feab8
+              r90152a4
 #include <ostream>           // for operator<<, ostream, basic_ostream, endl
+#include <set>
 #include "Attribute.h"
 …
 Attribute::Attribute( const Attribute &other ) : name( other.name ) {
   cloneAll( other.parameters, parameters );
+        cloneAll( other.parameters, parameters );
+}
 Attribute::~Attribute() {
+  deleteAll( parameters );
+        deleteAll( parameters );
+}
+bool Attribute::isValidOnFuncParam() const {
+        // attributes such as aligned, cleanup, etc. produce GCC errors when they appear
+        // on function parameters. Maintain here a whitelist of attribute names that are
+        // allowed to appear on parameters.
+        static std::set< std::string > valid = {
+                "noreturn", "unused"
+        };
+        return valid.count( normalizedName() );
+}
+std::string Attribute::normalizedName() const {
+        // trim beginning/ending _, convert to lowercase
+        auto begin = name.find_first_not_of('_');
+        auto end = name.find_last_not_of('_');
+        if (begin == std::string::npos || end == std::string::npos) return "";
+        std::string ret;
+        ret.reserve( end-begin+1 );
+        std::transform( &name[begin], &name[end+1], back_inserter( ret ), tolower );
+        return ret;
+}
 void Attribute::print( std::ostream &os, Indenter indent ) const {
   using std::endl;
   using std::string;
+        using std::endl;
+        using std::string;
   if ( ! empty() ) {
     os << "Attribute with name: " << name;
     if ( ! parameters.empty() ) {
       os << " with parameters: " << endl;
       printAll( parameters, os, indent+1 );
+    }
+  }
+        if ( ! empty() ) {
+                os << "Attribute with name: " << name;
+                if ( ! parameters.empty() ) {
+                        os << " with parameters: " << endl;
+                        printAll( parameters, os, indent+1 );
+                }
+        }
+}

src/SynTree/Attribute.h

-              rf9feab8
+              r90152a4
         bool empty() const { return name == ""; }
+        std::string normalizedName() const;
+        /// true if this attribute is allowed to appear attached to a function parameter
+        bool isValidOnFuncParam() const;
         Attribute * clone() const override { return new Attribute( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }

src/SynTree/BasicType.cc

rf9feab8	r90152a4
55	55	case DoubleImaginary:
56	56	case LongDoubleImaginary:
	57	case Float80:
	58	case Float128:
57	59	return false;
58	60	case NUMBER_OF_BASIC_TYPES:

src/SynTree/CompoundStmt.cc

-              rf9feab8
+              r90152a4
 #include "Statement.h"                // for CompoundStmt, Statement, DeclStmt
 #include "SynTree/Label.h"            // for Label
 #include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
+#include "SynTree/DeclReplacer.h"     // for DeclReplacer
 using std::string;
 …
         // recursively execute this routine. There may be more efficient ways of doing
         // this.
         VarExprReplacer::DeclMap declMap;
+        DeclReplacer::DeclMap declMap;
         std::list< Statement * >::const_iterator origit = other.kids.begin();
         for ( Statement * s : kids ) {
 …
                                 DeclarationWithType * origdwt = strict_dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
                                 assert( dwt->get_name() == origdwt->get_name() );
                                 declMap[ origdwt ] = new VariableExpr( dwt );
+                                declMap[ origdwt ] = dwt;
                         } else assert( ! dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() ) );
                 } else assert( ! dynamic_cast< DeclStmt * > ( s ) );
+        }
         if ( ! declMap.empty() ) {
+                VarExprReplacer replacer( declMap );
+                acceptMutator( replacer );
+                DeclReplacer::replace( this, declMap );
+        }
+}

src/SynTree/Declaration.cc

-              rf9feab8
+              r90152a4
+StaticAssertDecl::StaticAssertDecl( Expression * condition, ConstantExpr * message ) : Declaration( "", Type::StorageClasses(), LinkageSpec::C ), condition( condition ), message( message )  {
+}
+StaticAssertDecl::StaticAssertDecl( const StaticAssertDecl & other ) : Declaration( other ), condition( maybeClone( other.condition ) ), message( maybeClone( other.message ) )  {
+}
+StaticAssertDecl::~StaticAssertDecl() {
+        delete condition;
+        delete message;
+}
+void StaticAssertDecl::print( std::ostream &os, Indenter indent ) const {
+        os << "Static Assert with condition: ";
+        condition->print( os, indent+1 );
+        os << std::endl << indent << "and message: ";
+        message->print( os, indent+1 );
+os << std::endl;
+}
+void StaticAssertDecl::printShort( std::ostream &os, Indenter indent ) const {
+        print( os, indent );
+}
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Declaration.h

-              rf9feab8
+              r90152a4
         Expression *asmName;
         std::list< Attribute * > attributes;
+        bool isDeleted = false;
         DeclarationWithType( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, const std::list< Attribute * > & attributes, Type::FuncSpecifiers fs );
 …
         FunctionType *type;
         CompoundStmt *statements;
+        std::list< Expression * > withExprs;
         FunctionDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage, FunctionType *type, CompoundStmt *statements,
 …
         typedef NamedTypeDecl Parent;
   public:
         enum Kind { Dtype, Ftype, Ttype };
+        enum Kind { Dtype, Ftype, Ttype, NUMBER_OF_KINDS };
         Type * init;
 …
         typedef NamedTypeDecl Parent;
   public:
+        TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) : Parent( name, scs, type ) { set_linkage( spec ); }
+        TypedefDecl( const std::string &name, CodeLocation location, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall )
+                : Parent( name, scs, type ) { set_linkage( spec ); this->location = location; }
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 …
         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 );
 …
         EnumDecl( const EnumDecl &other ) : Parent( other ) {}
+        bool valueOf( Declaration * enumerator, long long int & value );
         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 std::string typeString() const override;
 };
 …
         virtual void accept( Visitor &v ) 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 void printShort( std::ostream &os, Indenter indent = {} ) const override;
+};
+class StaticAssertDecl : public Declaration {
+public:
+        Expression * condition;
+        ConstantExpr * message;   // string literal
+        StaticAssertDecl( Expression * condition, ConstantExpr * message );
+        StaticAssertDecl( const StaticAssertDecl & other );
+        virtual ~StaticAssertDecl();
+        virtual StaticAssertDecl * clone() const override { return new StaticAssertDecl( *this ); }
+        virtual void accept( Visitor &v ) override { v.visit( this ); }
+        virtual StaticAssertDecl * 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;

src/SynTree/Expression.cc

-              rf9feab8
+              r90152a4
+}
+void Expression::spliceInferParams( Expression * other ) {
+        if ( ! other ) return;
+        for ( auto p : other->inferParams ) {
+                inferParams[p.first] = std::move( p.second );
+        }
+}
 Expression::~Expression() {
         delete env;
 …
         constant.print( os );
         Expression::print( os, indent );
+}
+long long int ConstantExpr::intValue() const {
+        if ( BasicType * basicType = dynamic_cast< BasicType * >( result ) ) {
+                if ( basicType->isInteger() ) {
+                        return get_constant()->get_ival();
+                }
+        } else if ( dynamic_cast< OneType * >( result ) ) {
+                return 1;
+        } else if ( dynamic_cast< ZeroType * >( result ) ) {
+                return 0;
+        }
+        SemanticError( this, "Constant expression of non-integral type " );
+}
 …
         //      assert( inst->baseEnum );
         //      EnumDecl * decl = inst->baseEnum;
+        //      for ( Declaration * member : decl->members ) {
+        //              if ( member == _var ) {
+        //                      type->set_lvalue( false );
+        //              }
+        //      long long int value;
+        //      if ( decl->valueOf( var, value ) ) {
+        //              type->set_lvalue( false );
         //      }
         // }
 …
+}
 CastExpr::CastExpr( Expression *arg_, Type *toType ) : Expression(), arg(arg_) {
+CastExpr::CastExpr( Expression *arg, Type *toType, bool isGenerated ) : Expression(), arg(arg), isGenerated( isGenerated ) {
         set_result(toType);
+}
 CastExpr::CastExpr( Expression *arg_ ) : Expression(), arg(arg_) {
+CastExpr::CastExpr( Expression *arg, bool isGenerated ) : Expression(), arg(arg), isGenerated( isGenerated ) {
         set_result( new VoidType( Type::Qualifiers() ) );
+}
 CastExpr::CastExpr( const CastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ) {
+CastExpr::CastExpr( const CastExpr &other ) : Expression( other ), arg( maybeClone( other.arg ) ), isGenerated( other.isGenerated ) {
+}
 …
+}
+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() {
+        delete arg;
+}
+const std::string & KeywordCastExpr::targetString() const {
+        static const std::string targetStrs[] = {
+                "coroutine", "thread", "monitor"
+        };
+        static_assert(
+                (sizeof(targetStrs) / sizeof(targetStrs[0])) == ((unsigned long)NUMBER_OF_TARGETS),
+                "Each KeywordCastExpr::Target should have a corresponding string representation"
+        );
+        return targetStrs[(unsigned long)target];
+}
+void KeywordCastExpr::print( std::ostream &os, Indenter indent ) const {
+        os << "Keyword Cast of:" << std::endl << indent+1;
+        arg->print(os, indent+1);
+        os << std::endl << indent << "... to: ";
+        os << targetString();
+        Expression::print( os, indent );
+}
 VirtualCastExpr::VirtualCastExpr( Expression *arg_, Type *toType ) : Expression(), arg(arg_) {
         set_result(toType);
 …
+}
-namespace {
-        TypeSubstitution makeSub( Type * t ) {
-                if ( ReferenceType * refType = dynamic_cast< ReferenceType * >( t ) ) {
-                        return makeSub( refType->get_base() );
-                } else if ( StructInstType * aggInst = dynamic_cast< StructInstType * >( t ) ) {
-                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->parameters.begin() );
-                } else if ( UnionInstType * aggInst = dynamic_cast< UnionInstType * >( t ) ) {
-                        return TypeSubstitution( aggInst->get_baseParameters()->begin(), aggInst->get_baseParameters()->end(), aggInst->parameters.begin() );
-                } else {
-                        assertf( false, "makeSub expects struct or union type for aggregate, but got: %s", toString( t ).c_str() );
+                }
+        }
+}
 MemberExpr::MemberExpr( DeclarationWithType *member, Expression *aggregate ) :
                 Expression(), member(member), aggregate(aggregate) {
         assert( member );
         assert( aggregate );
+        TypeSubstitution sub( makeSub( aggregate->get_result() ) );
+        assert( aggregate->result );
+        TypeSubstitution sub = aggregate->result->genericSubstitution();
         Type * res = member->get_type()->clone();
         sub.apply( res );
 …
                 } else {
                         // references have been removed, in which case dereference returns an lvalue of the base type.
                         ret->get_result()->set_lvalue( true );
+                        ret->result->set_lvalue( true );
+                }
+        }
 …
 StmtExpr::StmtExpr( CompoundStmt *statements ) : statements( statements ) {
+        assert( statements );
+        std::list< Statement * > & body = statements->get_kids();
+        if ( ! body.empty() ) {
+                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
+                        set_result( maybeClone( exprStmt->get_expr()->get_result() ) );
+                }
+        }
+        // ensure that StmtExpr has a result type
+        if ( ! result ) {
+                set_result( new VoidType( Type::Qualifiers() ) );
+        }
+        computeResult();
+}
 StmtExpr::StmtExpr( const StmtExpr &other ) : Expression( other ), statements( other.statements->clone() ) {
 …
         deleteAll( dtors );
         deleteAll( returnDecls );
+}
+void StmtExpr::computeResult() {
+        assert( statements );
+        std::list< Statement * > & body = statements->kids;
+        delete result;
+        result = nullptr;
+        if ( ! returnDecls.empty() ) {
+                // prioritize return decl for result type, since if a return decl exists, then
+                // the StmtExpr is currently in an intermediate state where the body will always
+                // give a void result type.
+                result = returnDecls.front()->get_type()->clone();
+        } else if ( ! body.empty() ) {
+                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
+                        result = maybeClone( exprStmt->expr->result );
+                }
+        }
+        // ensure that StmtExpr has a result type
+        if ( ! result ) {
+                result = new VoidType( Type::Qualifiers() );
+        }
+}
 void StmtExpr::print( std::ostream &os, Indenter indent ) const {
 …
+}
+DeletedExpr::DeletedExpr( Expression * expr, BaseSyntaxNode * deleteStmt ) : expr( expr ), deleteStmt( deleteStmt ) {
+        assert( expr->result );
+        result = expr->result->clone();
+}
+DeletedExpr::DeletedExpr( const DeletedExpr & other ) : Expression( other ), expr( maybeClone( other.expr ) ), deleteStmt( other.deleteStmt ) {}
+DeletedExpr::~DeletedExpr() {
+        delete expr;
+}
+void DeletedExpr::print( std::ostream & os, Indenter indent ) const {
+        os << "Deleted Expression" << std::endl << indent+1;
+        expr->print( os, indent+1 );
+        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 );
+}
+GenericExpr::Association::Association( Type * type, Expression * expr ) : type( type ), expr( expr ), isDefault( false ) {}
+GenericExpr::Association::Association( Expression * expr ) : type( nullptr ), expr( expr ), isDefault( true ) {}
+GenericExpr::Association::Association( const Association & other ) : type( maybeClone( other.type ) ), expr( maybeClone( other.expr ) ), isDefault( other.isDefault ) {}
+GenericExpr::Association::~Association() {
+        delete type;
+        delete expr;
+}
+GenericExpr::GenericExpr( Expression * control, const std::list<Association> & assoc ) : Expression(), control( control ), associations( assoc ) {}
+GenericExpr::GenericExpr( const GenericExpr & other ) : Expression(other), control( maybeClone( other.control ) ), associations( other.associations ) {
+}
+GenericExpr::~GenericExpr() {
+        delete control;
+}
+void GenericExpr::print( std::ostream & os, Indenter indent ) const {
+        os << "C11 _Generic Expression" << std::endl << indent+1;
+        control->print( os, indent+1 );
+        os << std::endl << indent+1 << "... with associations: " << std::endl;
+        for ( const Association & assoc : associations ) {
+                os << indent+1;
+                if (assoc.isDefault) {
+                        os << "... default: ";
+                        assoc.expr->print( os, indent+1 );
+                } else {
+                        os << "... type: ";
+                        assoc.type->print( os, indent+1 );
+                        os << std::endl << indent+1 << "... expression: ";
+                        assoc.expr->print( os, indent+1 );
+                        os << std::endl;
+                }
+                os << std::endl;
+        }
+}
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Expression.h

-              rf9feab8
+              r90152a4
         ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr ), inferParams( new InferredParams ) {}
         ParamEntry( const ParamEntry & other );
+        ParamEntry( ParamEntry && other );
         ~ParamEntry();
         ParamEntry & operator=( const ParamEntry & other );
+        ParamEntry & operator=( ParamEntry && other );
         UniqueId decl;
 …
         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;
 …
   public:
         Expression * arg;
+        CastExpr( Expression * arg );
+        CastExpr( Expression * arg, Type * toType );
+        bool isGenerated = true; // whether this cast appeared in the source program
+        CastExpr( Expression * arg, bool isGenerated = true );
+        CastExpr( Expression * arg, Type * toType, bool isGenerated = true );
+        CastExpr( Expression * arg, void * ) = delete; // prevent accidentally passing pointers for isGenerated in the first constructor
         CastExpr( const CastExpr & other );
         virtual ~CastExpr();
 …
         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;
+};
+/// KeywordCastExpr represents a cast to 'keyword types', e.g. (thread &)t
+class KeywordCastExpr : public Expression {
+public:
+        Expression * arg;
+        enum Target {
+                Coroutine, Thread, Monitor, NUMBER_OF_TARGETS
+        } target;
+        KeywordCastExpr( Expression * arg, Target target );
+        KeywordCastExpr( const KeywordCastExpr & other );
+        virtual ~KeywordCastExpr();
+        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 ); }
 …
         Constant * get_constant() { return & constant; }
+        const Constant * get_constant() const { return & constant; }
         void set_constant( const Constant & newValue ) { constant = newValue; }
+        long long int intValue() const;
         virtual ConstantExpr * clone() const { return new ConstantExpr( * this ); }
 …
         StmtExpr * set_statements( CompoundStmt * newValue ) { statements = newValue; return this; }
+        // call to set the result type of this StmtExpr based on its body
+        void computeResult();
         std::list< ObjectDecl * > & get_returnDecls() { return returnDecls; }
         std::list< Expression * > & get_dtors() { return dtors; }
 …
 };
+/// expression that contains a deleted identifier - should never make it past the resolver.
+class DeletedExpr : public Expression {
+public:
+        Expression * expr;
+        BaseSyntaxNode * deleteStmt;
+        DeletedExpr( Expression * expr, BaseSyntaxNode * 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;
+};
+/// 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 { return new DefaultArgExpr( * 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;
+};
+/// C11 _Generic expression
+class GenericExpr : public Expression {
+public:
+        struct Association {
+                Type * type = nullptr;
+                Expression * expr = nullptr;
+                bool isDefault = false;
+                Association( Type * type, Expression * expr );
+                Association( Expression * expr );
+                Association( const Association & other );
+                Association & operator=( const Association & other ) = delete; // at the moment this isn't used, and I don't want to implement it
+                ~Association();
+        };
+        Expression * control;
+        std::list<Association> associations;
+        GenericExpr( Expression * control, const std::list<Association> & assoc );
+        GenericExpr( const GenericExpr & other );
+        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;
+};
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/FunctionDecl.cc

-              rf9feab8
+              r90152a4
 #include "Statement.h"           // for CompoundStmt
 #include "Type.h"                // for Type, FunctionType, Type::FuncSpecif...
 #include "VarExprReplacer.h"
+#include "DeclReplacer.h"
 extern bool translation_unit_nomain;
 …
                 : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
         VarExprReplacer::DeclMap declMap;
+        DeclReplacer::DeclMap declMap;
         for ( auto p : group_iterate( other.type->parameters, type->parameters ) ) {
                 declMap[ std::get<0>(p) ] = new VariableExpr( std::get<1>(p) );
+                declMap[ std::get<0>(p) ] = std::get<1>(p);
+        }
         for ( auto p : group_iterate( other.type->returnVals, type->returnVals ) ) {
                 declMap[ std::get<0>(p) ] = new VariableExpr( std::get<1>(p) );
+                declMap[ std::get<0>(p) ] = std::get<1>(p);
+        }
         if ( ! declMap.empty() ) {
+                VarExprReplacer replacer( declMap );
+                acceptMutator( replacer );
+                DeclReplacer::replace( this, declMap );
+        }
+        cloneAll( other.withExprs, withExprs );
+}
 …
         delete type;
         delete statements;
+        deleteAll( withExprs );
+}

src/SynTree/Label.h

rf9feab8	r90152a4
33	33	std::list< Attribute * >& get_attributes() { return attributes; }
34	34
35		operator std::string() { return name; }
	35	operator std::string() const { return name; }
36	36	bool empty() { return name.empty(); }
37	37	private:

src/SynTree/Mutator.h

-              rf9feab8
+              r90152a4
 class Mutator {
   protected:
         Mutator();
         virtual ~Mutator();
+        Mutator() = default;
+        virtual ~Mutator() = default;
   public:
+        virtual DeclarationWithType * mutate( ObjectDecl * objectDecl );
+        virtual DeclarationWithType * mutate( FunctionDecl * functionDecl );
+        virtual Declaration * mutate( StructDecl * aggregateDecl );
+        virtual Declaration * mutate( UnionDecl * aggregateDecl );
+        virtual Declaration * mutate( EnumDecl * aggregateDecl );
+        virtual Declaration * mutate( TraitDecl * aggregateDecl );
+        virtual Declaration * mutate( TypeDecl * typeDecl );
+        virtual Declaration * mutate( TypedefDecl * typeDecl );
+        virtual AsmDecl * mutate( AsmDecl * asmDecl );
+        virtual DeclarationWithType * mutate( ObjectDecl * objectDecl ) = 0;
+        virtual DeclarationWithType * mutate( FunctionDecl * functionDecl ) = 0;
+        virtual Declaration * mutate( StructDecl * aggregateDecl ) = 0;
+        virtual Declaration * mutate( UnionDecl * aggregateDecl ) = 0;
+        virtual Declaration * mutate( EnumDecl * aggregateDecl ) = 0;
+        virtual Declaration * mutate( TraitDecl * aggregateDecl ) = 0;
+        virtual Declaration * mutate( TypeDecl * typeDecl ) = 0;
+        virtual Declaration * mutate( TypedefDecl * typeDecl ) = 0;
+        virtual AsmDecl * mutate( AsmDecl * asmDecl ) = 0;
+        virtual StaticAssertDecl * mutate( StaticAssertDecl * assertDecl ) = 0;
+        virtual CompoundStmt * mutate( CompoundStmt * compoundStmt );
+        virtual Statement * mutate( ExprStmt * exprStmt );
+        virtual Statement * mutate( AsmStmt * asmStmt );
+        virtual Statement * mutate( IfStmt * ifStmt );
+        virtual Statement * mutate( WhileStmt * whileStmt );
+        virtual Statement * mutate( ForStmt * forStmt );
+        virtual Statement * mutate( SwitchStmt * switchStmt );
+        virtual Statement * mutate( CaseStmt * caseStmt );
+        virtual Statement * mutate( BranchStmt * branchStmt );
+        virtual Statement * mutate( ReturnStmt * returnStmt );
+        virtual Statement * mutate( ThrowStmt * throwStmt );
+        virtual Statement * mutate( TryStmt * tryStmt );
+        virtual Statement * mutate( CatchStmt * catchStmt );
+        virtual Statement * mutate( FinallyStmt * catchStmt );
+        virtual Statement * mutate( WaitForStmt * waitforStmt );
+        virtual Statement * mutate( WithStmt * withStmt );
+        virtual NullStmt * mutate( NullStmt * nullStmt );
+        virtual Statement * mutate( DeclStmt * declStmt );
+        virtual Statement * mutate( ImplicitCtorDtorStmt * impCtorDtorStmt );
+        virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) = 0;
+        virtual Statement * mutate( ExprStmt * exprStmt ) = 0;
+        virtual Statement * mutate( AsmStmt * asmStmt ) = 0;
+        virtual Statement * mutate( DirectiveStmt * dirStmt ) = 0;
+        virtual Statement * mutate( IfStmt * ifStmt ) = 0;
+        virtual Statement * mutate( WhileStmt * whileStmt ) = 0;
+        virtual Statement * mutate( ForStmt * forStmt ) = 0;
+        virtual Statement * mutate( SwitchStmt * switchStmt ) = 0;
+        virtual Statement * mutate( CaseStmt * caseStmt ) = 0;
+        virtual Statement * mutate( BranchStmt * branchStmt ) = 0;
+        virtual Statement * mutate( ReturnStmt * returnStmt ) = 0;
+        virtual Statement * mutate( ThrowStmt * throwStmt ) = 0;
+        virtual Statement * mutate( TryStmt * tryStmt ) = 0;
+        virtual Statement * mutate( CatchStmt * catchStmt ) = 0;
+        virtual Statement * mutate( FinallyStmt * catchStmt ) = 0;
+        virtual Statement * mutate( WaitForStmt * waitforStmt ) = 0;
+        virtual Statement * mutate( WithStmt * withStmt ) = 0;
+        virtual NullStmt * mutate( NullStmt * nullStmt ) = 0;
+        virtual Statement * mutate( DeclStmt * declStmt ) = 0;
+        virtual Statement * mutate( ImplicitCtorDtorStmt * impCtorDtorStmt ) = 0;
+        virtual Expression* mutate( ApplicationExpr * applicationExpr );
+        virtual Expression* mutate( UntypedExpr * untypedExpr );
+        virtual Expression* mutate( NameExpr * nameExpr );
+        virtual Expression* mutate( AddressExpr * castExpr );
+        virtual Expression* mutate( LabelAddressExpr * labAddressExpr );
+        virtual Expression* mutate( CastExpr * castExpr );
+        virtual Expression* mutate( VirtualCastExpr * castExpr );
+        virtual Expression* mutate( UntypedMemberExpr * memberExpr );
+        virtual Expression* mutate( MemberExpr * memberExpr );
+        virtual Expression* mutate( VariableExpr * variableExpr );
+        virtual Expression* mutate( ConstantExpr * constantExpr );
+        virtual Expression* mutate( SizeofExpr * sizeofExpr );
+        virtual Expression* mutate( AlignofExpr * alignofExpr );
+        virtual Expression* mutate( UntypedOffsetofExpr * offsetofExpr );
+        virtual Expression* mutate( OffsetofExpr * offsetofExpr );
+        virtual Expression* mutate( OffsetPackExpr * offsetPackExpr );
+        virtual Expression* mutate( AttrExpr * attrExpr );
+        virtual Expression* mutate( LogicalExpr * logicalExpr );
+        virtual Expression* mutate( ConditionalExpr * conditionalExpr );
+        virtual Expression* mutate( CommaExpr * commaExpr );
+        virtual Expression* mutate( TypeExpr * typeExpr );
+        virtual Expression* mutate( AsmExpr * asmExpr );
+        virtual Expression* mutate( ImplicitCopyCtorExpr * impCpCtorExpr );
+        virtual Expression* mutate( ConstructorExpr * ctorExpr );
+        virtual Expression* mutate( CompoundLiteralExpr * compLitExpr );
+        virtual Expression* mutate( RangeExpr * rangeExpr );
+        virtual Expression* mutate( UntypedTupleExpr * tupleExpr );
+        virtual Expression* mutate( TupleExpr * tupleExpr );
+        virtual Expression* mutate( TupleIndexExpr * tupleExpr );
+        virtual Expression* mutate( TupleAssignExpr * assignExpr );
+        virtual Expression* mutate( StmtExpr  * stmtExpr );
+        virtual Expression* mutate( UniqueExpr  * uniqueExpr );
+        virtual Expression* mutate( UntypedInitExpr  * initExpr );
+        virtual Expression* mutate( InitExpr  * initExpr );
+        virtual Expression * mutate( ApplicationExpr * applicationExpr ) = 0;
+        virtual Expression * mutate( UntypedExpr * untypedExpr ) = 0;
+        virtual Expression * mutate( NameExpr * nameExpr ) = 0;
+        virtual Expression * mutate( AddressExpr * addrExpr ) = 0;
+        virtual Expression * mutate( LabelAddressExpr * labAddressExpr ) = 0;
+        virtual Expression * mutate( CastExpr * castExpr ) = 0;
+        virtual Expression * mutate( KeywordCastExpr * castExpr ) = 0;
+        virtual Expression * mutate( VirtualCastExpr * castExpr ) = 0;
+        virtual Expression * mutate( UntypedMemberExpr * memberExpr ) = 0;
+        virtual Expression * mutate( MemberExpr * memberExpr ) = 0;
+        virtual Expression * mutate( VariableExpr * variableExpr ) = 0;
+        virtual Expression * mutate( ConstantExpr * constantExpr ) = 0;
+        virtual Expression * mutate( SizeofExpr * sizeofExpr ) = 0;
+        virtual Expression * mutate( AlignofExpr * alignofExpr ) = 0;
+        virtual Expression * mutate( UntypedOffsetofExpr * offsetofExpr ) = 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( CommaExpr * commaExpr ) = 0;
+        virtual Expression * mutate( TypeExpr * typeExpr ) = 0;
+        virtual Expression * mutate( AsmExpr * asmExpr ) = 0;
+        virtual Expression * mutate( ImplicitCopyCtorExpr * impCpCtorExpr ) = 0;
+        virtual Expression * mutate( ConstructorExpr * ctorExpr ) = 0;
+        virtual Expression * mutate( CompoundLiteralExpr * compLitExpr ) = 0;
+        virtual Expression * mutate( RangeExpr * rangeExpr ) = 0;
+        virtual Expression * mutate( UntypedTupleExpr * tupleExpr ) = 0;
+        virtual Expression * mutate( TupleExpr * tupleExpr ) = 0;
+        virtual Expression * mutate( TupleIndexExpr * tupleExpr ) = 0;
+        virtual Expression * mutate( TupleAssignExpr * assignExpr ) = 0;
+        virtual Expression * mutate( StmtExpr  * stmtExpr ) = 0;
+        virtual Expression * mutate( UniqueExpr  * uniqueExpr ) = 0;
+        virtual Expression * mutate( UntypedInitExpr  * initExpr ) = 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( VoidType * basicType );
+        virtual Type * mutate( BasicType * basicType );
+        virtual Type * mutate( PointerType * pointerType );
+        virtual Type * mutate( ArrayType * arrayType );
+        virtual Type * mutate( ReferenceType * refType );
+        virtual Type * mutate( FunctionType * functionType );
+        virtual Type * mutate( StructInstType * aggregateUseType );
+        virtual Type * mutate( UnionInstType * aggregateUseType );
+        virtual Type * mutate( EnumInstType * aggregateUseType );
+        virtual Type * mutate( TraitInstType * aggregateUseType );
+        virtual Type * mutate( TypeInstType * aggregateUseType );
+        virtual Type * mutate( TupleType * tupleType );
+        virtual Type * mutate( TypeofType * typeofType );
+        virtual Type * mutate( AttrType * attrType );
+        virtual Type * mutate( VarArgsType * varArgsType );
+        virtual Type * mutate( ZeroType * zeroType );
+        virtual Type * mutate( OneType * oneType );
+        virtual Type * mutate( VoidType * basicType ) = 0;
+        virtual Type * mutate( BasicType * basicType ) = 0;
+        virtual Type * mutate( PointerType * pointerType ) = 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( UnionInstType * aggregateUseType ) = 0;
+        virtual Type * mutate( EnumInstType * aggregateUseType ) = 0;
+        virtual Type * mutate( TraitInstType * aggregateUseType ) = 0;
+        virtual Type * mutate( TypeInstType * aggregateUseType ) = 0;
+        virtual Type * mutate( TupleType * tupleType ) = 0;
+        virtual Type * mutate( TypeofType * typeofType ) = 0;
+        virtual Type * mutate( AttrType * attrType ) = 0;
+        virtual Type * mutate( VarArgsType * varArgsType ) = 0;
+        virtual Type * mutate( ZeroType * zeroType ) = 0;
+        virtual Type * mutate( OneType * oneType ) = 0;
+        virtual Type * mutate( GlobalScopeType * globalType ) = 0;
         virtual Designation * mutate( Designation * designation );
         virtual Initializer * mutate( SingleInit * singleInit );
         virtual Initializer * mutate( ListInit * listInit );
         virtual Initializer * mutate( ConstructorInit * ctorInit );
+        virtual Designation * mutate( Designation * designation ) = 0 ;
+        virtual Initializer * mutate( SingleInit * singleInit ) = 0 ;
+        virtual Initializer * mutate( ListInit * listInit ) = 0 ;
+        virtual Initializer * mutate( ConstructorInit * ctorInit ) = 0 ;
         virtual Subrange * mutate( Subrange * subrange );
+        virtual Subrange * mutate( Subrange * subrange ) = 0;
         virtual Constant * mutate( Constant * constant );
+        virtual Constant * mutate( Constant * constant ) = 0;
         virtual Attribute * mutate( Attribute * attribute );
+        virtual Attribute * mutate( Attribute * attribute ) = 0;
+        virtual TypeSubstitution * mutate( TypeSubstitution * sub );
+  private:
+        virtual Declaration * handleAggregateDecl(AggregateDecl * aggregateDecl );
+        virtual Declaration * handleNamedTypeDecl(NamedTypeDecl * typeDecl );
+        virtual Type * handleReferenceToType(ReferenceToType * aggregateUseType );
+        virtual TypeSubstitution * mutate( TypeSubstitution * sub ) = 0;
 };
 …
 template< typename Container, typename MutatorType >
 inline void mutateAll( Container &container, MutatorType &mutator ) {
         SemanticError errors;
+        SemanticErrorException errors;
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
 …
                                 assert( *i );
                         } // if
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                } catch( SemanticErrorException &e ) {
                         errors.append( e );
                 } // try

src/SynTree/ReferenceToType.cc

-              rf9feab8
+              r90152a4
 //
+#include <cassert>           // for assert
+#include <list>              // for list, _List_const_iterator, list<>::cons...
+#include <ostream>           // for operator<<, basic_ostream, ostream, endl
+#include <string>            // for string, operator<<, char_traits, operator==
+#include "Common/utility.h"  // for printAll, cloneAll, deleteAll
+#include "Declaration.h"     // for StructDecl, UnionDecl, EnumDecl, Declara...
+#include "Expression.h"      // for Expression
+#include "Type.h"            // for TypeInstType, StructInstType, UnionInstType
+#include <cassert>            // for assert
+#include <list>               // for list, _List_const_iterator, list<>::cons...
+#include <ostream>            // for operator<<, basic_ostream, ostream, endl
+#include <string>             // for string, operator<<, char_traits, operator==
+#include "Common/utility.h"   // for printAll, cloneAll, deleteAll
+#include "Declaration.h"      // for StructDecl, UnionDecl, EnumDecl, Declara...
+#include "Expression.h"       // for Expression
+#include "Type.h"             // for TypeInstType, StructInstType, UnionInstType
+#include "TypeSubstitution.h" // for TypeSubstitution
 class Attribute;
 …
 namespace {
         void doLookup( const std::list< Declaration* > &members, const std::string &name, std::list< Declaration* > &foundDecls ) {
                 for ( std::list< Declaration* >::const_iterator i = members.begin(); i != members.end(); ++i ) {
                         if ( (*i)->get_name() == name ) {
                                 foundDecls.push_back( *i );
+        void doLookup( const std::list< Declaration * > & members, const std::string & name, std::list< Declaration* > & foundDecls ) {
+                for ( Declaration * decl : members ) {
+                        if ( decl->name == name ) {
+                                foundDecls.push_back( decl );
                         } // if
                 } // for
 …
 StructInstType::StructInstType( const Type::Qualifiers & tq, StructDecl * baseStruct, const std::list< Attribute * > & attributes ) :
                 Parent( tq, baseStruct->get_name(), attributes ), baseStruct( baseStruct ) {}
+                Parent( tq, baseStruct->name, attributes ), baseStruct( baseStruct ) {}
 std::string StructInstType::typeString() const { return "struct"; }
+const std::list<TypeDecl*>* StructInstType::get_baseParameters() const {
+        if ( ! baseStruct ) return nullptr;
+        return &baseStruct->get_parameters();
+}
 std::list<TypeDecl*>* StructInstType::get_baseParameters() {
 …
 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 {
+        return TypeSubstitution( get_baseParameters()->begin(), get_baseParameters()->end(), parameters.begin() );
+}
 void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseStruct );
         doLookup( baseStruct->get_members(), name, foundDecls );
+        doLookup( baseStruct->members, name, foundDecls );
+}
 …
 UnionInstType::UnionInstType( const Type::Qualifiers & tq, UnionDecl * baseUnion, const std::list< Attribute * > & attributes ) :
                 Parent( tq, baseUnion->get_name(), attributes ), baseUnion( baseUnion ) {}
+                Parent( tq, baseUnion->name, attributes ), baseUnion( baseUnion ) {}
 std::string UnionInstType::typeString() const { return "union"; }
 …
+}
+const std::list< TypeDecl * > * UnionInstType::get_baseParameters() const {
+        if ( ! baseUnion ) return nullptr;
+        return &baseUnion->get_parameters();
+}
 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 {
+        return TypeSubstitution( get_baseParameters()->begin(), get_baseParameters()->end(), parameters.begin() );
+}
 void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
         assert( baseUnion );
         doLookup( baseUnion->get_members(), name, foundDecls );
+        doLookup( baseUnion->members, name, foundDecls );
+}
 …
 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;

src/SynTree/ReferenceType.cc

-              rf9feab8
+              r90152a4
 #include "Type.h"
 #include "Expression.h"
+#include "TypeSubstitution.h"
 #include "Common/utility.h"
 …
+}
+TypeSubstitution ReferenceType::genericSubstitution() const { return base->genericSubstitution(); }
 void ReferenceType::print( std::ostream &os, Indenter indent ) const {
         Type::print( os, indent );

src/SynTree/Statement.cc

-              rf9feab8
+              r90152a4
 Statement::Statement( const std::list<Label> & labels ) : labels( labels ) {}
 void Statement::print( std::ostream & os, Indenter ) const {
+void Statement::print( std::ostream & os, Indenter indent ) const {
         if ( ! labels.empty() ) {
                 os << "Labels: {";
+                os << indent << "... Labels: {";
                 for ( const Label & l : labels ) {
                         os << l << ",";
 …
+DirectiveStmt::DirectiveStmt( const std::string & directive ) : Statement(), directive( directive ) {}
+void DirectiveStmt::print( std::ostream &os, Indenter ) const {
+        os << "GCC Directive:" << directive << endl;
+}
 const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticError ) :
+BranchStmt::BranchStmt( Label target, Type type ) throw ( SemanticErrorException ) :
         Statement(), originalTarget( target ), target( target ), computedTarget( nullptr ), type( type ) {
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.empty() ) {
                 throw SemanticError("goto without target");
+        }
+}
 BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticError ) :
+                SemanticError( target.get_statement()->location, "goto without target");
+        }
+}
+BranchStmt::BranchStmt( Expression *computedTarget, Type type ) throw ( SemanticErrorException ) :
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
                 throw SemanticError("Computed target not valid in branch statement");
+                SemanticError( computedTarget->location, "Computed target not valid in branch statement");
+        }
+}
 …
+}
 CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticError ) :
+CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticErrorException ) :
         Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != 0 ) throw SemanticError("default case with condition: ", condition);
+        if ( isDefault() && condition != 0 ) SemanticError( condition, "default case with condition: " );
+}
 …
 void CaseStmt::print( std::ostream &os, Indenter indent ) const {
         if ( isDefault() ) os << "Default ";
+        if ( isDefault() ) os << indent << "Default ";
         else {
                 os << "Case ";
+                os << indent << "Case ";
                 condition->print( os, indent );
         } // if
 …
         for ( Statement * stmt : stmts ) {
+                os << indent+1;
                 stmt->print( os, indent+1 );
+        }
+}
 WhileStmt::WhileStmt( Expression *condition, Statement *body, bool isDoWhile ):
         Statement(), condition( condition), body( body), isDoWhile( isDoWhile) {
+WhileStmt::WhileStmt( Expression *condition, Statement *body, std::list< Statement * > & initialization, bool isDoWhile ):
+        Statement(), condition( condition), body( body), initialization( initialization ), isDoWhile( isDoWhile) {
+}
 …
 void WaitForStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Waitfor Statement" << endl;
+        os << indent << "... with block:" << endl << indent+1;
+        // block->print( os, indent + 4 );
+        indent += 1;
+        for( auto & clause : clauses ) {
+                os << indent << "target function :";
+                if(clause.target.function) { clause.target.function->print(os, indent + 1); }
+                os << endl << indent << "with arguments :" << endl;
+                for( auto & thing : clause.target.arguments) {
+                        if(thing) { thing->print(os, indent + 1); }
+                }
+                os << indent << " with statment :" << endl;
+                if(clause.statement) { clause.statement->print(os, indent + 1); }
+                os << indent << " with condition :" << endl;
+                if(clause.condition) { clause.condition->print(os, indent + 1); }
+        }
+        os << indent << " timeout of :" << endl;
+        if(timeout.time) { timeout.time->print(os, indent + 1); }
+        os << indent << " with statment :" << endl;
+        if(timeout.statement) { timeout.statement->print(os, indent + 1); }
+        os << indent << " with condition :" << endl;
+        if(timeout.condition) { timeout.condition->print(os, indent + 1); }
+        os << indent << " else :" << endl;
+        if(orelse.statement) { orelse.statement->print(os, indent + 1); }
+        os << indent << " with condition :" << endl;
+        if(orelse.condition) { orelse.condition->print(os, indent + 1); }
+}
 …
 void WithStmt::print( std::ostream & os, Indenter indent ) const {
         os << "With statement" << endl;
+        os << indent << "... with expressions: " << endl;
+        printAll( exprs, os, indent+1 );
         os << indent << "... with statement:" << endl << indent+1;
         stmt->print( os, indent+1 );
 …
+}
 void NullStmt::print( std::ostream &os, Indenter ) const {
+void NullStmt::print( std::ostream &os, Indenter indent ) const {
         os << "Null Statement" << endl;
+        Statement::print( os, indent );
+}

src/SynTree/Statement.h

-              rf9feab8
+              r90152a4
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Sun Sep  3 20:46:46 2017
 // Update Count     : 77
+// Last Modified On : Thu Mar  8 14:53:02 2018
+// Update Count     : 78
 //
 …
 };
+class DirectiveStmt : public Statement {
+        public:
+        std::string directive;
+        DirectiveStmt( const std::string & );
+        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;
+};
 class IfStmt : public Statement {
   public:
 …
         std::list<Statement *> stmts;
         CaseStmt( Expression *conditions, const std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
+        CaseStmt( Expression *conditions, const std::list<Statement *> &stmts, bool isdef = false ) throw (SemanticErrorException);
         CaseStmt( const CaseStmt &other );
         virtual ~CaseStmt();
 …
         Expression *condition;
         Statement *body;
+        std::list<Statement *> initialization;
         bool isDoWhile;
         WhileStmt( Expression *condition,
                Statement *body, bool isDoWhile = false );
+               Statement *body, std::list<Statement *> & initialization, bool isDoWhile = false );
         WhileStmt( const WhileStmt &other );
         virtual ~WhileStmt();
 …
 class BranchStmt : public Statement {
   public:
         enum Type { Goto = 0, Break, Continue };
+        enum Type { Goto = 0, Break, Continue, FallThrough, FallThroughDefault };
         // originalTarget kept for error messages.
 …
         Type type;
         BranchStmt( Label target, Type ) throw (SemanticError);
         BranchStmt( Expression *computedTarget, Type ) throw (SemanticError);
+        BranchStmt( Label target, Type ) throw (SemanticErrorException);
+        BranchStmt( Expression *computedTarget, Type ) throw (SemanticErrorException);
         Label get_originalTarget() { return originalTarget; }

src/SynTree/SynTree.h

-              rf9feab8
+              r90152a4
 class TypedefDecl;
 class AsmDecl;
+class StaticAssertDecl;
 class Statement;
 …
 class ExprStmt;
 class AsmStmt;
+class DirectiveStmt;
 class IfStmt;
 class WhileStmt;
 …
 class LabelAddressExpr;
 class CastExpr;
+class KeywordCastExpr;
 class VirtualCastExpr;
 class MemberExpr;
 …
 class UntypedInitExpr;
 class InitExpr;
+class DeletedExpr;
+class DefaultArgExpr;
+class GenericExpr;
 class Type;
 …
 class ArrayType;
 class ReferenceType;
+class QualifiedType;
 class FunctionType;
 class ReferenceToType;
 …
 class ZeroType;
 class OneType;
+class GlobalScopeType;
 class Designation;

src/SynTree/Type.cc

-              rf9feab8
+              r90152a4
 // 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 : Fri Jun 22 10:17:19 2018
+// Update Count     : 39
 //
 #include "Type.h"
+#include "Attribute.h"               // for Attribute
+#include "Common/utility.h"          // for cloneAll, deleteAll, printAll
+#include "InitTweak/InitTweak.h"     // for getPointerBase
+#include "SynTree/BaseSyntaxNode.h"  // for BaseSyntaxNode
+#include "SynTree/Declaration.h"     // for TypeDecl
+#include "Attribute.h"                // for Attribute
+#include "Common/utility.h"           // for cloneAll, deleteAll, printAll
+#include "InitTweak/InitTweak.h"      // for getPointerBase
+#include "SynTree/BaseSyntaxNode.h"   // for BaseSyntaxNode
+#include "SynTree/Declaration.h"      // for TypeDecl
+#include "SynTree/TypeSubstitution.h" // for TypeSubstitution
 using namespace std;
 const char *BasicType::typeNames[BasicType::NUMBER_OF_BASIC_TYPES] = {
+const char *BasicType::typeNames[] = {
         "_Bool",
         "char",
 …
         "__int128",
         "unsigned __int128",
+        "__float80",
+        "__float128"
 };
+static_assert(
+        sizeof(BasicType::typeNames)/sizeof(BasicType::typeNames[0]) == BasicType::NUMBER_OF_BASIC_TYPES,
+        "Each basic type name should have a corresponding kind enum value"
+);
 Type::Type( const Qualifiers &tq, const std::list< Attribute * > & attributes ) : tq( tq ), attributes( attributes ) {}
 …
 // 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" };
 …
 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 {
         if ( ! forall.empty() ) {
 …
+}
+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

-              rf9feab8
+              r90152a4
         virtual bool isComplete() const { return true; }
+        virtual AggregateDecl * getAggr() {     assertf( false, "Non-aggregate type: %s", toString( this ).c_str() ); }
+        virtual AggregateDecl * getAggr() const { assertf( false, "Non-aggregate type: %s", toCString( this ) ); }
+        virtual TypeSubstitution genericSubstitution() const;
         virtual Type *clone() const = 0;
 …
                 SignedInt128,
                 UnsignedInt128,
+                Float80,
+                Float128,
                 NUMBER_OF_BASIC_TYPES
         } kind;
 …
 };
+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 Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
 class ReferenceType : public Type {
 public:
 …
         // the number of values are disallowed.
         virtual unsigned size() const override { return base->size(); }
+        virtual TypeSubstitution genericSubstitution() const override;
         virtual ReferenceType *clone() const override { return new ReferenceType( *this ); }
 …
         bool isTtype() const;
+        bool isUnprototyped() const { return isVarArgs && parameters.size() == 0; }
         virtual FunctionType *clone() const override { return new FunctionType( *this ); }
         virtual void accept( Visitor & v ) override { v.visit( this ); }
 …
         /// Accesses generic parameters of base struct (NULL if none such)
         std::list<TypeDecl*> * get_baseParameters();
+        const std::list<TypeDecl*> * get_baseParameters() const;
         virtual bool isComplete() const override;
+        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
+        virtual TypeSubstitution genericSubstitution() const override;
         /// Looks up the members of this struct named "name" and places them into "foundDecls".
 …
         /// Accesses generic parameters of base union (NULL if none such)
+        std::list< TypeDecl * > * get_baseParameters();
+        std::list<TypeDecl*> * get_baseParameters();
+        const std::list<TypeDecl*> * get_baseParameters() const;
         virtual bool isComplete() const override;
+        virtual AggregateDecl * getAggr() override;
+        virtual AggregateDecl * getAggr() const override;
+        virtual TypeSubstitution genericSubstitution() const override;
         /// looks up the members of this union named "name" and places them into "foundDecls"
 …
         virtual bool isComplete() const override;
+        virtual AggregateDecl * getAggr() const override;
         virtual EnumInstType *clone() const override { return new EnumInstType( *this ); }
 …
 };
+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 Type *acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/TypeSubstitution.cc

-              rf9feab8
+              r90152a4
+}
+namespace {
+        struct EnvTrimmer {
+                TypeSubstitution * env, * newEnv;
+                EnvTrimmer( TypeSubstitution * env, TypeSubstitution * newEnv ) : env( env ), newEnv( newEnv ){}
+                void previsit( TypeDecl * tyDecl ) {
+                        // transfer known bindings for seen type variables
+                        if ( Type * t = env->lookup( tyDecl->name ) ) {
+                                newEnv->add( tyDecl->name, t );
+                        }
+                }
+        };
+} // namespace
+/// reduce environment to just the parts that are referenced in a given expression
+TypeSubstitution * TypeSubstitution::newFromExpr( Expression * expr, TypeSubstitution * env ) {
+        if ( env ) {
+                TypeSubstitution * newEnv = new TypeSubstitution();
+                PassVisitor<EnvTrimmer> trimmer( env, newEnv );
+                expr->accept( trimmer );
+                return newEnv;
+        }
+        return nullptr;
+}
 void TypeSubstitution::normalize() {
+        PassVisitor<Substituter> sub( *this, true );
         do {
                 subCount = 0;
                 freeOnly = true;
+                sub.pass.subCount = 0;
+                sub.pass.freeOnly = true;
                 for ( TypeEnvType::iterator i = typeEnv.begin(); i != typeEnv.end(); ++i ) {
                         i->second = i->second->acceptMutator( *this );
+                        i->second = i->second->acceptMutator( sub );
+                }
         } while ( subCount );
+}
 Type * TypeSubstitution::mutate( TypeInstType *inst ) {
         BoundVarsType::const_iterator bound = boundVars.find( inst->get_name() );
+        } while ( sub.pass.subCount );
+}
+Type * TypeSubstitution::Substituter::postmutate( TypeInstType *inst ) {
+        BoundVarsType::const_iterator bound = boundVars.find( inst->name );
         if ( bound != boundVars.end() ) return inst;
         TypeEnvType::const_iterator i = typeEnv.find( inst->get_name() );
         if ( i == typeEnv.end() ) {
+        TypeEnvType::const_iterator i = sub.typeEnv.find( inst->get_name() );
+        if ( i == sub.typeEnv.end() ) {
                 return inst;
         } else {
+///         std::cout << "found " << inst->get_name() << ", replacing with ";
+///         i->second->print( std::cout );
+///         std::cout << std::endl;
+                // cut off infinite loop for the case where a type is bound to itself.
+                // Note: this does not prevent cycles in the general case, so it may be necessary to do something more sophisticated here.
+                // TODO: investigate preventing type variables from being bound to themselves in the first place.
+                if ( TypeInstType * replacement = dynamic_cast< TypeInstType * >( i->second ) ) {
+                        if ( inst->name == replacement->name ) {
+                                return inst;
+                        }
+                }
+                // std::cerr << "found " << inst->name << ", replacing with " << i->second << std::endl;
                 subCount++;
                 Type *newtype = i->second->clone();
+                Type * newtype = i->second->clone();
                 newtype->get_qualifiers() |= inst->get_qualifiers();
                 delete inst;
+                return newtype;
+        } // if
+}
+Expression * TypeSubstitution::mutate( NameExpr *nameExpr ) {
+        VarEnvType::const_iterator i = varEnv.find( nameExpr->get_name() );
+        if ( i == varEnv.end() ) {
+                // Note: need to recursively apply substitution to the new type because normalize does not substitute bound vars, but bound vars must be substituted when not in freeOnly mode.
+                return newtype->acceptMutator( *visitor );
+        } // if
+}
+Expression * TypeSubstitution::Substituter::postmutate( NameExpr * nameExpr ) {
+        VarEnvType::const_iterator i = sub.varEnv.find( nameExpr->name );
+        if ( i == sub.varEnv.end() ) {
                 return nameExpr;
         } else {
 …
+}
+template< typename TypeClass >
+Type *TypeSubstitution::handleType( TypeClass *type ) {
+        ValueGuard<BoundVarsType> oldBoundVars( boundVars );
+void TypeSubstitution::Substituter::premutate( Type * type ) {
+        GuardValue( boundVars );
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
                 for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
                         boundVars.insert( (*tyvar )->get_name() );
+                for ( Type::ForallList::const_iterator tyvar = type->forall.begin(); tyvar != type->forall.end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar)->name );
                 } // for
         } // if
-        Type *ret = Mutator::mutate( type );
-        return ret;
+}
 template< typename TypeClass >
 Type *TypeSubstitution::handleAggregateType( TypeClass *type ) {
         ValueGuard<BoundVarsType> oldBoundVars( boundVars );
+void TypeSubstitution::Substituter::handleAggregateType( TypeClass * type ) {
+        GuardValue( boundVars );
         // bind type variables from forall-qualifiers
         if ( freeOnly ) {
                 for ( Type::ForallList::const_iterator tyvar = type->get_forall().begin(); tyvar != type->get_forall().end(); ++tyvar ) {
                         boundVars.insert( (*tyvar )->get_name() );
+                for ( Type::ForallList::const_iterator tyvar = type->forall.begin(); tyvar != type->forall.end(); ++tyvar ) {
+                        boundVars.insert( (*tyvar)->name );
                 } // for
                 // bind type variables from generic type instantiations
                 std::list< TypeDecl* > *baseParameters = type->get_baseParameters();
                 if ( baseParameters && ! type->get_parameters().empty() ) {
+                if ( baseParameters && ! type->parameters.empty() ) {
                         for ( std::list< TypeDecl* >::const_iterator tyvar = baseParameters->begin(); tyvar != baseParameters->end(); ++tyvar ) {
                                 boundVars.insert( (*tyvar)->get_name() );
+                                boundVars.insert( (*tyvar)->name );
                         } // for
                 } // if
         } // if
+        Type *ret = Mutator::mutate( type );
+        return ret;
+}
+Type * TypeSubstitution::mutate( VoidType *voidType ) {
+        return handleType( voidType );
+}
+Type * TypeSubstitution::mutate( BasicType *basicType ) {
+        return handleType( basicType );
+}
+Type * TypeSubstitution::mutate( PointerType *pointerType ) {
+        return handleType( pointerType );
+}
+Type * TypeSubstitution::mutate( ArrayType *arrayType ) {
+        return handleType( arrayType );
+}
+Type * TypeSubstitution::mutate( FunctionType *functionType ) {
+        return handleType( functionType );
+}
+Type * TypeSubstitution::mutate( StructInstType *aggregateUseType ) {
+        return handleAggregateType( aggregateUseType );
+}
+Type * TypeSubstitution::mutate( UnionInstType *aggregateUseType ) {
+        return handleAggregateType( aggregateUseType );
+}
+Type * TypeSubstitution::mutate( EnumInstType *aggregateUseType ) {
+        return handleType( aggregateUseType );
+}
+Type * TypeSubstitution::mutate( TraitInstType *aggregateUseType ) {
+        return handleType( aggregateUseType );
+}
+Type * TypeSubstitution::mutate( TupleType *tupleType ) {
+        return handleType( tupleType );
+}
+Type * TypeSubstitution::mutate( VarArgsType *varArgsType ) {
+        return handleType( varArgsType );
+}
+Type * TypeSubstitution::mutate( ZeroType *zeroType ) {
+        return handleType( zeroType );
+}
+Type * TypeSubstitution::mutate( OneType *oneType ) {
+        return handleType( oneType );
+}
+void TypeSubstitution::Substituter::premutate( StructInstType * aggregateUseType ) {
+        handleAggregateType( aggregateUseType );
+}
+void TypeSubstitution::Substituter::premutate( UnionInstType *aggregateUseType ) {
+        handleAggregateType( aggregateUseType );
+}

src/SynTree/TypeSubstitution.h

-              rf9feab8
+              r90152a4
 #include "SynTree/Declaration.h"   // for TypeDecl, Declaration (ptr only)
 #include "SynTree/Expression.h"    // for Expression (ptr only), NameExpr (p...
-#include "SynTree/Mutator.h"       // for Mutator
 #include "SynTree/Type.h"          // for Type, ArrayType (ptr only), BasicT...
+class TypeSubstitution : public Mutator {
+        typedef Mutator Parent;
+class TypeSubstitution {
   public:
         TypeSubstitution();
 …
         void extract( TypeInstListIterator begin, TypeInstListIterator end, TypeSubstitution &result );
+        /// create a new TypeSubstitution using bindings from env containing all of the type variables in expr
+        static TypeSubstitution * newFromExpr( Expression * expr, TypeSubstitution * env );
         void normalize();
 …
         TypeSubstitution *clone() const { return new TypeSubstitution( *this ); }
   private:
+        virtual Type* mutate(TypeInstType *aggregateUseType);
+        virtual Expression* mutate(NameExpr *nameExpr);
+        /// Records type variable bindings from forall-statements
+        template< typename TypeClass > Type *handleType( TypeClass *type );
+        /// Records type variable bindings from forall-statements and instantiations of generic types
+        template< typename TypeClass > Type *handleAggregateType( TypeClass *type );
+        virtual Type* mutate(VoidType *basicType);
+        virtual Type* mutate(BasicType *basicType);
+        virtual Type* mutate(PointerType *pointerType);
+        virtual Type* mutate(ArrayType *arrayType);
+        virtual Type* mutate(FunctionType *functionType);
+        virtual Type* mutate(StructInstType *aggregateUseType);
+        virtual Type* mutate(UnionInstType *aggregateUseType);
+        virtual Type* mutate(EnumInstType *aggregateUseType);
+        virtual Type* mutate(TraitInstType *aggregateUseType);
+        virtual Type* mutate(TupleType *tupleType);
+        virtual Type* mutate(VarArgsType *varArgsType);
+        virtual Type* mutate(ZeroType *zeroType);
+        virtual Type* mutate(OneType *oneType);
+        // Mutator that performs the substitution
+        struct Substituter;
         // TODO: worry about traversing into a forall-qualified function type or type decl with assertions
 …
         typedef std::map< std::string, Type* > TypeEnvType;
         typedef std::map< std::string, Expression* > VarEnvType;
-        typedef std::set< std::string > BoundVarsType;
         TypeEnvType typeEnv;
         VarEnvType varEnv;
+        BoundVarsType boundVars;
+        int subCount;
+        bool freeOnly;
+  public:
+        // has to come after declaration of typeEnv
+        auto begin()       -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
+        auto   end()       -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
+        auto begin() const -> decltype( typeEnv.begin() ) { return typeEnv.begin(); }
+        auto   end() const -> decltype( typeEnv.  end() ) { return typeEnv.  end(); }
 };
 …
                                 } // if
                         } else {
                                 throw SemanticError( toString( "Attempt to provide non-type parameter: ", toString( *actualIt ).c_str(), " for type parameter " ), formal );
+                                SemanticError( formal, toString( "Attempt to provide non-type parameter: ", toString( *actualIt ).c_str(), " for type parameter " ) );
                         } // if
                 } else {
 …
 template< typename FormalIterator, typename ActualIterator >
+TypeSubstitution::TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin )
+{
+TypeSubstitution::TypeSubstitution( FormalIterator formalBegin, FormalIterator formalEnd, ActualIterator actualBegin ) {
         add( formalBegin, formalEnd, actualBegin );
+}
+// include needs to happen after TypeSubstitution is defined so that both TypeSubstitution and
+// PassVisitor are defined before PassVisitor implementation accesses TypeSubstitution internals.
+#include "Common/PassVisitor.h"
+// 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 ) {}
+                Type * postmutate( TypeInstType * aggregateUseType );
+                Expression * postmutate( NameExpr * nameExpr );
+                /// Records type variable bindings from forall-statements
+                void premutate( Type * type );
+                /// Records type variable bindings from forall-statements and instantiations of generic types
+                template< typename TypeClass > void handleAggregateType( TypeClass * type );
+                void premutate( StructInstType * aggregateUseType );
+                void premutate( UnionInstType * aggregateUseType );
+                TypeSubstitution & sub;
+                int subCount = 0;
+                bool freeOnly;
+                typedef std::set< std::string > BoundVarsType;
+                BoundVarsType boundVars;
+};
 template< typename SynTreeClass >
 int TypeSubstitution::apply( SynTreeClass *&input ) {
         assert( input );
+        subCount = 0;
+        freeOnly = false;
+        input = dynamic_cast< SynTreeClass *>( input->acceptMutator( *this ) );
+        assert( input );
+///     std::cout << "substitution result is: ";
+///     newType->print( std::cout );
+///     std::cout << std::endl;
+        return subCount;
+        PassVisitor<Substituter> sub( *this, false );
+        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
+        assert( input );
+///     std::cerr << "substitution result is: ";
+///     newType->print( std::cerr );
+///     std::cerr << std::endl;
+        return sub.pass.subCount;
+}
 …
 int TypeSubstitution::applyFree( SynTreeClass *&input ) {
         assert( input );
+        subCount = 0;
+        freeOnly = true;
+        input = dynamic_cast< SynTreeClass *>( input->acceptMutator( *this ) );
+        assert( input );
+///     std::cout << "substitution result is: ";
+///     newType->print( std::cout );
+///     std::cout << std::endl;
+        return subCount;
+        PassVisitor<Substituter> sub( *this, true );
+        input = dynamic_cast< SynTreeClass * >( input->acceptMutator( sub ) );
+        assert( input );
+///     std::cerr << "substitution result is: ";
+///     newType->print( std::cerr );
+///     std::cerr << std::endl;
+        return sub.pass.subCount;
+}

src/SynTree/Visitor.h

-              rf9feab8
+              r90152a4
 class Visitor {
   protected:
         Visitor();
         virtual ~Visitor();
+        Visitor() = default;
+        virtual ~Visitor() = default;
   public:
         // visit: Default implementation of all functions visits the children
         // of the given syntax node, but performs no other action.
+        virtual void visit( ObjectDecl * objectDecl );
+        virtual void visit( FunctionDecl * functionDecl );
+        virtual void visit( StructDecl * aggregateDecl );
+        virtual void visit( UnionDecl * aggregateDecl );
+        virtual void visit( EnumDecl * aggregateDecl );
+        virtual void visit( TraitDecl * aggregateDecl );
+        virtual void visit( TypeDecl * typeDecl );
+        virtual void visit( TypedefDecl * typeDecl );
+        virtual void visit( AsmDecl * asmDecl );
+        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 );
+        virtual void visit( ExprStmt * exprStmt );
+        virtual void visit( AsmStmt * asmStmt );
+        virtual void visit( IfStmt * ifStmt );
+        virtual void visit( WhileStmt * whileStmt );
+        virtual void visit( ForStmt * forStmt );
+        virtual void visit( SwitchStmt * switchStmt );
+        virtual void visit( CaseStmt * caseStmt );
+        virtual void visit( BranchStmt * branchStmt );
+        virtual void visit( ReturnStmt * returnStmt );
+        virtual void visit( ThrowStmt * throwStmt );
+        virtual void visit( TryStmt * tryStmt );
+        virtual void visit( CatchStmt * catchStmt );
+        virtual void visit( FinallyStmt * finallyStmt );
+        virtual void visit( WaitForStmt * waitforStmt );
+        virtual void visit( WithStmt * withStmt );
+        virtual void visit( NullStmt * nullStmt );
+        virtual void visit( DeclStmt * declStmt );
+        virtual void visit( ImplicitCtorDtorStmt * impCtorDtorStmt );
+        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 );
+        virtual void visit( UntypedExpr * untypedExpr );
+        virtual void visit( NameExpr * nameExpr );
+        virtual void visit( CastExpr * castExpr );
+        virtual void visit( VirtualCastExpr * castExpr );
+        virtual void visit( AddressExpr * addressExpr );
+        virtual void visit( LabelAddressExpr * labAddressExpr );
+        virtual void visit( UntypedMemberExpr * memberExpr );
+        virtual void visit( MemberExpr * memberExpr );
+        virtual void visit( VariableExpr * variableExpr );
+        virtual void visit( ConstantExpr * constantExpr );
+        virtual void visit( SizeofExpr * sizeofExpr );
+        virtual void visit( AlignofExpr * alignofExpr );
+        virtual void visit( UntypedOffsetofExpr * offsetofExpr );
+        virtual void visit( OffsetofExpr * offsetofExpr );
+        virtual void visit( OffsetPackExpr * offsetPackExpr );
+        virtual void visit( AttrExpr * attrExpr );
+        virtual void visit( LogicalExpr * logicalExpr );
+        virtual void visit( ConditionalExpr * conditionalExpr );
+        virtual void visit( CommaExpr * commaExpr );
+        virtual void visit( TypeExpr * typeExpr );
+        virtual void visit( AsmExpr * asmExpr );
+        virtual void visit( ImplicitCopyCtorExpr * impCpCtorExpr );
+        virtual void visit( ConstructorExpr *  ctorExpr );
+        virtual void visit( CompoundLiteralExpr * compLitExpr );
+        virtual void visit( RangeExpr * rangeExpr );
+        virtual void visit( UntypedTupleExpr * tupleExpr );
+        virtual void visit( TupleExpr * tupleExpr );
+        virtual void visit( TupleIndexExpr * tupleExpr );
+        virtual void visit( TupleAssignExpr * assignExpr );
+        virtual void visit( StmtExpr *  stmtExpr );
+        virtual void visit( UniqueExpr *  uniqueExpr );
+        virtual void visit( UntypedInitExpr *  initExpr );
+        virtual void visit( InitExpr *  initExpr );
+        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( DefaultArgExpr * argExpr ) = 0;
+        virtual void visit( GenericExpr * genExpr ) = 0;
+        virtual void visit( VoidType * basicType );
+        virtual void visit( BasicType * basicType );
+        virtual void visit( PointerType * pointerType );
+        virtual void visit( ArrayType * arrayType );
+        virtual void visit( ReferenceType * refType );
+        virtual void visit( FunctionType * functionType );
+        virtual void visit( StructInstType * aggregateUseType );
+        virtual void visit( UnionInstType * aggregateUseType );
+        virtual void visit( EnumInstType * aggregateUseType );
+        virtual void visit( TraitInstType * aggregateUseType );
+        virtual void visit( TypeInstType * aggregateUseType );
+        virtual void visit( TupleType * tupleType );
+        virtual void visit( TypeofType * typeofType );
+        virtual void visit( AttrType * attrType );
+        virtual void visit( VarArgsType * varArgsType );
+        virtual void visit( ZeroType * zeroType );
+        virtual void visit( OneType * oneType );
+        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( QualifiedType * qualType ) = 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( GlobalScopeType * globalType ) = 0;
         virtual void visit( Designation * designation );
         virtual void visit( SingleInit * singleInit );
         virtual void visit( ListInit * listInit );
         virtual void visit( ConstructorInit * ctorInit );
+        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 );
+        virtual void visit( Subrange * subrange ) = 0;
         virtual void visit( Constant * constant );
+        virtual void visit( Constant * constant ) = 0;
+        virtual void visit( Attribute * attribute );
+  private:
+        virtual void handleAggregateDecl( AggregateDecl *aggregateDecl );
+        virtual void handleNamedTypeDecl( NamedTypeDecl *typeDecl );
+        virtual void handleReferenceToType( ReferenceToType *aggregateUseType );
+        virtual void visit( Attribute * attribute ) = 0;
 };
 …
 template< typename Container, typename VisitorType >
 inline void acceptAll( Container &container, VisitorType &visitor ) {
         SemanticError errors;
+        SemanticErrorException errors;
         for ( typename Container::iterator i = container.begin(); i != container.end(); ++i ) {
                 try {
 …
                                 (*i)->accept( visitor );
+                        }
+                } catch( SemanticError &e ) {
+                        e.set_location( (*i)->location );
+                } catch( SemanticErrorException &e ) {
                         errors.append( e );
+                }

src/SynTree/module.mk

-              rf9feab8
+              r90152a4
        SynTree/TypeDecl.cc \
        SynTree/Initializer.cc \
-       SynTree/Visitor.cc \
-       SynTree/Mutator.cc \
        SynTree/TypeSubstitution.cc \
        SynTree/Attribute.cc \
        SynTree/VarExprReplacer.cc
+       SynTree/DeclReplacer.cc

src/Tuples/Explode.h

-              rf9feab8
+              r90152a4
         /// Append alternative to an OutputIterator of Alternatives
         template<typename OutputIterator>
         void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env,
+        void append( OutputIterator out, Expression* expr, const ResolvExpr::TypeEnvironment& env,
                         const ResolvExpr::Cost& cost, const ResolvExpr::Cost& cvtCost ) {
                 *out++ = ResolvExpr::Alternative{ expr, env, cost, cvtCost };
 …
         /// Append alternative to an ExplodedActual
         static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr,
+        static inline void append( ResolvExpr::ExplodedActual& ea, Expression* expr,
                         const ResolvExpr::TypeEnvironment&, const ResolvExpr::Cost&, const ResolvExpr::Cost& ) {
                 ea.exprs.emplace_back( expr );
 …
         /// helper function used by explode
         template< typename Output >
         void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt,
+        void explodeUnique( Expression * expr, const ResolvExpr::Alternative & alt,
                         const SymTab::Indexer & indexer, Output&& out, bool isTupleAssign ) {
                 if ( isTupleAssign ) {
 …
                         if ( CastExpr * castExpr = isReferenceCast( expr ) ) {
                                 ResolvExpr::AltList alts;
                                 explodeUnique(
+                                explodeUnique(
                                         castExpr->get_arg(), alt, indexer, back_inserter( alts ), isTupleAssign );
                                 for ( ResolvExpr::Alternative & alt : alts ) {
                                         // distribute reference cast over all components
                                         append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
+                                        append( std::forward<Output>(out), distributeReference( alt.release_expr() ),
                                                 alt.env, alt.cost, alt.cvtCost );
+                                }
 …
         /// expands a tuple-valued alternative into multiple alternatives, each with a non-tuple-type
         template< typename Output >
         void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer,
+        void explode( const ResolvExpr::Alternative &alt, const SymTab::Indexer & indexer,
                         Output&& out, bool isTupleAssign = false ) {
                 explodeUnique( alt.expr, alt, indexer, std::forward<Output>(out), isTupleAssign );
 …
         // explode list of alternatives
         template< typename AltIterator, typename Output >
         void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer,
+        void explode( AltIterator altBegin, AltIterator altEnd, const SymTab::Indexer & indexer,
                         Output&& out, bool isTupleAssign = false ) {
                 for ( ; altBegin != altEnd; ++altBegin ) {
 …
         template< typename Output >
         void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out,
+        void explode( const ResolvExpr::AltList & alts, const SymTab::Indexer & indexer, Output&& out,
                         bool isTupleAssign = false ) {
                 explode( alts.begin(), alts.end(), indexer, std::forward<Output>(out), isTupleAssign );

src/Tuples/TupleAssignment.cc

-              rf9feab8
+              r90152a4
                                                 lhsAlt.expr = new CastExpr( lhsAlt.expr,
                                                                 new ReferenceType( Type::Qualifiers(),
                                                                         lhsAlt.expr->get_result()->clone() ) );
+                                                                        lhsAlt.expr->result->clone() ) );
+                                        }
 …
                         ResolvExpr::AlternativeFinder finder{ currentFinder.get_indexer(),
+                                currentFinder.get_environ() };
+                                matcher->compositeEnv };
                         try {
                                 finder.findWithAdjustment(*i);
 …
                 // args.push_back( new AddressExpr( new VariableExpr( left ) ) );
                 if ( right ) args.push_back( new VariableExpr( right ) );
+                return new UntypedExpr( new NameExpr( fname ), args );
+        }
+        // removes environments from subexpressions within statement exprs, which could throw off later passes like those in Box which rely on PolyMutator.
+                if ( left->type->referenceDepth() > 1 && CodeGen::isConstructor( fname ) ) {
+                        args.front() = new AddressExpr( args.front() );
+                        if ( right ) args.back() = new AddressExpr( args.back() );
+                        return new UntypedExpr( new NameExpr( "?=?" ), args );
+                } else {
+                        return new UntypedExpr( new NameExpr( fname ), args );
+                }
+        }
+        // removes environments from subexpressions within statement exprs, which could throw off later passes like those in Box which rely on PolyMutator, and adds the bindings to the compositeEnv
         // xxx - maybe this should happen in alternative finder for every StmtExpr?
-        // xxx - it's possible that these environments could contain some useful information. Maybe the right thing to do is aggregate the environments and pass the aggregate back to be added into the compositeEnv
         struct EnvRemover {
                 void previsit( ExprStmt * stmt ) {
+                        delete stmt->expr->env;
+                        stmt->expr->env = nullptr;
+                }
+                        assert( compositeEnv );
+                        if ( stmt->expr->env ) {
+                                compositeEnv->add( *stmt->expr->env );
+                                delete stmt->expr->env;
+                                stmt->expr->env = nullptr;
+                        }
+                }
+                ResolvExpr::TypeEnvironment * compositeEnv = nullptr;
         };
         ObjectDecl * TupleAssignSpotter::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->get_result()->clone(), new SingleInit( expr->clone() ) );
+                ObjectDecl * ret = new ObjectDecl( namer.newName(), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, expr->result->clone(), new SingleInit( expr->clone() ) );
                 // if expression type is a reference, don't need to construct anything, a simple initializer is sufficient.
                 if ( ! dynamic_cast< ReferenceType * >( expr->get_result() ) ) {
+                if ( ! dynamic_cast< ReferenceType * >( expr->result ) ) {
                         ConstructorInit * ctorInit = InitTweak::genCtorInit( ret );
                         ret->set_init( ctorInit );
+                        ret->init = ctorInit;
                         ResolvExpr::resolveCtorInit( ctorInit, spotter.currentFinder.get_indexer() ); // resolve ctor/dtors for the new object
                         PassVisitor<EnvRemover> rm; // remove environments from subexpressions of StmtExprs
+                        rm.pass.compositeEnv = &compositeEnv;
                         ctorInit->accept( rm );
+                }
 …
                 assert( (! lhs.empty() && rhs.size() <= 1) || (lhs.empty() && rhs.empty()) );
+                // xxx - may need to split this up into multiple declarations, because potential conversion to references
+                //  probably should not reference local variable - see MultipleAssignMatcher::match
                 ObjectDecl * rtmp = rhs.size() == 1 ? newObject( rhsNamer, rhs.front().expr ) : nullptr;
                 for ( ResolvExpr::Alternative & lhsAlt : lhs ) {
 …
                         std::list< ObjectDecl * > ltmp;
                         std::list< ObjectDecl * > rtmp;
+                        std::transform( lhs.begin(), lhs.end(), back_inserter( ltmp ), [&]( ResolvExpr::Alternative & alt ){
+                                return newObject( lhsNamer, alt.expr );
+                        });
+                        std::transform( rhs.begin(), rhs.end(), back_inserter( rtmp ), [&]( ResolvExpr::Alternative & alt ){
+                                return newObject( rhsNamer, alt.expr );
+                        });
+                        zipWith( ltmp.begin(), ltmp.end(), rtmp.begin(), rtmp.end(), back_inserter(out), [&](ObjectDecl * obj1, ObjectDecl * obj2 ) { return createFunc(spotter.fname, obj1, obj2); } );
+                        for ( auto p : group_iterate( lhs, rhs ) ) {
+                                ResolvExpr::Alternative & lhsAlt = std::get<0>(p);
+                                ResolvExpr::Alternative & rhsAlt = std::get<1>(p);
+                                // convert RHS to LHS type minus one reference -- important for the case where LHS is && and RHS is lvalue, etc.
+                                ReferenceType * lhsType = strict_dynamic_cast<ReferenceType *>( lhsAlt.expr->result );
+                                rhsAlt.expr = new CastExpr( rhsAlt.expr, lhsType->base->clone() );
+                                ObjectDecl * lobj = newObject( lhsNamer, lhsAlt.expr );
+                                ObjectDecl * robj = newObject( rhsNamer, rhsAlt.expr );
+                                out.push_back( createFunc(spotter.fname, lobj, robj) );
+                                ltmp.push_back( lobj );
+                                rtmp.push_back( robj );
+                                // resolve the cast expression so that rhsAlt return type is bound by the cast type as needed, and transfer the resulting environment
+                                ResolvExpr::AlternativeFinder finder{ spotter.currentFinder.get_indexer(), compositeEnv };
+                                finder.findWithAdjustment( rhsAlt.expr );
+                                assert( finder.get_alternatives().size() == 1 );
+                                compositeEnv = std::move( finder.get_alternatives().front().env );
+                        }
                         tmpDecls.splice( tmpDecls.end(), ltmp );
                         tmpDecls.splice( tmpDecls.end(), rtmp );

src/Tuples/TupleExpansion.cc

-              rf9feab8
+              r90152a4
 #include "SynTree/Type.h"         // for Type, Type::Qualifiers, TupleType
 #include "SynTree/Visitor.h"      // for Visitor
+#include "Tuples.h"
 class CompoundStmt;
 …
 namespace Tuples {
         namespace {
+                struct MemberTupleExpander final : public Mutator {
+                        typedef Mutator Parent;
+                        using Parent::mutate;
+                        virtual Expression * mutate( UntypedMemberExpr * memberExpr ) override;
+                struct MemberTupleExpander final : public WithShortCircuiting, public WithVisitorRef<MemberTupleExpander> {
+                        void premutate( UntypedMemberExpr * ) { visit_children = false; }
+                        Expression * postmutate( UntypedMemberExpr * memberExpr );
                 };
 …
         void expandMemberTuples( std::list< Declaration * > & translationUnit ) {
                 MemberTupleExpander expander;
+                PassVisitor<MemberTupleExpander> expander;
                 mutateAll( translationUnit, expander );
+        }
 …
                                 // construct a new UntypedMemberExpr with the correct structure , and recursively
                                 // expand that member expression.
                                 MemberTupleExpander expander;
                                 UntypedMemberExpr * inner = new UntypedMemberExpr( memberExpr->get_aggregate(), aggr->clone() );
                                 UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->get_member(), inner );
+                                PassVisitor<MemberTupleExpander> expander;
+                                UntypedMemberExpr * inner = new UntypedMemberExpr( memberExpr->aggregate, aggr->clone() );
+                                UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->member, inner );
                                 inner->location = newMemberExpr->location = loc;
                                 memberExpr->set_member(nullptr);
                                 memberExpr->set_aggregate(nullptr);
+                                memberExpr->member = nullptr;
+                                memberExpr->aggregate = nullptr;
                                 delete memberExpr;
                                 return newMemberExpr->acceptMutator( expander );
 …
+        }
         Expression * MemberTupleExpander::mutate( UntypedMemberExpr * memberExpr ) {
                 if ( UntypedTupleExpr * tupleExpr = dynamic_cast< UntypedTupleExpr * > ( memberExpr->get_member() ) ) {
                         Expression * aggr = memberExpr->get_aggregate()->clone()->acceptMutator( *this );
+        Expression * MemberTupleExpander::postmutate( UntypedMemberExpr * memberExpr ) {
+                if ( UntypedTupleExpr * tupleExpr = dynamic_cast< UntypedTupleExpr * > ( memberExpr->member ) ) {
+                        Expression * aggr = memberExpr->aggregate->clone()->acceptMutator( *visitor );
                         // aggregate expressions which might be impure must be wrapped in unique expressions
+                        // xxx - if there's a member-tuple expression nested in the aggregate, this currently generates the wrong code if a UniqueExpr is not used, and it's purely an optimization to remove the UniqueExpr
+                        // if ( Tuples::maybeImpureIgnoreUnique( memberExpr->get_aggregate() ) ) aggr = new UniqueExpr( aggr );
+                        aggr = new UniqueExpr( aggr );
+                        for ( Expression *& expr : tupleExpr->get_exprs() ) {
+                        if ( Tuples::maybeImpureIgnoreUnique( memberExpr->aggregate ) ) aggr = new UniqueExpr( aggr );
+                        for ( Expression *& expr : tupleExpr->exprs ) {
                                 expr = reconstructMemberExpr( expr, aggr, memberExpr->location );
                                 expr->location = memberExpr->location;
 …
                         // there may be a tuple expr buried in the aggregate
                         // xxx - this is a memory leak
                         UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->get_member()->clone(), memberExpr->get_aggregate()->acceptMutator( *this ) );
+                        UntypedMemberExpr * newMemberExpr = new UntypedMemberExpr( memberExpr->member->clone(), memberExpr->aggregate->acceptMutator( *visitor ) );
                         newMemberExpr->location = memberExpr->location;
                         return newMemberExpr;
 …
                         // generate struct type to replace tuple type based on the number of components in the tuple
                         StructDecl * decl = new StructDecl( toString( "_tuple", tupleSize, "_" ) );
+                        decl->location = tupleType->location;
                         decl->set_body( true );
                         for ( size_t i = 0; i < tupleSize; ++i ) {
 …
         Expression * TupleIndexExpander::postmutate( TupleIndexExpr * tupleExpr ) {
                 Expression * tuple = tupleExpr->get_tuple();
+                Expression * tuple = tupleExpr->tuple;
                 assert( tuple );
                 tupleExpr->set_tuple( nullptr );
                 unsigned int idx = tupleExpr->get_index();
                 TypeSubstitution * env = tupleExpr->get_env();
                 tupleExpr->set_env( nullptr );
+                tupleExpr->tuple = nullptr;
+                unsigned int idx = tupleExpr->index;
+                TypeSubstitution * env = tupleExpr->env;
+                tupleExpr->env = nullptr;
                 delete tupleExpr;
+                StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->get_result() );
+                StructDecl * structDecl = type->get_baseStruct();
+                assert( structDecl->get_members().size() > idx );
+                Declaration * member = *std::next(structDecl->get_members().begin(), idx);
+                if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * > ( tuple ) ) {
+                        if ( ! maybeImpureIgnoreUnique( tupleExpr ) ) {
+                                // optimization: definitely pure tuple expr => can reduce to the only relevant component.
+                                assert( tupleExpr->exprs.size() > idx );
+                                Expression *& expr = *std::next(tupleExpr->exprs.begin(), idx);
+                                Expression * ret = expr;
+                                ret->env = env;
+                                expr = nullptr; // remove from list so it can safely be deleted
+                                delete tupleExpr;
+                                return ret;
+                        }
+                }
+                StructInstType * type = strict_dynamic_cast< StructInstType * >( tuple->result );
+                StructDecl * structDecl = type->baseStruct;
+                assert( structDecl->members.size() > idx );
+                Declaration * member = *std::next(structDecl->members.begin(), idx);
                 MemberExpr * memExpr = new MemberExpr( strict_dynamic_cast< DeclarationWithType * >( member ), tuple );
                 memExpr->set_env( env );
+                memExpr->env = env;
                 return memExpr;
+        }

src/main.cc

-              rf9feab8
+              r90152a4
 //
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
 …
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Oct 31 12:22:40 2017
 // Update Count     : 445
+// Last Modified On : Wed Jun  6 15:51:47 2018
+// Update Count     : 498
 //
 …
 #include <string>                           // for char_traits, operator<<
+#include "CompilationState.h"
 #include "../config.h"                      // for CFA_LIBDIR
 #include "CodeGen/FixMain.h"                // for FixMain
 …
 #include "CodeTools/DeclStats.h"            // for printDeclStats
 #include "CodeTools/TrackLoc.h"             // for fillLocations
+#include "Common/CompilerError.h"           // for CompilerError
+#include "Common/Heap.h"
 #include "Common/PassVisitor.h"
-#include "Common/CompilerError.h"           // for CompilerError
 #include "Common/SemanticError.h"           // for SemanticError
 #include "Common/UnimplementedError.h"      // for UnimplementedError
 …
 using namespace std;
+#define OPTPRINT(x) if ( errorp ) cerr << x << endl;
+#define PASS(name, pass)                   \
+        if ( errorp ) { cerr << name << endl; } \
+        HeapStats::newPass(name);               \
+        pass;
 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,
+        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;
+std::string PreludeDirector = "";
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
 …
                  << "." << endl;
         backtrace( 2 );                                                                         // skip first 2 stack frames
+        exit( EXIT_FAILURE );
+        //_exit( EXIT_FAILURE );
+        abort();
 } // sigSegvBusHandler
 …
         signal( SIGBUS, sigSegvBusHandler );
         signal( SIGABRT, sigAbortHandler );
+        // std::cout << "main" << std::endl;
+        // for ( int i = 0; i < argc; i += 1 ) {
+        //      std::cout << '\t' << argv[i] << std::endl;
+        // } // for
         parse_cmdline( argc, argv, filename );                          // process command-line arguments
 …
                         // -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" );
+                                FILE * prelude = fopen( (PreludeDirector + "/prelude.cf").c_str(), "r" );
                                 assertf( prelude, "cannot open prelude.cf\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );
                                 // Read to cfa builtins, if not generating the cfa library
                                 FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                                FILE * builtins = fopen( (PreludeDirector + "/builtins.cf").c_str(), "r" );
                                 assertf( builtins, "cannot open builtins.cf\n" );
                                 parse( builtins, LinkageSpec::BuiltinCFA );
 …
                 } // 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 );
                 // add the assignment statement after the initialization of a type parameter
+                OPTPRINT( "validate" )
+                SymTab::validate( translationUnit, symtabp );
+                PASS( "validate", SymTab::validate( translationUnit, symtabp ) );
                 if ( symtabp ) {
                         deleteAll( translationUnit );
 …
                 } // if
+                OPTPRINT( "mutate" )
+                ControlStruct::mutate( translationUnit );
+                OPTPRINT( "fixNames" )
+                CodeGen::fixNames( translationUnit );
+                OPTPRINT( "genInit" )
+                InitTweak::genInit( translationUnit );
+                OPTPRINT( "expandMemberTuples" );
+                Tuples::expandMemberTuples( translationUnit );
+                PASS( "fixLabels", ControlStruct::fixLabels( translationUnit ) );
+                PASS( "fixNames", CodeGen::fixNames( translationUnit ) );
+                PASS( "genInit", InitTweak::genInit( translationUnit ) );
+                PASS( "expandMemberTuples" , Tuples::expandMemberTuples( translationUnit ) );
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
 …
                 } // if
+                OPTPRINT( "resolve" )
+                ResolvExpr::resolve( translationUnit );
+                CodeTools::fillLocations( translationUnit );
+                PASS( "resolve", ResolvExpr::resolve( translationUnit ) );
                 if ( exprp ) {
                         dump( translationUnit );
 …
                 // fix ObjectDecl - replaces ConstructorInit nodes
+                OPTPRINT( "fixInit" )
+                InitTweak::fix( translationUnit, filename, libcfap || treep );
+                PASS( "fixInit", InitTweak::fix( translationUnit, buildingLibrary() ) );
                 if ( ctorinitp ) {
                         dump ( translationUnit );
 …
                 } // if
+                OPTPRINT( "expandUniqueExpr" ); // xxx - is this the right place for this? want to expand ASAP so that subsequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
+                Tuples::expandUniqueExpr( translationUnit );
+                OPTPRINT( "translateEHM" );
+                ControlStruct::translateEHM( translationUnit );
+                OPTPRINT( "generateWaitfor" );
+                Concurrency::generateWaitFor( translationUnit );
+                OPTPRINT( "convertSpecializations" ) // needs to happen before tuple types are expanded
+                GenPoly::convertSpecializations( translationUnit );
+                OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
+                Tuples::expandTuples( translationUnit );
+                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?
                 if ( tuplep ) {
                         dump( translationUnit );
 …
+                }
+                OPTPRINT( "virtual expandCasts" ) // Must come after translateEHM
+                Virtual::expandCasts( translationUnit );
+                OPTPRINT("instantiateGenerics")
+                GenPoly::instantiateGeneric( translationUnit );
+                OPTPRINT( "convertLvalue" )
+                GenPoly::convertLvalue( translationUnit );
+                PASS( "virtual expandCasts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
+                PASS( "instantiateGenerics", GenPoly::instantiateGeneric( translationUnit ) );
+                if ( genericsp ) {
+                        dump( translationUnit );
+                        return 0;
+                }
+                PASS( "convertLvalue", GenPoly::convertLvalue( translationUnit ) );
                 if ( bboxp ) {
 …
                         return 0;
                 } // if
+                OPTPRINT( "box" )
+                GenPoly::box( translationUnit );
+                PASS( "box", GenPoly::box( translationUnit ) );
                 if ( bcodegenp ) {
 …
                 CodeTools::fillLocations( translationUnit );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks );
+                CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
+                PASS( "codegen", CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, linemarks ) );
+                CodeGen::FixMain::fix( *output, (PreludeDirector + "/bootloader.c").c_str() );
                 if ( output != &cout ) {
                         delete output;
                 } // if
         } catch ( SemanticError &e ) {
+        } catch ( SemanticErrorException &e ) {
                 if ( errorp ) {
                         cerr << "---AST at error:---" << endl;
 …
                         cerr << endl << "---End of AST, begin error message:---\n" << endl;
                 } // if
                 e.print( cerr );
+                e.print();
                 if ( output != &cout ) {
                         delete output;
 …
                 } // if
                 return 1;
+        } // try
+        } catch(...) {
+                std::exception_ptr eptr = std::current_exception();
+                try {
+                        if (eptr) {
+                                std::rethrow_exception(eptr);
+                        }
+                        else {
+                                std::cerr << "Exception Uncaught and Unkown" << std::endl;
+                        }
+                } catch(const std::exception& e) {
+                        std::cerr << "Unaught Exception \"" << e.what() << "\"\n";
+                }
+                return 1;
+        }// try
         deleteAll( translationUnit );
+        if(!libcfap && !treep) HeapStats::printStats();
         return 0;
 } // 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, };
+        enum { Ast, Bbox, Bresolver, CtorInitFix, DeclStats, Expr, ExprAlt, Grammar, LibCFA, Linemarks, Nolinemarks, Nopreamble, Parse, PreludeDir, Prototypes, Resolver, Symbol, Tree, TupleExpansion, Validate, };
         static struct option long_opts[] = {
 …
                 { "no-preamble", no_argument, 0, Nopreamble },
                 { "parse", no_argument, 0, Parse },
+                { "prelude-dir", required_argument, 0, PreludeDir },
                 { "no-prototypes", no_argument, 0, Prototypes },
                 { "resolver", no_argument, 0, Resolver },
 …
         opterr = 0;                                                                                     // (global) prevent getopt from printing error messages
+        bool Wsuppress = false, Werror = false;
         int c;
         while ( (c = getopt_long( argc, argv, "abBcCdefglLmnNpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefgGlLmnNpqrstTvwW:yzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
 …
                         yydebug = true;
                         break;
+                  case 'G':                                                                             // dump AST after instantiate generics
+                        genericsp = true;
+                        break;
                   case LibCFA:
                   case 'l':                                                                             // generate libcfa.c
 …
                         noprotop = true;
                         break;
+                  case PreludeDir:
+                        PreludeDirector = optarg;
+                        break;
                   case 'm':                                                                             // don't replace the main
                         nomainp = true;
 …
                   case 'v':                                                                             // dump AST after decl validation pass
                         validp = true;
+                        break;
+                  case 'w':
+                        Wsuppress = true;
+                        break;
+                  case 'W':
+                        if ( strcmp( optarg, "all" ) == 0 ) {
+                                SemanticWarning_EnableAll();
+                        } else if ( strcmp( optarg, "error" ) == 0 ) {
+                                Werror = true;
+                        } else {
+                                char * warning = optarg;
+                                Severity s;
+                                if ( strncmp( optarg, "no-", 3 ) == 0 ) {
+                                        warning += 3;
+                                        s = Severity::Suppress;
+                                } else {
+                                        s = Severity::Warn;
+                                } // if
+                                SemanticWarning_Set( warning, s );
+                        } // if
                         break;
                   case 'y':                                                                             // dump AST on error
 …
                                 assertf( false, "Unknown option: %s\n", argv[optind - 1] );
                         } // if
+                        #if __GNUC__ < 7
+                        #else
+                        #if defined(__GNUC__) && __GNUC__ >= 7
                                 __attribute__((fallthrough));
                         #endif
 …
                 } // switch
         } // while
+        if ( Werror ) {
+                SemanticWarning_WarningAsError();
+        } // if
+        if ( Wsuppress ) {
+                SemanticWarning_SuppressAll();
+        } // if
+        // for ( const auto w : WarningFormats ) {
+        //      cout << w.name << ' ' << (int)w.severity << endl;
+        // } // for
 } // parse_cmdline
 …
         yyin = input;
         yylineno = 1;
-        typedefTable.enterScope();
         int parseStatus = yyparse();

tools/Makefile.am

-              rf9feab8
+              r90152a4
 ###############################################################################
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
 CC = @BACKEND_CC@
 CFLAGS = -Wall -Wextra -O2 -g
+AM_CFLAGS = -Wall -Wextra -O2 -g
 noinst_PROGRAMS = catchsig repeat
+noinst_PROGRAMS = busy catchsig repeat watchdog
+busy_SOURCES     = busy.c
+busy_LDFLAGS     = -pthread
 catchsig_SOURCES = catchsig.c
 repeat_SOURCES   = repeat.c
+watchdog_SOURCES = watchdog.c

tools/Makefile.in

-              rf9feab8
+              r90152a4
 build_triplet = @build@
 host_triplet = @host@
+noinst_PROGRAMS = 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/cfa.m4 \
+        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
+am_busy_OBJECTS = busy.$(OBJEXT)
+busy_OBJECTS = $(am_busy_OBJECTS)
+busy_LDADD = $(LDADD)
+busy_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@)
 …
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
+SOURCES = $(catchsig_SOURCES) $(repeat_SOURCES)
+DIST_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 \
 …
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @BACKEND_CC@
 CCAS = @CCAS@
 …
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+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@
 …
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 …
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
+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)
+$(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)
+busy$(EXEEXT): $(busy_OBJECTS) $(busy_DEPENDENCIES) $(EXTRA_busy_DEPENDENCIES)
+        @rm -f busy$(EXEEXT)
+        $(AM_V_CCLD)$(busy_LINK) $(busy_OBJECTS) $(busy_LDADD) $(LIBS)
 catchsig$(EXEEXT): $(catchsig_OBJECTS) $(catchsig_DEPENDENCIES) $(EXTRA_catchsig_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)
 …
         -rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/busy.Po@am__quote@
 @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:

tools/prettyprinter/Makefile.am

-              rf9feab8
+              r90152a4
 ######################## -*- 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
 ## Last Modified By : Peter A. Buhr
 ## Last Modified On : Wed Jun 28 23:11:56 2017
 ## Update Count     : 15
+## Last Modified On : Mon Apr 16 09:43:23 2018
+## Update Count     : 20
 ###############################################################################
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
 BUILT_SOURCES = parser.hh

tools/prettyprinter/Makefile.in

-              rf9feab8
+              r90152a4
 subdir = tools/prettyprinter
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
+        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
 …
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 =
-@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
 LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
 AM_V_LEX = $(am__v_LEX_@AM_V@)
 …
 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/
 …
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
 CC = @CC@
 CCAS = @CCAS@
 …
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
+CFACC = @CFACC@
+CFACPP = @CFACPP@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 …
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DRIVER_DIR = @DRIVER_DIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 …
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+HOST_FLAGS = @HOST_FLAGS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 …
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 …
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
 …
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
 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)
+$(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):

tools/prettyprinter/lex.ll

-              rf9feab8
+              r90152a4
  * Created On       : Sat Dec 15 11:45:59 2001
  * Last Modified By : Peter A. Buhr
  * Last Modified On : Tue Aug 29 17:33:36 2017
  * Update Count     : 268
+ * Last Modified On : Thu May 31 08:49:58 2018
+ * Update Count     : 274
  */
 …
 <INITIAL,C_CODE>"/*" {                                                                  // C style comments */
 #if defined(DEBUG_ALL) | defined(DEBUG_COMMENT)
     cerr << "\"/*\" : " << yytext << endl;
+                cerr << "\"/*\" : " << yytext << endl;
 #endif
     if ( YYSTATE == C_CODE ) code_str += yytext;
     else comment_str += yytext;
     yy_push_state(C_COMMENT);
+                if ( YYSTATE == C_CODE ) code_str += yytext;
+                else comment_str += yytext;
+                yy_push_state(C_COMMENT);
+}
 <C_COMMENT>(.|"\n")     {                                                                       // C style comments
 #if defined(DEBUG_ALL) | defined(DEBUG_COMMENT)
     cerr << "<C_COMMENT>(.|\\n) : " << yytext << endl;
+                cerr << "<C_COMMENT>(.|\\n) : " << yytext << endl;
 #endif
     if ( yy_top_state() == C_CODE ) code_str += yytext;
     else comment_str += yytext;
+                if ( yy_top_state() == C_CODE ) code_str += yytext;
+                else comment_str += yytext;
+}
 <C_COMMENT>"*/" {                                                                               // C style comments
 …
+}
 <INITIAL,C_CODE>"//"[^\n]*"\n" {                                                // C++ style comments
+<INITIAL,C_CODE>"//"[^\n]* {                                                    // C++ style comments
 #if defined(DEBUG_ALL) | defined(DEBUG_COMMENT)
         cerr << "\"//\"[^\\n]*\"\n\" : " << yytext << endl;
 …
 <C_CODE>"%}"    { RETURN_TOKEN( RCURL ) }
+^"%union"       { RETURN_TOKEN( UNION ) }
+^"%start"       { RETURN_TOKEN( START ) }
+^"%token"       { RETURN_TOKEN( TOKEN ) }
+^"%type"            { RETURN_TOKEN( TYPE ) }
+^"%left"            { RETURN_TOKEN( LEFT ) }
+^"%right"           { RETURN_TOKEN( RIGHT ) }
+^"%nonassoc"    { RETURN_TOKEN( NONASSOC ) }
+^"%precedence"  { RETURN_TOKEN( PRECEDENCE ) }
+^"%define"[^\n]*"\n" { RETURN_TOKEN( DEFINE ) }
+^"%expect"              { RETURN_TOKEN( EXPECT ) }
+^"%left"                { RETURN_TOKEN( LEFT ) }
+^"%locations"   { RETURN_TOKEN( LOCATIONS ) }
+^"%nonassoc"    { RETURN_TOKEN( NONASSOC ) }
+^"%precedence"  { RETURN_TOKEN( PRECEDENCE ) }
 ^"%pure_parser" { RETURN_TOKEN( PURE_PARSER ) }
+^"%right"               { RETURN_TOKEN( RIGHT ) }
 ^"%semantic_parser"     { RETURN_TOKEN( SEMANTIC_PARSER ) }
+^"%expect"      { RETURN_TOKEN( EXPECT ) }
+^"%thong"               { RETURN_TOKEN( THONG ) }
+^"%start"               { RETURN_TOKEN( START ) }
+^"%thong"               { RETURN_TOKEN( THONG ) }
+^"%token"               { RETURN_TOKEN( TOKEN ) }
+^"%type"                { RETURN_TOKEN( TYPE ) }
+^"%union"               { RETURN_TOKEN( UNION ) }
 "%prec"                 { RETURN_TOKEN( PREC ) }
+"%prec"                 { RETURN_TOKEN( PREC ) }
 {integer}           { RETURN_TOKEN( INTEGER ); }
 [']{c_char}[']  { RETURN_TOKEN( CHARACTER ); }
 {identifier}    { RETURN_TOKEN( IDENTIFIER ); }
+{integer}               { RETURN_TOKEN( INTEGER ); }
+[']{c_char}[']  { RETURN_TOKEN( CHARACTER ); }
+{identifier}    { RETURN_TOKEN( IDENTIFIER ); }
 <C_CODE>["]{s_char}*["] {                                                               // hide braces "{}" in strings
 …
 %%
 void lexC(void) {
     BEGIN(C_CODE);
+        BEGIN(C_CODE);
+}
 string lexYacc(void) {
     BEGIN(INITIAL);
     //cerr << "CODE: " << endl << code_str << endl;
     string temp( code_str );
     code_str = "";
     return temp;
+        BEGIN(INITIAL);
+        //cerr << "CODE: " << endl << code_str << endl;
+        string temp( code_str );
+        code_str = "";
+        return temp;
+}

tools/prettyprinter/parser.yy

-              rf9feab8
+              r90152a4
 // Created On       : Sat Dec 15 13:44:21 2001
 // Last Modified By : Peter A. Buhr
 // Last Modified On : Tue Aug 29 16:34:10 2017
 // Update Count     : 1047
+// Last Modified On : Sun Apr 15 21:40:30 2018
+// Update Count     : 1052
 //
 …
 %token<tokenp>  CODE                                                                    // C code
+%token<tokenp>  START                                                                   // %start
+%token<tokenp>  UNION                                                                   // %union
+%token<tokenp>  TOKEN                                                                   // %token
+%token<tokenp>  DEFINE                                                                  // %define
+%token<tokenp>  EXPECT                                                                  // %expect
 %token<tokenp>  LEFT                                                                    // %left
 %token<tokenp>  RIGHT                                                                   // %right
+%token<tokenp>  LOCATIONS                                                               // %locations
 %token<tokenp>  NONASSOC                                                                // %nonassoc
 %token<tokenp>  PRECEDENCE                                                              // %precedence
+%token<tokenp>  PURE_PARSER                                                             // %pure_parser
+%token<tokenp>  RIGHT                                                                   // %right
+%token<tokenp>  SEMANTIC_PARSER                                                 // %semantic_parser
+%token<tokenp>  START                                                                   // %start
+%token<tokenp>  THONG                                                                   // %thong
+%token<tokenp>  TOKEN                                                                   // %token
 %token<tokenp>  TYPE                                                                    // %type
+%token<tokenp>  PURE_PARSER                                                             // %pure_parser
+%token<tokenp>  SEMANTIC_PARSER                                                 // %semantic_parser
+%token<tokenp>  EXPECT                                                                  // %expect
+%token<tokenp>  THONG                                                                   // %thong
+%token<tokenp>  UNION                                                                   // %union
 %token<tokenp>  PREC                                                                    // %prec
 %token          END_TERMINALS                                                           // ALL TERMINAL TOKEN NAMES MUST APPEAR BEFORE THIS
+%token                  END_TERMINALS                                                   // ALL TERMINAL TOKEN NAMES MUST APPEAR BEFORE THIS
 %type<tokenp>   sections
 %token          _SECTIONS
+%token                  _SECTIONS
 %type<tokenp>   mark
 %type<tokenp>   defsection_opt
 %token          _DEFSECTION_OPT
+%token                  _DEFSECTION_OPT
 %type<tokenp>   declarations
 %type<tokenp>   literalblock
 %token          _LITERALBLOCK
+%token                  _LITERALBLOCK
 %type<tokenp>   declaration
 %token          _DECLARATION
+%token                  _DECLARATION
 %type<tokenp>   union
 %type<tokenp>   rword
 %type<tokenp>   tag_opt
 %token          _TAG_OPT
+%token                  _TAG_OPT
 %type<tokenp>   namenolist
 %token          _NAMENOLIST
+%token                  _NAMENOLIST
 %type<tokenp>   nameno
 %token          _NAMENO
+%token                  _NAMENO
 %type<tokenp>   namelist
 %token          _NAMELIST
+%token                  _NAMELIST
 %type<tokenp>   name
 %type<tokenp>   rulesection
 %token          _RULESECTION
+%token                  _RULESECTION
 %type<tokenp>   rules
 %token          _RULE
+%token                  _RULE
 %type<tokenp>   lhs
 %token          _LHS
+%token                  _LHS
 %type<tokenp>   rhs
 %token          _RHS
+%token                  _RHS
 %type<tokenp>   prod
 %type<tokenp>   prec
 %token          _PREC
+%token                  _PREC
 %type<tokenp>   action
 %token          _ACTION
+%token                  _ACTION
 %type<tokenp>   usersection_opt
 %token          _USERSECTION_OPT
+%token                  _USERSECTION_OPT
 %type<tokenp>   ccode_opt
 %type<tokenp>   blocks
 …
                     $$ = $1;
+                }
+        | DEFINE                                                                                        // bison
+        | LOCATIONS
         | THONG                                                                                         // bison
+        ;

tools/prettyprinter/test.y

-              rf9feab8
+              r90152a4
 /* adsad2 */
+%locations
+%define parse.error verbose
 %%

tools/repeat.c

-              rf9feab8
+              r90152a4
                 if(print_iterations) {
                         printf("\r%d / %d", i, repetitions);
+                        fflush(stdout);
+                }
                 int retcode = run();
 …
         fprintf(out, "Repeat CMD N times\n\n");
         fprintf(out, "\t-h,--help\tprint this usage message\n");
+        fprintf(out, "\t-s\tstop on error\n");
+        fprintf(out, "\t-i\toutput iterations instead of CMD stdout\n");
+        fprintf(out, "\t-x\tprint CMD before running it\n");
+        fprintf(out, "\t-s\t\tstop on error\n");
+        fprintf(out, "\t-i\t\toutput iterations instead of CMD stdout\n");
+        fprintf(out, "\t-x\t\tprint CMD before running it\n");
+        fprintf(out, "\t-a FILE\t\tredirect output of command to append to FILE\n");
+        fprintf(out, "\t-r FILE\t\tredirect output of command to FILE\n");
         exit(code);
+}
 …
 char ** cmd_to_run = NULL;
 bool print_cmd = false;
+bool redirect = false;
+bool redirect_append = false;
+char * redirect_to = "/dev/null";
 pid_t child_pid = 0;
 …
         int c;
         while ( (c = getopt_long( argc, argv, "hsxi", long_opts, &long_index)) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "ahirsx", long_opts, &long_index)) != -1 ) {
                 switch ( c ) {
                         case Help:
 …
                         case 'i':
                                 print_iterations = true;
+                                break;
+                        case 'a':
+                                if(redirect) { fprintf(stderr, "Cannot have -a and -r\n"); error(); }
+                                redirect_append = true;
+                                redirect_to = argv[optind];
+                                optind++;
+                                break;
+                        case 'r':
+                                if(redirect_append) { fprintf(stderr, "Cannot have -a and -r\n"); error(); }
+                                redirect = true;
+                                redirect_to = argv[optind];
+                                optind++;
                                 break;
                         default:
 …
                         printf("\n");
+                }
                 if(print_iterations) {
+                if(print_iterations || redirect || redirect_append) {
                         __attribute__((unused)) FILE * ignore =
                                 freopen("/dev/null", "w", stdout);
+                                freopen(redirect_to, redirect_append ? "a" : "w" , stdout);
+                }
                 execvp ( *cmd_to_run, cmd_to_run);

Context Navigation

Changes in / [f9feab8:90152a4]

Legend: