Changeset 48a8127
- Timestamp:
- Jun 21, 2016, 5:47:10 PM (8 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, 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. - Location:
- src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/GenPoly/ScopedMap.h
r122cac7 r48a8127 90 90 return next_valid(); 91 91 } 92 iterator &operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }92 iterator operator++ (int) { iterator tmp = *this; ++(*this); return tmp; } 93 93 94 94 iterator& operator-- () { … … 101 101 return prev_valid(); 102 102 } 103 iterator &operator-- (int) { iterator tmp = *this; --(*this); return tmp; }103 iterator operator-- (int) { iterator tmp = *this; --(*this); return tmp; } 104 104 105 105 bool operator== (const iterator &that) { … … 166 166 return next_valid(); 167 167 } 168 const_iterator &operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }168 const_iterator operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; } 169 169 170 170 const_iterator& operator-- () { … … 177 177 return prev_valid(); 178 178 } 179 const_iterator &operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }179 const_iterator operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; } 180 180 181 181 bool operator== (const const_iterator &that) { -
src/GenPoly/ScopedSet.h
r122cac7 r48a8127 87 87 return next_valid(); 88 88 } 89 iterator &operator++ (int) { iterator tmp = *this; ++(*this); return tmp; }89 iterator operator++ (int) { iterator tmp = *this; ++(*this); return tmp; } 90 90 91 91 iterator& operator-- () { … … 98 98 return prev_valid(); 99 99 } 100 iterator &operator-- (int) { iterator tmp = *this; --(*this); return tmp; }100 iterator operator-- (int) { iterator tmp = *this; --(*this); return tmp; } 101 101 102 102 bool operator== (const iterator &that) { … … 163 163 return next_valid(); 164 164 } 165 const_iterator &operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; }165 const_iterator operator++ (int) { const_iterator tmp = *this; ++(*this); return tmp; } 166 166 167 167 const_iterator& operator-- () { … … 174 174 return prev_valid(); 175 175 } 176 const_iterator &operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; }176 const_iterator operator-- (int) { const_iterator tmp = *this; --(*this); return tmp; } 177 177 178 178 bool operator== (const const_iterator &that) { -
src/tests/Makefile.am
r122cac7 r48a8127 19 19 CC = @CFA_BINDIR@/cfa 20 20 21 noinst_PROGRAMS = fstream_test vector_test avl_test # build but do not install 21 .PHONY : list 22 EXTRA_PROGRAMS = fstream_test vector_test avl_test Constant0-1DP Constant0-1ND Constant0-1NDDP # build but do not install 23 22 24 fstream_test_SOURCES = fstream_test.c 23 25 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c 24 26 avl_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 28 all-local : 29 python test.py --all 30 31 clean-local : 32 -rm -f ${EXTRA_PROGRAMS} 33 34 list : 35 python test.py --list 25 36 26 37 Constant0-1DP : Constant0-1.c -
src/tests/Makefile.in
r122cac7 r48a8127 18 18 ######################## -*- Mode: Makefile-Automake -*- ###################### 19 19 ############################################################################### 20 21 20 VPATH = @srcdir@ 22 21 pkgdatadir = $(datadir)/@PACKAGE@ … … 36 35 PRE_UNINSTALL = : 37 36 POST_UNINSTALL = : 38 noinst_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \ 39 avl_test$(EXEEXT) 37 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \ 38 avl_test$(EXEEXT) Constant0-1DP$(EXEEXT) \ 39 Constant0-1ND$(EXEEXT) Constant0-1NDDP$(EXEEXT) 40 40 subdir = src/tests 41 41 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in … … 48 48 CONFIG_CLEAN_FILES = 49 49 CONFIG_CLEAN_VPATH_FILES = 50 PROGRAMS = $(noinst_PROGRAMS) 50 Constant0_1DP_SOURCES = Constant0-1DP.c 51 Constant0_1DP_OBJECTS = Constant0-1DP.$(OBJEXT) 52 Constant0_1DP_LDADD = $(LDADD) 53 Constant0_1ND_SOURCES = Constant0-1ND.c 54 Constant0_1ND_OBJECTS = Constant0-1ND.$(OBJEXT) 55 Constant0_1ND_LDADD = $(LDADD) 56 Constant0_1NDDP_SOURCES = Constant0-1NDDP.c 57 Constant0_1NDDP_OBJECTS = Constant0-1NDDP.$(OBJEXT) 58 Constant0_1NDDP_LDADD = $(LDADD) 51 59 am_avl_test_OBJECTS = avl_test.$(OBJEXT) avl0.$(OBJEXT) avl1.$(OBJEXT) \ 52 60 avl2.$(OBJEXT) avl3.$(OBJEXT) avl4.$(OBJEXT) \ … … 84 92 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) 85 93 am__v_GEN_0 = @echo " GEN " $@; 86 SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ 94 SOURCES = Constant0-1DP.c Constant0-1ND.c Constant0-1NDDP.c \ 95 $(avl_test_SOURCES) $(fstream_test_SOURCES) \ 87 96 $(vector_test_SOURCES) 88 DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ 97 DIST_SOURCES = Constant0-1DP.c Constant0-1ND.c Constant0-1NDDP.c \ 98 $(avl_test_SOURCES) $(fstream_test_SOURCES) \ 89 99 $(vector_test_SOURCES) 90 100 ETAGS = etags … … 235 245 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 236 246 $(am__aclocal_m4_deps): 237 238 clean-noinstPROGRAMS:239 -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)240 247 avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES) 241 248 @rm -f avl_test$(EXEEXT) … … 254 261 -rm -f *.tab.c 255 262 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@ 256 266 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@ 257 267 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl-private.Po@am__quote@ … … 504 514 check-am: all-am 505 515 check: check-am 506 all-am: Makefile $(PROGRAMS)516 all-am: Makefile all-local 507 517 installdirs: 508 518 install: install-am … … 538 548 clean: clean-am 539 549 540 clean-am: clean-generic clean- noinstPROGRAMSmostlyclean-am550 clean-am: clean-generic clean-local mostlyclean-am 541 551 542 552 distclean: distclean-am … … 607 617 .MAKE: install-am install-strip 608 618 609 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic\610 clean- noinstPROGRAMSctags 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 \ 611 621 distclean-generic distclean-tags distdir dvi dvi-am html \ 612 622 html-am info info-am install install-am install-data \ … … 621 631 622 632 633 .PHONY : list 634 635 all-local : 636 python test.py --all 637 638 clean-local : 639 -rm -f ${EXTRA_PROGRAMS} 640 641 list : 642 python test.py --list 643 623 644 Constant0-1DP : Constant0-1.c 624 645 ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}
Note: See TracChangeset
for help on using the changeset viewer.