Changeset e276be6


Ignore:
Timestamp:
Apr 6, 2020, 8:50:45 PM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
9d5d01f
Parents:
23ecea4 (diff), f1b6671 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:
9 added
12 edited

Legend:

Unmodified
Added
Removed

  • libcfa/prelude/Makefile.in

    r23ecea4 re276be6  
    1 # Makefile.in generated by automake 1.16.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2018 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
    … …  
    331331            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
    332332          *) \
    333             echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
    334             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
     333            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
     334            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    335335        esac;
    336336
    … …  
    377377
    378378
    379 distdir: $(BUILT_SOURCES)
    380         $(MAKE) $(AM_MAKEFLAGS) distdir-am
    381 
    382 distdir-am: $(DISTFILES)
     379distdir: $(DISTFILES)
    383380        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
    384381        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

  • libcfa/src/Makefile.am

    r23ecea4 re276be6  
    3333# The built sources must not depend on the installed headers
    3434AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
    35 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
     35AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
    3636AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    3737CFACC = @CFACC@

  • libcfa/src/Makefile.in

    r23ecea4 re276be6  
    456456# The built sources must not depend on the installed headers
    457457AM_CFAFLAGS = -quiet -cfalib -I$(srcdir)/stdhdr $(if $(findstring ${gdbwaittarget}, ${@}), -XCFA --gdb) @CONFIG_CFAFLAGS@
    458 AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
     458AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC -fexceptions -pthread @ARCH_FLAGS@ @CONFIG_CFLAGS@
    459459AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    460460@BUILDLIB_FALSE@headers_nosrc =

  • libcfa/src/exception.c

    r23ecea4 re276be6  
    1010// Created On       : Mon Jun 26 15:13:00 2017
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Fri Apr 03 11:57:00 2020
    13 // Update Count     : 14
     12// Last Modified On : Mon Apr 06 14:40:00 2020
     13// Update Count     : 15
    1414//
    1515
    … …  
    7575// RESUMPTION ================================================================
    7676
     77static void reset_top_resume(struct __cfaehm_try_resume_node ** store) {
     78        this_exception_context()->top_resume = *store;
     79}
     80
    7781void __cfaehm_throw_resume(exception_t * except) {
    7882        struct exception_context_t * context = this_exception_context();
    … …  
    8084        __cfaabi_dbg_print_safe("Throwing resumption exception\n");
    8185
     86        __attribute__((cleanup(reset_top_resume)))
    8287        struct __cfaehm_try_resume_node * original_head = context->top_resume;
    8388        struct __cfaehm_try_resume_node * current = context->top_resume;
    … …  
    8691                context->top_resume = current->next;
    8792                if (current->handler(except)) {
    88                         context->top_resume = original_head;
    8993                        return;
    9094                }
    … …  
    9296
    9397        __cfaabi_dbg_print_safe("Unhandled exception\n");
    94         context->top_resume = original_head;
    9598
    9699        // Fall back to termination:

  • tests/errors/.expect/completeType.txt

    r23ecea4 re276be6  
    2727    void
    2828  )
    29   Environment:( _85_4_DT ) -> instance of struct A with body 0 (no widening)
     29  Environment:( _85_2_DT ) -> instance of struct A with body 0 (no widening)
    3030
    3131
    … …  
    5050    void
    5151  )
    52   Environment:( _85_4_DT ) -> instance of struct B with body 1 (no widening)
     52  Environment:( _85_2_DT ) -> instance of struct B with body 1 (no widening)
    5353
    5454

  • tests/exceptions/.expect/interact.txt

    r23ecea4 re276be6  
    1414resumption catch, will terminate
    1515inner termination catch
     16
     17throwing resume moon
     18resumption moon catch, will terminate
     19termination catch
     20throwing resume star
     21resumption star catch

  • tests/exceptions/.expect/resume.txt

    r23ecea4 re276be6  
    2525caught second exception
    2626recaught first exception
     27
     28inner catch
     29inner catch
     30outer catch

  • tests/exceptions/.expect/terminate.txt

    r23ecea4 re276be6  
    2424caught second exception
    2525recaught first exception
     26
     27inner catch
     28outer catch

  • tests/exceptions/interact.cfa

    r23ecea4 re276be6  
    8686                printf("outer terminate catch (error)\n");
    8787        }
    88 #if 0
    8988        printf("\n");
    9089
    … …  
    111110                printf("outermost catch (error)\n");
    112111        }
    113 #endif
    114112}

  • tests/exceptions/resume.cfa

    r23ecea4 re276be6  
    9999                printf("caught second exception (bad location)\n");
    100100        }
     101        printf("\n");
     102
     103        // Check successive operations.
     104        try {
     105                try {
     106                        THROW_RESUME(&(zen){});
     107                        THROW_RESUME(&(zen){});
     108                } catchResume (zen *) {
     109                        printf("inner catch\n");
     110                }
     111                THROW_RESUME(&(zen){});
     112        } catchResume (zen *) {
     113                printf("outer catch\n");
     114        }
    101115}

  • tests/exceptions/terminate.cfa

    r23ecea4 re276be6  
    9999                printf("caught second exception (bad location)\n");
    100100        }
     101        printf("\n");
     102
     103        // Check successive operations.
     104        try {
     105                try {
     106                        THROW(&(zen){});
     107                        THROW(&(zen){});
     108                } catch (zen *) {
     109                        printf("inner catch\n");
     110                }
     111                THROW(&(zen){});
     112        } catch (zen *) {
     113                printf("outer catch\n");
     114        }
    101115}

  • tools/vscode/uwaterloo.cforall-0.1.0/package.json

    r23ecea4 re276be6  
    1515                "Other"
    1616        ],
     17        "activationEvents": [
     18                "onLanguage:cforall"
     19        ],
     20        "main": "./client/main.js",
    1721        "contributes": {
    1822                "languages": [
    … …  
    3943                                "path": "./syntaxes/cfa.tmLanguage.json"
    4044                        }
    41                 ]
     45                ],
     46                "configuration": {
     47                        "type": "object",
     48                        "title": "Example configuration",
     49                        "properties": {
     50                                "cforall.maxNumberOfProblems": {
     51                                        "scope": "resource",
     52                                        "type": "number",
     53                                        "default": 100,
     54                                        "description": "Controls the maximum number of problems produced by the server."
     55                                },
     56                                "cforall.trace.server": {
     57                                        "scope": "window",
     58                                        "type": "string",
     59                                        "enum": [
     60                                                "off",
     61                                                "messages",
     62                                                "verbose"
     63                                        ],
     64                                        "default": "off",
     65                                        "description": "Traces the communication between VS Code and the language server."
     66                                }
     67                        }
     68                }
     69        },
     70        "dependencies": {
     71                "vscode-languageclient": "^4.1.4"
     72        },
     73        "devDependencies": {
     74                "vscode-languageclient": "^4.1.4"
    4275        }
    4376}
Note: See TracChangeset for help on using the changeset viewer.