Changeset 48a8127


Ignore:
Timestamp:
Jun 21, 2016, 5:47:10 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
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, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
df42128
Parents:
122cac7 (diff), 6bc4734 (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

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/GenPoly/ScopedMap.h

    r122cac7 r48a8127  
    9090                                return next_valid();
    9191                        }
    92                         iterator& operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
     92                        iterator operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
    9393
    9494                        iterator& operator-- () {
     
    101101                                return prev_valid();
    102102                        }
    103                         iterator& operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
     103                        iterator operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
    104104
    105105                        bool operator== (const iterator &that) {
     
    166166                                return next_valid();
    167167                        }
    168                         const_iterator& operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
     168                        const_iterator operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
    169169
    170170                        const_iterator& operator-- () {
     
    177177                                return prev_valid();
    178178                        }
    179                         const_iterator& operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
     179                        const_iterator operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
    180180
    181181                        bool operator== (const const_iterator &that) {
  • src/GenPoly/ScopedSet.h

    r122cac7 r48a8127  
    8787                                return next_valid();
    8888                        }
    89                         iterator& operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
     89                        iterator operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }
    9090
    9191                        iterator& operator-- () {
     
    9898                                return prev_valid();
    9999                        }
    100                         iterator& operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
     100                        iterator operator-- (int) { iterator tmp = *this; --(*this); return tmp; }
    101101
    102102                        bool operator== (const iterator &that) {
     
    163163                                return next_valid();
    164164                        }
    165                         const_iterator& operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
     165                        const_iterator operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }
    166166
    167167                        const_iterator& operator-- () {
     
    174174                                return prev_valid();
    175175                        }
    176                         const_iterator& operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
     176                        const_iterator operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }
    177177
    178178                        bool operator== (const const_iterator &that) {
  • src/tests/Makefile.am

    r122cac7 r48a8127  
    1919CC = @CFA_BINDIR@/cfa
    2020
    21 noinst_PROGRAMS = fstream_test vector_test avl_test # build but do not install
     21.PHONY : list
     22EXTRA_PROGRAMS = fstream_test vector_test avl_test Constant0-1DP Constant0-1ND Constant0-1NDDP # build but do not install
     23
    2224fstream_test_SOURCES = fstream_test.c
    2325vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
    2426avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
     27
     28all-local :
     29        python test.py --all
     30
     31clean-local :
     32        -rm -f ${EXTRA_PROGRAMS}
     33
     34list :
     35        python test.py --list
    2536
    2637Constant0-1DP : Constant0-1.c
  • src/tests/Makefile.in

    r122cac7 r48a8127  
    1818######################## -*- Mode: Makefile-Automake -*- ######################
    1919###############################################################################
    20 
    2120VPATH = @srcdir@
    2221pkgdatadir = $(datadir)/@PACKAGE@
     
    3635PRE_UNINSTALL = :
    3736POST_UNINSTALL = :
    38 noinst_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
    39         avl_test$(EXEEXT)
     37EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
     38        avl_test$(EXEEXT) Constant0-1DP$(EXEEXT) \
     39        Constant0-1ND$(EXEEXT) Constant0-1NDDP$(EXEEXT)
    4040subdir = src/tests
    4141DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    4848CONFIG_CLEAN_FILES =
    4949CONFIG_CLEAN_VPATH_FILES =
    50 PROGRAMS = $(noinst_PROGRAMS)
     50Constant0_1DP_SOURCES = Constant0-1DP.c
     51Constant0_1DP_OBJECTS = Constant0-1DP.$(OBJEXT)
     52Constant0_1DP_LDADD = $(LDADD)
     53Constant0_1ND_SOURCES = Constant0-1ND.c
     54Constant0_1ND_OBJECTS = Constant0-1ND.$(OBJEXT)
     55Constant0_1ND_LDADD = $(LDADD)
     56Constant0_1NDDP_SOURCES = Constant0-1NDDP.c
     57Constant0_1NDDP_OBJECTS = Constant0-1NDDP.$(OBJEXT)
     58Constant0_1NDDP_LDADD = $(LDADD)
    5159am_avl_test_OBJECTS = avl_test.$(OBJEXT) avl0.$(OBJEXT) avl1.$(OBJEXT) \
    5260        avl2.$(OBJEXT) avl3.$(OBJEXT) avl4.$(OBJEXT) \
     
    8492am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
    8593am__v_GEN_0 = @echo "  GEN   " $@;
    86 SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
     94SOURCES = Constant0-1DP.c Constant0-1ND.c Constant0-1NDDP.c \
     95        $(avl_test_SOURCES) $(fstream_test_SOURCES) \
    8796        $(vector_test_SOURCES)
    88 DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
     97DIST_SOURCES = Constant0-1DP.c Constant0-1ND.c Constant0-1NDDP.c \
     98        $(avl_test_SOURCES) $(fstream_test_SOURCES) \
    8999        $(vector_test_SOURCES)
    90100ETAGS = etags
     
    235245        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    236246$(am__aclocal_m4_deps):
    237 
    238 clean-noinstPROGRAMS:
    239         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
    240247avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES)
    241248        @rm -f avl_test$(EXEEXT)
     
    254261        -rm -f *.tab.c
    255262
     263@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Constant0-1DP.Po@am__quote@
     264@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Constant0-1ND.Po@am__quote@
     265@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Constant0-1NDDP.Po@am__quote@
    256266@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
    257267@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl-private.Po@am__quote@
     
    504514check-am: all-am
    505515check: check-am
    506 all-am: Makefile $(PROGRAMS)
     516all-am: Makefile all-local
    507517installdirs:
    508518install: install-am
     
    538548clean: clean-am
    539549
    540 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
     550clean-am: clean-generic clean-local mostlyclean-am
    541551
    542552distclean: distclean-am
     
    607617.MAKE: install-am install-strip
    608618
    609 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    610         clean-noinstPROGRAMS ctags distclean distclean-compile \
     619.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
     620        clean-generic clean-local ctags distclean distclean-compile \
    611621        distclean-generic distclean-tags distdir dvi dvi-am html \
    612622        html-am info info-am install install-am install-data \
     
    621631
    622632
     633.PHONY : list
     634
     635all-local :
     636        python test.py --all
     637
     638clean-local :
     639        -rm -f ${EXTRA_PROGRAMS}
     640
     641list :
     642        python test.py --list
     643
    623644Constant0-1DP : Constant0-1.c
    624645        ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}
Note: See TracChangeset for help on using the changeset viewer.