Changeset 4eb1db6


Ignore:
Timestamp:
Jun 2, 2015, 2:28:24 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, string, with_gc
Children:
954463b8
Parents:
d939274 (diff), c3a4385 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into labels

Files:
18 edited
9 moved

Legend:

Unmodified
Added
Removed
  • .gitignore

    rd939274 r4eb1db6  
    2020
    2121# src executables, for lib and bin
    22 driver/cc1
    23 driver/cfa
     22src/driver/cc1
     23src/driver/cfa
    2424src/cfa-cpp
    25 libcfa/libcfa-prelude.c
     25src/libcfa/libcfa-prelude.c
    2626
    27 # generated by bison and lex from cfa.y and lex.l, respectively
    28 src/Parser/cfa.output
     27# generated by bison and lex from cfa.yy and lex.ll, respectively
     28src/Parser/parser.output
  • Makefile.am

    rd939274 r4eb1db6  
    1111## Created On       : Sun May 31 22:14:18 2015
    1212## Last Modified By : Peter A. Buhr
    13 ## Last Modified On : Sun May 31 22:14:57 2015
    14 ## Update Count     : 1
     13## Last Modified On : Mon Jun  1 20:20:40 2015
     14## Update Count     : 5
    1515###############################################################################
    1616
    17 AUTOMAKE_OPTIONS = foreign      # do not require all the GNU file names
    18 SUBDIRS = driver src libcfa     # order important, src before libcfa because cfa-cpp used to build prelude
    19 EXTRA_DIST = Docs               # non-source files
    20 BACKEND_CC = @BACKEND_CC@       # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
     17AUTOMAKE_OPTIONS = foreign              # do not require all the GNU file names
     18SUBDIRS = src/driver src src/libcfa     # order important, src before libcfa because cfa-cpp used to build prelude
     19EXTRA_DIST = Docs                       # non-source files
     20BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
  • Makefile.in

    rd939274 r4eb1db6  
    115115AUTOMAKE = @AUTOMAKE@
    116116AWK = @AWK@
    117 BACKEND_CC = @BACKEND_CC@       # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
     117BACKEND_CC = @BACKEND_CC@               # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
    118118CC = @CC@
    119119CCDEPMODE = @CCDEPMODE@
     
    212212top_builddir = @top_builddir@
    213213top_srcdir = @top_srcdir@
    214 AUTOMAKE_OPTIONS = foreign      # do not require all the GNU file names
    215 SUBDIRS = driver src libcfa     # order important, src before libcfa because cfa-cpp used to build prelude
    216 EXTRA_DIST = Docs               # non-source files
     214AUTOMAKE_OPTIONS = foreign              # do not require all the GNU file names
     215SUBDIRS = src/driver src src/libcfa     # order important, src before libcfa because cfa-cpp used to build prelude
     216EXTRA_DIST = Docs                       # non-source files
    217217all: config.h
    218218        $(MAKE) $(AM_MAKEFLAGS) all-recursive
  • configure

    rd939274 r4eb1db6  
    45284528
    45294529        # deprecated
     4530# These are often not installed and people miss seeing the "no", so stop the configure.
    45304531for ac_prog in 'bison -y' byacc
    45314532do
     
    45714572test -n "$YACC" || YACC="yacc"
    45724573
     4574if test "${YACC}" = "yacc" ; then echo "Error: bison required." ; exit 1 ; fi
    45734575
    45744576for ac_prog in flex lex
     
    47304732
    47314733fi
     4734if test "${LEX}" = "lex" ; then echo "Error: flex required." ; exit 1 ; fi
    47324735
    47334736{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
     
    57495752
    57505753
    5751 ac_config_files="$ac_config_files Makefile driver/Makefile src/Makefile src/examples/Makefile libcfa/Makefile"
     5754ac_config_files="$ac_config_files Makefile src/driver/Makefile src/Makefile src/examples/Makefile src/libcfa/Makefile"
    57525755
    57535756
     
    64926495    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    64936496    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    6494     "driver/Makefile") CONFIG_FILES="$CONFIG_FILES driver/Makefile" ;;
     6497    "src/driver/Makefile") CONFIG_FILES="$CONFIG_FILES src/driver/Makefile" ;;
    64956498    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
    64966499    "src/examples/Makefile") CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
    6497     "libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES libcfa/Makefile" ;;
     6500    "src/libcfa/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcfa/Makefile" ;;
    64986501
    64996502  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
  • configure.ac

    rd939274 r4eb1db6  
    6666AC_PROG_CC
    6767AM_PROG_CC_C_O  # deprecated
     68# These are often not installed and people miss seeing the "no", so stop the configure.
    6869AC_PROG_YACC
     70if test "${YACC}" = "yacc" ; then echo "Error: bison required." ; exit 1 ; fi
    6971AC_PROG_LEX
     72if test "${LEX}" = "lex" ; then echo "Error: flex required." ; exit 1 ; fi
    7073AC_PROG_INSTALL
    7174AC_PROG_MAKE_SET
     
    9598AC_CONFIG_FILES([
    9699        Makefile
    97         driver/Makefile
     100        src/driver/Makefile
    98101        src/Makefile
    99102        src/examples/Makefile
    100         libcfa/Makefile
     103        src/libcfa/Makefile
    101104        ])
    102105
  • src/ArgTweak/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:50:11 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117#SRC +=  ArgTweak/Rewriter.cc \
    218#       ArgTweak/Mutate.cc
  • src/CodeGen/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:50:52 2015
     14## Update Count     : 2
     15###############################################################################
     16
     17#SRC +=  ArgTweak/Rewriter.cc \
     18#       ArgTweak/Mutate.cc
     19
    120SRC +=  CodeGen/Generate.cc \
    221        CodeGen/CodeGenerator.cc \
  • src/Common/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:51:23 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC += Common/SemanticError.cc \
    218       Common/UniqueName.cc
  • src/ControlStruct/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:51:45 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC +=  ControlStruct/LabelGenerator.cc \
    218        ControlStruct/LabelFixer.cc \
  • src/Designators/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:52:06 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC += Designators/Processor.cc
  • src/GenPoly/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:52:30 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC += GenPoly/Box.cc \
    218       GenPoly/GenPoly.cc \
  • src/InitTweak/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:52:49 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC += InitTweak/InitModel.cc \
    218       InitTweak/InitExpander.cc \
  • src/Makefile.in

    rd939274 r4eb1db6  
    1717
    1818######################## -*- Mode: Makefile-Automake -*- ######################
     19###############################################################################
     20
     21######################### -*- Mode: Makefile-Gmake -*- ########################
     22###############################################################################
     23
     24######################### -*- Mode: Makefile-Gmake -*- ########################
     25###############################################################################
     26
     27#SRC +=  ArgTweak/Rewriter.cc \
     28#       ArgTweak/Mutate.cc
     29
     30######################### -*- Mode: Makefile-Gmake -*- ########################
     31###############################################################################
     32
     33######################### -*- Mode: Makefile-Gmake -*- ########################
     34###############################################################################
     35
     36######################### -*- Mode: Makefile-Gmake -*- ########################
     37###############################################################################
     38
     39######################### -*- Mode: Makefile-Gmake -*- ########################
     40###############################################################################
     41
     42######################### -*- Mode: Makefile-Gmake -*- ########################
     43###############################################################################
     44
     45######################### -*- Mode: Makefile-Gmake -*- ########################
     46###############################################################################
     47
     48######################### -*- Mode: Makefile-Gmake -*- ########################
     49###############################################################################
     50
     51######################### -*- Mode: Makefile-Gmake -*- ########################
     52###############################################################################
     53
     54######################### -*- Mode: Makefile-Gmake -*- ########################
    1955###############################################################################
    2056
  • src/ResolvExpr/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:53:28 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC += ResolvExpr/AlternativeFinder.cc \
    218       ResolvExpr/Alternative.cc \
  • src/SymTab/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:53:50 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC += SymTab/IdTable.cc \
    218       SymTab/Indexer.cc \
  • src/SynTree/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:54:09 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC += SynTree/Type.cc \
    218       SynTree/VoidType.cc \
  • src/Tuples/module.mk

    rd939274 r4eb1db6  
     1######################### -*- Mode: Makefile-Gmake -*- ########################
     2##
     3## Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
     4##
     5## The contents of this file are covered under the licence agreement in the
     6## file "LICENCE" distributed with Cforall.
     7##
     8## module.mk --
     9##
     10## Author           : Richard C. Bilson
     11## Created On       : Mon Jun  1 17:49:17 2015
     12## Last Modified By : Peter A. Buhr
     13## Last Modified On : Mon Jun  1 17:54:33 2015
     14## Update Count     : 1
     15###############################################################################
     16
    117SRC +=  Tuples/Mutate.cc \
    218        Tuples/AssignExpand.cc \
  • src/driver/Makefile.in

    rd939274 r4eb1db6  
    3838bin_PROGRAMS = cfa$(EXEEXT)
    3939cc1lib_PROGRAMS = cc1$(EXEEXT)
    40 subdir = driver
     40subdir = src/driver
    4141DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    4242ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    195195          esac; \
    196196        done; \
    197         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu driver/Makefile'; \
     197        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/driver/Makefile'; \
    198198        $(am__cd) $(top_srcdir) && \
    199           $(AUTOMAKE) --gnu driver/Makefile
     199          $(AUTOMAKE) --gnu src/driver/Makefile
    200200.PRECIOUS: Makefile
    201201Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • src/examples/sum.c

    rd939274 r4eb1db6  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed May 27 18:43:46 2015
    13 // Update Count     : 4
     12// Last Modified On : Mon Jun  1 20:46:35 2015
     13// Update Count     : 18
    1414//
    1515
     
    4242
    4343int main() {
    44         const int size = 10, low = 0, High = 10;
    45         int si = 0, ai[10]; // size
    46         int i;
    47         for ( i = low; i < High; i += 1 ) {
    48                 si += i;
    49                 ai[i] = i;
     44        const int low = 5, High = 15, size = High - low;
     45        int si = 0, ai[size];
     46        int v = low;
     47        for ( int i = 0; i < size; i += 1, v += 1 ) {
     48                si += v;
     49                ai[i] = v;
    5050        }
    5151        printf( "sum from %d to %d is %d, check %d\n",
    5252                        low, High, sum( size, ai ), si );
    5353
    54 //      char ci[10];
     54//      char ci[size];
    5555//      char c = sum( size, ci );
    56 //      float fi[10];
     56//      float fi[size];
    5757//      float f = sum( size, fi );
    5858
    59         double sd = 0.0, ad[10];                                                        // size
    60         for ( i = low; i < High; i += 1 ) {
    61                 double d = i / (double)size;
    62                 sd += d;
    63                 ad[i] = d;
     59        double sd = 0.0, ad[size];
     60        double v = low / 10.0;
     61        for ( int i = 0; i < size; i += 1, v += 0.1 ) {
     62                sd += v;
     63                ad[i] = v;
    6464        }
    6565        printf( "sum from %g to %g is %g, check %g\n",
    66                         low / (double)size, High / (double)size, sum( size, ad ), sd );
     66                        low / 10.0, High / 10.0, sum( size, ad ), sd );
    6767}
    6868
  • src/libcfa/Makefile.in

    rd939274 r4eb1db6  
    3737PRE_UNINSTALL = :
    3838POST_UNINSTALL = :
    39 subdir = libcfa
     39subdir = src/libcfa
    4040DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    4141ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    219219          esac; \
    220220        done; \
    221         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libcfa/Makefile'; \
     221        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/libcfa/Makefile'; \
    222222        $(am__cd) $(top_srcdir) && \
    223           $(AUTOMAKE) --gnu libcfa/Makefile
     223          $(AUTOMAKE) --gnu src/libcfa/Makefile
    224224.PRECIOUS: Makefile
    225225Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
Note: See TracChangeset for help on using the changeset viewer.