Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ src/Makefile.in (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -1,8 +1,7 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -59,4 +58,49 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -78,9 +122,10 @@ $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk \ $(srcdir)/Designators/module.mk $(srcdir)/GenPoly/module.mk \ - $(srcdir)/InitTweak/module.mk $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/Parser/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 \ - Parser/lex.cc Parser/parser.cc Parser/parser.h + $(srcdir)/Makefile.in $(srcdir)/Makefile.am Parser/parser.hh \ + Parser/parser.cc Parser/lex.cc $(top_srcdir)/automake/depcomp \ + $(top_srcdir)/automake/ylwrap cfa_cpplib_PROGRAMS = driver/cfa-cpp$(EXEEXT) subdir = src @@ -208,4 +253,16 @@ driver_cfa_cpp_LINK = $(CXXLD) $(driver_cfa_cpp_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/automake/depcomp @@ -215,12 +272,11 @@ 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_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ @@ -228,31 +284,57 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; +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_ = $(am__v_LEX_@AM_DEFAULT_V@) -am__v_LEX_0 = @echo " LEX " $@; +am__v_LEX_0 = @echo " LEX " $@; +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/ YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS) AM_V_YACC = $(am__v_YACC_@AM_V@) am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) -am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_0 = @echo " YACC " $@; +am__v_YACC_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(driver_cfa_cpp_SOURCES) DIST_SOURCES = $(driver_cfa_cpp_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags @@ -467,12 +549,16 @@ install-cfa_cpplibPROGRAMS: $(cfa_cpplib_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(cfa_cpplibdir)" || $(MKDIR_P) "$(DESTDIR)$(cfa_cpplibdir)" @list='$(cfa_cpplib_PROGRAMS)'; test -n "$(cfa_cpplibdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(cfa_cpplibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(cfa_cpplibdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ @@ -495,5 +581,6 @@ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(cfa_cpplibdir)' && rm -f" $$files ")"; \ @@ -605,5 +692,5 @@ InitTweak/driver_cfa_cpp-InitTweak.$(OBJEXT): \ InitTweak/$(am__dirstamp) InitTweak/$(DEPDIR)/$(am__dirstamp) -Parser/parser.h: Parser/parser.cc +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 @@ -807,4 +894,5 @@ @$(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) @@ -813,108 +901,15 @@ mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f CodeGen/driver_cfa_cpp-CodeGenerator.$(OBJEXT) - -rm -f CodeGen/driver_cfa_cpp-FixNames.$(OBJEXT) - -rm -f CodeGen/driver_cfa_cpp-GenType.$(OBJEXT) - -rm -f CodeGen/driver_cfa_cpp-Generate.$(OBJEXT) - -rm -f CodeGen/driver_cfa_cpp-OperatorTable.$(OBJEXT) - -rm -f Common/driver_cfa_cpp-SemanticError.$(OBJEXT) - -rm -f Common/driver_cfa_cpp-UniqueName.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-CaseRangeMutator.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-ChooseMutator.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-ForExprMutator.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-LabelFixer.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-LabelGenerator.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-LabelTypeChecker.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-MLEMutator.$(OBJEXT) - -rm -f ControlStruct/driver_cfa_cpp-Mutate.$(OBJEXT) - -rm -f Designators/driver_cfa_cpp-Processor.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-Box.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-CopyParams.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-DeclMutator.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-FindFunction.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-GenPoly.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-Lvalue.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-PolyMutator.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-ScrubTyVars.$(OBJEXT) - -rm -f GenPoly/driver_cfa_cpp-Specialize.$(OBJEXT) - -rm -f InitTweak/driver_cfa_cpp-FixGlobalInit.$(OBJEXT) - -rm -f InitTweak/driver_cfa_cpp-FixInit.$(OBJEXT) - -rm -f InitTweak/driver_cfa_cpp-GenInit.$(OBJEXT) - -rm -f InitTweak/driver_cfa_cpp-InitTweak.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-DeclarationNode.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-ExpressionNode.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-InitializerNode.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-LinkageSpec.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-ParseNode.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-Parser.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-StatementNode.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-TypeData.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-TypedefTable.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-lex.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-parser.$(OBJEXT) - -rm -f Parser/driver_cfa_cpp-parseutility.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-AdjustExprType.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-Alternative.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-AlternativeFinder.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-AlternativePrinter.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-CastCost.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-CommonType.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-ConversionCost.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-FindOpenVars.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-Occurs.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-PolyCost.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-PtrsAssignable.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-PtrsCastable.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-RenameVars.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-ResolveTypeof.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-Resolver.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-TypeEnvironment.$(OBJEXT) - -rm -f ResolvExpr/driver_cfa_cpp-Unify.$(OBJEXT) - -rm -f SymTab/driver_cfa_cpp-Autogen.$(OBJEXT) - -rm -f SymTab/driver_cfa_cpp-FixFunction.$(OBJEXT) - -rm -f SymTab/driver_cfa_cpp-ImplementationType.$(OBJEXT) - -rm -f SymTab/driver_cfa_cpp-Indexer.$(OBJEXT) - -rm -f SymTab/driver_cfa_cpp-Mangler.$(OBJEXT) - -rm -f SymTab/driver_cfa_cpp-TypeEquality.$(OBJEXT) - -rm -f SymTab/driver_cfa_cpp-Validate.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-AddressExpr.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-AggregateDecl.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-ApplicationExpr.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-ArrayType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-AttrType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Attribute.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-BasicType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-CommaExpr.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-CompoundStmt.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Constant.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-DeclStmt.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Declaration.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-DeclarationWithType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Expression.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-FunctionDecl.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-FunctionType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Initializer.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Mutator.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-NamedTypeDecl.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-ObjectDecl.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-PointerType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-ReferenceToType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Statement.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-TupleExpr.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-TupleType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Type.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-TypeDecl.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-TypeExpr.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-TypeSubstitution.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-TypeofType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-VarArgsType.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-Visitor.$(OBJEXT) - -rm -f SynTree/driver_cfa_cpp-VoidType.$(OBJEXT) - -rm -f Tuples/driver_cfa_cpp-AssignExpand.$(OBJEXT) - -rm -f Tuples/driver_cfa_cpp-FunctionChecker.$(OBJEXT) - -rm -f Tuples/driver_cfa_cpp-FunctionFixer.$(OBJEXT) - -rm -f Tuples/driver_cfa_cpp-Mutate.$(OBJEXT) - -rm -f Tuples/driver_cfa_cpp-NameMatcher.$(OBJEXT) - -rm -f Tuples/driver_cfa_cpp-TupleAssignment.$(OBJEXT) + -rm -f CodeGen/*.$(OBJEXT) + -rm -f Common/*.$(OBJEXT) + -rm -f ControlStruct/*.$(OBJEXT) + -rm -f Designators/*.$(OBJEXT) + -rm -f GenPoly/*.$(OBJEXT) + -rm -f InitTweak/*.$(OBJEXT) + -rm -f Parser/*.$(OBJEXT) + -rm -f ResolvExpr/*.$(OBJEXT) + -rm -f SymTab/*.$(OBJEXT) + -rm -f SynTree/*.$(OBJEXT) + -rm -f Tuples/*.$(OBJEXT) distclean-compile: @@ -2431,16 +2426,16 @@ SynTree/driver_cfa_cpp-Attribute.o: SynTree/Attribute.cc -@am__fastdepCXX_TRUE@ $(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__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ 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@ $(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 +@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@ $(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__mv) SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Tpo SynTree/$(DEPDIR)/driver_cfa_cpp-Attribute.Po -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ 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@ $(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` +@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` Tuples/driver_cfa_cpp-Mutate.o: Tuples/Mutate.cc @@ -2532,26 +2527,15 @@ .yy.cc: - $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) + $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ @@ -2565,13 +2549,9 @@ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ @@ -2582,4 +2562,19 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: @@ -2680,5 +2675,5 @@ -rm -f Parser/lex.cc -rm -f Parser/parser.cc - -rm -f Parser/parser.h + -rm -f Parser/parser.hh -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) @@ -2754,17 +2749,17 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean \ - clean-cfa_cpplibPROGRAMS clean-generic ctags 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 uninstall uninstall-am \ - uninstall-cfa_cpplibPROGRAMS +.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 Index: src/Tests/Array.c =================================================================== --- src/Tests/Array.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,37 +1,0 @@ -int a1[]; -//int a2[*]; -//double a4[3.0]; - -int m1[][3]; -//int m2[*][*]; -int m4[3][3]; - -typedef int T; - -int fred() { -// int a1[]; -// int a2[*]; - int a4[3]; - int T[3]; -} - -int mary( int T[3], - int p1[const 3], - int p2[static 3], - int p3[static const 3] - ) { -} - -int (*tom())[3] { -} - -int (*(jane)())( int T[3], - int p1[const 3], - int p2[static 3], - int p3[static const 3] - ) { -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/AsmName.c =================================================================== --- src/Tests/AsmName.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,14 +1,0 @@ -extern int x asm( "xx" ); - -int fred( int x ) { - static int y asm( "yy" ); - -// Cforall extensions - - static * int z asm( "zz" ); -} - -// errors - -//typedef int t asm( "tt" ); -//int mary( int p asm( "pp" ) ) {} Index: src/Tests/Cast.c =================================================================== --- src/Tests/Cast.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,15 +1,0 @@ -char f; - -void f() { - char f; - double f; - (int)f; - short f; - (int)f; - (void(*)())f; - ([long, long double, *[]()])([f, f, f]); -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/CastError.c =================================================================== --- src/Tests/CastError.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,12 +1,0 @@ -int f; - -void f() { - int f; - double f; - (char)f; - (int(*)())f; -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/CharStringConstants.c =================================================================== --- src/Tests/CharStringConstants.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,87 +1,0 @@ -int main() { -// character constants - - ' '; - 'a'; - '"'; - '_'; - - '\a'; // simple escape - '\b'; - '\e'; // GCC - '\f'; - '\n'; - '\r'; - '\t'; - '\v'; - '\''; - '\"'; - '\?'; - '\\'; - - '\0'; // octal escape - - '\377'; - - '\xf'; // hex escape - '\xff'; - -// warnings/errors - - ''; // empty character - 'aa'; // multi-character - 'a\na'; // multi-character, embedded escape - 'a\0a'; - '\xfff'; // hex escape out of range - '_\377_'; // multi-character - '_\xff_'; - '\xffff'; // hex escape out of range - 'a\xff34w'; - '\xf_f'; // multi-character - '\xff_ff'; - -// string constants - - " "; - "a"; - "'"; - '_'; - - "\a"; // simple escape - "\b"; - "\e"; // GCC - "\f"; - "\n"; - "\r"; - "\t"; - "\v"; - "\'"; - "\""; - "\?"; - "\\"; - - "\0"; // octal escape - "\377"; - - "\xf"; // hex escape - "\xff"; - - ""; - "aa"; - "a\na"; - "a\0a"; - "_\377_"; - "_\xff_"; - "\xf_f"; - -// warnings/errors - - "\xff_ff"; - "\xfff"; // hex escape out of range - "a\xff34w"; - "\xffff"; -} - -// Local Variables: // -// compile-command: "../../../bin/cfa -std=c99 CharStringConstants.c" // -// End: // Index: src/Tests/CommentMisc.c =================================================================== --- src/Tests/CommentMisc.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,44 +1,0 @@ -/* single line */ -// single line - -// single line containing */ -// single line containing /* -// single line containing /* */ - -/* 1st */ int i; -int i; /* 2nd */ -/* 1st */ int i; /* 2nd */ -/* 1st */ /* 2nd */ - -/* 1st - 2nd */ int i; - -/* -*/ - -/* - -*/ - -/* - 1st -*/ - -/* - 1st - 2nd -*/ - -// ignore preprocessor directives - -#line 2 - # - #include - #define mary abc - -// alternative ANSI99 brackets - -int main() <% - int x<:10:>; -%> - Index: src/Tests/Constant0-1.c =================================================================== --- src/Tests/Constant0-1.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,46 +1,0 @@ -// Cforall extension - -// value - -int 0; -const int 0; -static const int 0; -int 1; -const int 1; -static const int 1; -int 0, 1; -const int 0, 1; -int (0), (1); -int ((0)), ((1)); -static const int 0, 1; -struct { int i; } 0; -const struct { int i; } 1; -static const struct { int i; } 1; - -// pointer - -int *0, *1; -int *(0), *(1); -int (*0), (*1); -int ((*0)), ((*1)); -int * const (0), * const 1; -int (* const 0), (* const 1); -int ((* const 0)), ((* const 1)); -struct { int i; } *0; - -// Cforall style - -* int x, 0; -const * int x, 0; -static const * int x, 0; -* struct { int i; } 0; -const * struct { int i; } 0; -static const * struct { int i; } 0; -static * int x, 0; -static const * int x, 0; -const * * int x, 0; - -int main() { - int 1, * 0; - * int x, 0; -} Index: src/Tests/Context.c =================================================================== --- src/Tests/Context.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,15 +1,0 @@ -context has_q( otype T ) { - T q( T ); -}; - -forall( otype z | has_q( z ) ) void f() { - context has_r( otype T, otype U ) { - T r( T, T (T,U) ); - }; - - extern otype x, y | has_r( x, y ); -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/DeclarationErrors.c =================================================================== --- src/Tests/DeclarationErrors.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,9 +1,0 @@ -static short int volatile static const x9; // duplicate static -struct { int i; } const static volatile static x18; // duplicate static -struct { int i; } const static volatile static volatile x19; // duplicate static & volatile -typedef int Int; -static Int volatile static const x28; // duplicate static - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/DeclarationSpecifier.c =================================================================== --- src/Tests/DeclarationSpecifier.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,93 +1,0 @@ -typedef short int Int; - - -const short int volatile x1; -static const short int volatile x2; -const static short int volatile x3; -const short static int volatile x4; -const static volatile short int x4; -const short int static volatile x5; -const short int volatile static x6; -const short volatile int static x7; -short int volatile static const x8; -static short int volatile static const x9; // duplicate static - -const volatile struct { int i; } x10; -const struct { int i; } volatile x11; -struct { int i; } const volatile x12; -static const volatile struct { int i; } x13; -const static struct { int i; } volatile x14; -struct { int i; } static const volatile x15; -struct { int i; } const static volatile x16; -struct { int i; } const volatile static x17; -struct { int i; } const static volatile static x18; // duplicate static -struct { int i; } const static volatile static volatile x19; // duplicate static & volatile - -const Int volatile x20; -static const Int volatile x21; -const static Int volatile x22; -const static Int volatile x23; -const Int static volatile x24; -const Int volatile static x25; -const volatile Int static x26; -Int volatile static const x27; -static Int volatile static const x28; // duplicate static - -const volatile struct { Int i; } x29; -const struct { Int i; } volatile x30; -struct { Int i; } const volatile x31; -static const volatile struct { Int i; } x32; -const static struct { Int i; } volatile x33; -struct { Int i; } static const volatile x34; -struct { Int i; } const static volatile x35; -struct { Int i; } const volatile static x36; - - -const static inline const volatile int f01(); // duplicate const -volatile inline const volatile static int f02(); // duplicate volatile -const inline const volatile int static f03(); // duplicate const -volatile inline static const volatile int f04(); // duplicate volatile -const static const inline volatile int f05(); // duplicate const -volatile static const volatile inline int f06(); // duplicate volatile -const static const volatile int inline f07(); // duplicate const -volatile static const int inline volatile f08(); // duplicate volatile - -static inline const volatile int f11(); -inline const volatile static int f12(); -inline const volatile int static f13(); -inline static const volatile int f14(); -static const inline volatile int f15(); -static const volatile inline int f16(); -static const volatile int inline f17(); -static const int inline volatile f18(); - -short static inline const volatile int f21(); -inline short const volatile static int f22(); -inline const short volatile int static f23(); -inline static const short volatile int f24(); -static const inline volatile short int f25(); -static const volatile inline int short f26(); -static const volatile int inline short f27(); -static const int inline volatile short f28(); - -static inline const volatile struct { int i; } f31(); -inline const volatile static struct { int i; } f32(); -inline const volatile struct { int i; } static f33(); -inline static const volatile struct { int i; } f34(); -static const inline volatile struct { int i; } f35(); -static const volatile inline struct { int i; } f36(); -static const volatile struct { int i; } inline f37(); -static const struct { int i; } inline volatile f38(); - -static inline const volatile Int f41(); -inline const volatile static Int f42(); -inline const volatile Int static f43(); -inline static const volatile Int f44(); -static const inline volatile Int f45(); -static const volatile inline Int f46(); -static const volatile Int inline f47(); -static const Int inline volatile f48(); - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/Enum.c =================================================================== --- src/Tests/Enum.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,22 +1,0 @@ -enum Colors { - Red, - Yellow, - Pink, - Blue, - Purple, - Orange, - Green -}; - -void f( void ) { - enum Fruits { - Apple, - Banana, - Pear, - Mango - } fruit = Mango; -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/Exception.c =================================================================== --- src/Tests/Exception.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,24 +1,0 @@ -int fred() { - int x; - throw 3; - throw x = 5; - - try { - } catch( int i ) {} - - try { - x/4; - } catch( int) { - } catch( int x ) { - } catch( struct { int i; } ) { - } catch( struct { int i; } x ) { - } catch( struct { int i; } *x ) { - -// Cforall extensions - - } catch( * struct { int i; } ) { - } catch( * struct { int i; } x ) { - } catch( ... ) { -// } finally { - } // try -} Index: src/Tests/Expression.c =================================================================== --- src/Tests/Expression.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,67 +1,0 @@ -int fred() { - struct s { int i; } *p; - int i; - - // order of evaluation (GCC is different) -/* - i = sizeof( (int) {3} ); - i = sizeof (int) {3}; -*/ - // operators - - ! i; - ~i; - +i; - -i; - *p; - ++p; - --p; - p++; - p--; - - i+i; - i-i; - i*i; - - i/i; - i%i; - i^i; - i&i; - i|i; - ii; - i=i; - - i==i; - i!=i; - i<>i; - i<=i; - i>=i; - i&&i; - i||i; - p->i; - i+=i; - i-=i; - i*=i; - i/=i; - i%=i; - i&=i; - i|=i; - i^=i; - i<<=i; - i>>=i; - - i?i:i; - - // cast -/* - double d; - int *ip; - (int *) i; - (* int) i; - ([char, int *])[d, d]; - [i,ip,ip] = ([int, * int, int *])[1,(void *)2,(void *)3]; - [i,ip,ip] = ([int, * int, int *])([1,(void *)2,(void *)3]); -*/ -} Index: src/Tests/Forall.c =================================================================== --- src/Tests/Forall.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,98 +1,0 @@ -int ?=?( int*, int ); -float ?=?( float*, float ); -int * ?=?( int **, int * ); -float * ?=?( float **, float * ); -char ?=?( char*, char ); -void (* ?=?( void (**)(void), void (*)(void) ))(void); - -void g1() { - forall( otype T ) T f( T ); - void f( int ); - void h( void (*p)(void) ); - - int x; - void (*y)(void); - char z; - float w; - - f( x ); - f( y ); - f( z ); - f( w ); - h( f( y ) ); -} - -void g2() { - forall( otype T ) void f( T, T ); - forall( otype T, otype U ) void f( T, U ); - - int x; - float y; - int *z; - float *w; - - f( x, y ); - f( z, w ); - f( x, z ); -} - -typedef forall ( otype T ) int (*f)( int ); - -forall( otype T ) -void swap( T left, T right ) { - T temp = left; - left = right; - right = temp; -} - -context sumable( otype T ) { - const T 0; - T ?+?(T, T); - T ?++(T); - [T] ?+=?(T,T); -}; - -otype T1 | { const T1 0; T1 ?+?(T1, T1); T1 ?++(T1); [T1] ?+=?(T1,T1); }, - T2(otype P1, otype P2 ), - T3 | sumable(T3); - -otype T2(otype P1, otype P2) | sumable(T2(P1,P2)) = struct { P1 i; P2 j; }; - -T2(int, int) w1; -typedef T2(int, int) w2; -w2 g2; -otype w3 = T2(int, int); -w3 g3; - -forall( otype T | sumable( T ) ) -T sum( int n, T a[] ) { - T total = 0; - int i; - for ( i = 0; i < n; i += 1 ) - total = total + a[i]; - return total; -} - -forall( otype T | { const T 0; T ?+?(T, T); T ?++(T); [T] ?+=?(T,T); } ) -T twice( T t ) { - return t + t; -} - -forall( otype T | { const T 0; int ?!=?(T, T); int ? int f11( int ), f12( int ); - -[int] f( - int ( int, int p ), - [int](int) - ) { - int (*(*p)[][10])[][3]; - * [][10] * [][3] int p; - * [] * [int](int) p; -} - -static const int *f1() {} -static [ const int ] f2() {} -static inline [ const * int ] f3() {} -static inline [ const [ * int, int ] ] f4() {} -static [ const [ * int, const int ] ] f5() {} - -// unnamed parameter - -int f( - int (), - - int *(), - int **(), - int * const *(), - int * const * const (), - - int ([]), - int ([10]), - - int *([]), - int *([10]), - int **([]), - int **([10]), - int * const *([]), - int * const *([10]), - int * const * const ([]), - int * const * const ([10]) - ); - -int f( - int (), - - int *(), - int **(), - int * const *(), - int * const * const (), - - int ([]), - int ([10]), - - int *([]), - int *([10]), - int **([]), - int **([10]), - int * const *([]), - int * const *([10]), - int * const * const ([]), - int * const * const ([10]) - ) { -} - -typedef int T; - -int f( T (*f), T t ) { - T (T); -} - -// errors - -//int f()[] {} -//int (f[])() {} -//int f[]() {} -//int ((*f15())())[] {} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/GccExtensions.c =================================================================== --- src/Tests/GccExtensions.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,48 +1,0 @@ -int fred() { - asm( "nop" ); - __asm( "nop" ); - __asm__( "nop" ); - - __complex__ c1; - _Complex c2; - - const int i1; - __const int i2; - __const__ int i3; - - __extension__ const int ex; - - __inline int f1(); - __inline__ int f2(); - - __signed s1; - __signed s2; - - __otypeof(s1) t1; - __otypeof__(s1) t2; - - __volatile int v1; - __volatile__ int v2; - - __attribute__(()) int a1; - const __attribute(()) int a2; - const static __attribute(()) int a3; - const static int __attribute(()) a4; - const static int a5 __attribute(()); - const static int a6, __attribute(()) a7; - - int * __attribute(()) p1; - int (* __attribute(()) p2); -// int (__attribute(()) (p3)); -// int ( __attribute(()) (* __attribute(()) p4)); - - struct __attribute(()) s1; - struct __attribute(()) s2 { int i; }; - struct __attribute(()) s3 { int i; } x1, __attribute(()) y1; - struct __attribute(()) s4 { int i; } x2, y2 __attribute(()); - - int m1 [10] __attribute(()); - int m2 [10][10] __attribute(()); - int __attribute(()) m3 [10][10]; -// int ( __attribute(()) m4 [10] )[10]; -} Index: src/Tests/IdentFuncDeclarator.c =================================================================== --- src/Tests/IdentFuncDeclarator.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,109 +1,0 @@ -int main() { - //int f0[](); - //int (f0[])(); - //int f0()[]; - //int f0()(); - //int (*f0)()(); - //int ((*f0())())[]; - - int f1; - int (f2); - - int *f3; - int **f4; - int * const *f5; - int * const * const f6; - - int *(f7); - int **(f8); - int * const *(f9); - int * const * const (f10); - - int (*f11); - int (**f12); - int (* const *f13); - int (* const * const f14); - - int f15[]; - int f16[10]; - int (f17[]); - int (f18[10]); - - int *f19[]; - int *f20[10]; - int **f21[]; - int **f22[10]; - int * const *f23[]; - int * const *f24[10]; - int * const * const f25[]; - int * const * const f26[10]; - - int *(f27[]); - int *(f28[10]); - int **(f29[]); - int **(f30[10]); - int * const *(f31[]); - int * const *(f32[10]); - int * const * const (f33[]); - int * const * const (f34[10]); - - int (*f35[]); - int (*f36[10]); - int (**f37[]); - int (**f38[10]); - int (* const *f39[]); - int (* const *f40[10]); - int (* const * const f41[]); - int (* const * const f42[10]); - - int f43[][3]; - int f44[3][3]; - int (f45[])[3]; - int (f46[3])[3]; - int ((f47[]))[3]; - int ((f48[3]))[3]; - - int *f49[][3]; - int *f50[3][3]; - int **f51[][3]; - int **f52[3][3]; - int * const *f53[][3]; - int * const *f54[3][3]; - int * const * const f55[][3]; - int * const * const f56[3][3]; - - int (*f57[][3]); - int (*f58[3][3]); - int (**f59[][3]); - int (**f60[3][3]); - int (* const *f61[][3]); - int (* const *f62[3][3]); - int (* const * const f63[][3]); - int (* const * const f64[3][3]); - - int f65(int); - int (f66)(int); - - int *f67(int); - int **f68(int); - int * const *f69(int); - int * const * const f70(int); - - int *(f71)(int); - int **(f72)(int); - int * const *(f73)(int); - int * const * const (f74)(int); - - int (*f75)(int); - int (**f76)(int); - int (* const *f77)(int); - int (* const * const f78)(int); - - int (*(*f79)(int))(); - int (*(* const f80)(int))(); - int (* const(* const f81)(int))(); -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/IdentFuncParamDeclarator.c =================================================================== --- src/Tests/IdentFuncParamDeclarator.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,154 +1,0 @@ -int fred( - //int f0[](), - //int (f0[])(), - //int f0()[], - //int f0()(), - //int (*f0)()(), - //int ((*f0())())[], - - int f1, - int (f2), - - int *f3, - int **f4, - int * const *f5, - int * const * const f6, - - int *(f7), - int **(f8), - int * const *(f9), - int * const * const (f10), - - int (*f11), - int (**f12), - int (* const *f13), - int (* const * const f14), - - int f15[], - int f16[10], - int (f17[]), - int (f18[10]), - - int *f19[], - int *f20[10], - int **f21[], - int **f22[10], - int * const *f23[], - int * const *f24[10], - int * const * const f25[], - int * const * const f26[10], - - int *(f27[]), - int *(f28[10]), - int **(f29[]), - int **(f30[10]), - int * const *(f31[]), - int * const *(f32[10]), - int * const * const (f33[]), - int * const * const (f34[10]), - - int (*f35[]), - int (*f36[10]), - int (**f37[]), - int (**f38[10]), - int (* const *f39[]), - int (* const *f40[10]), - int (* const * const f41[]), - int (* const * const f42[10]), - - int f43[][3], - int f44[3][3], - int (f45[])[3], - int (f46[3])[3], - int ((f47[]))[3], - int ((f48[3]))[3], - - int *f49[][3], - int *f50[3][3], - int **f51[][3], - int **f52[3][3], - int * const *f53[][3], - int * const *f54[3][3], - int * const * const f55[][3], - int * const * const f56[3][3], - - int (*f57[][3]), - int (*f58[3][3]), - int (**f59[][3]), - int (**f60[3][3]), - int (* const *f61[][3]), - int (* const *f62[3][3]), - int (* const * const f63[][3]), - int (* const * const f64[3][3]), - - int f65(int), - int (f66)(int), - - int *f67(int), - int **f68(int), - int * const *f69(int), - int * const * const f70(int), - - int *(f71)(int), - int **(f72)(int), - int * const *(f73)(int), - int * const * const (f74)(int), - - int (*f75)(int), - int (**f76)(int), - int (* const *f77)(int), - int (* const * const f78)(int), - - int (*(*f79)(int))(), - int (*(* const f80)(int))(), - int (* const(* const f81)(int))(), - - int f82[const *], - int f83[const 3], - int f84[static 3], - int f85[static const 3], - - int (f86[const *]), - int (f87[const 3]), - int (f88[static 3]), - int (f89[static const 3]), - - int *f90[const *], - int *f91[const 3], - int **f92[static 3], - int * const *f93[static const 3], - int * const * const f94[static const 3], - - int *(f95[const *]), - int *(f96[const 3]), - int **(f97[static 3]), - int * const *(f98[static const 3]), - int * const * const (f99[static const 3]), - - int f100[const *][3], - int f101[const 3][3], - int f102[static 3][3], - int f103[static const 3][3], - - int (f104[const *][3]), - int (f105[const 3][3]), - int (f106[static 3][3]), - int (f107[static const 3][3]), - - int *f108[const *][3], - int *f109[const 3][3], - int **f110[static 3][3], - int * const *f111[static const 3][3], - int * const * const f112[static const 3][3], - - int *(f113[const *][3]), - int *(f114[const 3][3]), - int **(f115[static 3][3]), - int * const *(f116[static const 3][3]), - int * const * const (f117[static const 3][3]) - ) { -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/LabelledExit.c =================================================================== --- src/Tests/LabelledExit.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,144 +1,0 @@ -int main() { - int i; - int x, y; - - x = 0; y = 0; - - // block, labelled exits - - Block: { - if ( x == y ) { - for ( ; i < y; ) { - y += 1; - if ( y < 10 ) break Block; - } - } - } - - // loops, labelled exits - - w1: while ( y == 10 ); - - w2: while ( x < 10 ) { - while (y < 5 ) { - if ( y == 3 ) break w2; - } - x += 1; - } - - A: for ( i = 0; i < 10; i += 1 ) { - B: for ( i = 0; i < 10; i += 1 ) { - C: for ( i = 0; i < 10; i += 1 ) { - goto A; - goto B; - goto C; - continue A; - continue B; - continue C; - continue; - break A; - break B; - break C; - break; - } - } - } - - D: for ( ;; ) { - break D; - continue D; - } - - Z : i += 1; - goto Z; - X: Y: for ( ;; ) { - i += 1; - if ( i > 5 ) continue X; - if ( i < 5 ) break X; - if ( i < 5 ) break Y; - break; - } - XX: for ( ;; ) { - YY: for ( ;; ) { - ZZ: for ( ;; ) { - i += 1; - if ( i > 5 ) continue XX; - if ( i < 5 ) continue YY; - if ( i < 5 ) continue ZZ; - if ( i > 5 ) break XX; - if ( i < 5 ) break YY; - if ( i < 5 ) break ZZ; - break; - } - } - } - - for ( ;; ) ; - for ( int i = 0 ;; ) ; - for ( ; i < 0; ) ; - for ( ; ; i += 1 ) ; - L0: L1: L2: L3: L4: L5: L6: L7: L8: L9: - L10: L11: L12: L13: L14: L15: L16: L17: L18: L19: - L20: L21: L22: L23: L24: L25: L26: L27: L28: L29: - L31: L32: L33: L34: - for ( ;; ) { - break L0; - } - - // switch/choose, labelled exits - - Switch: switch ( i ) { - default: - i += 1; - case 0: - i += 1; - break Switch; - case 1: - switch ( i ) { - case 0: - break Switch; - default: - ; break; - } - } - - Choose: choose ( i ) { - default: - i += 1; - case 0: - i += 1; - break Choose; - case 1: - choose ( i ) { - case 0: - break; - default: - break Choose; - } - fallthru; - case 2: - i += 1; - } - - // computed goto - { - void *array[] = { &&foo, &&bar, &&hack }; - foo: bar: hack: - &&foo; - &&bar; - goto *array[i]; - } - -#if 0 - Q: if ( i > 5 ) { - i += 1; - break Q; - } else - i += 1; -#endif -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa LabelledExit.c" // -// End: // Index: src/Tests/NamedParmArg.c =================================================================== --- src/Tests/NamedParmArg.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,14 +1,0 @@ -int f1( int i = 3, int *j = 0 ) {} /* ANSI */ -[int, int ] f2( int i = 3, * int j = 0 ) {} /* CFA */ - -int main() { - f1(); /* identical calls */ - f1( 3 ); - f1( 3, ); - f1( 3, 0 ); - f1( 3, j : 0 ); - f1( j : 0, 3 ); - f1( i : 3, j : 0 ); - f1( j : 0, i : 3 ); - f1( [j, i] : f2() ); -} Index: src/Tests/NumericConstants.c =================================================================== --- src/Tests/NumericConstants.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,54 +1,0 @@ -int main() { - 1; /* decimal */ - 2_1; - 2_147_483_647; - 37LL; - 45ull; - 89llu; - 99LLu; - 56_lu; - 88_LLu; - -// 0; /* octal */ - 0u; - 0_3_77; - 0_377_ul; - - 0x1; /* hexadecimal */ - 0x1u; - 0xabL; - 0x_80000000; - 0x_fff; - 0x_ef3d_aa5c; - 0x_3LL; - - 3.; /* integral real */ - 3_100.; - 1_000_000.; - - 3.1; /* integral/fractional real */ - 3.141_592_654L; - 123_456.123_456; - - 3E1; /* integral/exponent real */ - 3_e1f; - 3_E1_1_F; - 3_E_11; - 3_e_+11; - 3_E_-11; - - 3.0E1; /* integral/fractional/exponent real */ - 3.0_E1L; - 3.0_e1_1; - 3.0_E_11_l; - 3.0_e_+11l; - 3.0_E_-11; - 123_456.123_456E-16; - - 0x_ff.ffp0; /* hex real */ - 0x_1.ffff_ffff_p_128_l; -} - -// Local Variables: // -// compile-command: "../../../bin/cfa -std=c99 NumericConstants.c" // -// End: // Index: src/Tests/Operators.c =================================================================== --- src/Tests/Operators.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,27 +1,0 @@ -int ?*?( int, int ); - -int ?()( int number1, int number2 ) { - return number1 * number2; -} - -int ?+?( int, int ); - -int ?=?( int *, int ); -struct accumulator { - int total; -}; - -char ?()( struct accumulator a, char number1, char number2 ); - -void f( void ) { - char a, b; - ?()( a, b ); - a(b); - a + b; - struct accumulator ?+?; // why not, eh? - a + b; -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/Scope.c =================================================================== --- src/Tests/Scope.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,66 +1,0 @@ -int x; -typedef double y; -typedef float t; -y z; -otype u = struct { int a; double b; }; -int f( int y ); -y q; - -y w( y y, u v ) { - otype x | { x t(u); }; - u u = y; - x z = t(u); -} - -y p; - -context has_u( otype z ) { - z u(z); -}; - -forall( otype t | has_u( t ) ) -y q( t the_t ) { - t y = u( the_t ); -} - -t f( y p ) { - int y; - typedef char x; - { - x y; - typedef x z; - { - z x; - typedef z y; - y z = x; - } - z x = y; - } - x q = y; -} - -t g( void ) { - typedef char x; - try { - some_func(); - } catch ( x x ) { - t y = x; - } - x z; -} - -y q( i ) /* K&R style */ - int i; -{ - switch ( i ) { - y q = i; - case 0: - return q; - default: - return i; - } -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/ShortCircuit.c =================================================================== --- src/Tests/ShortCircuit.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,18 +1,0 @@ -int ?!=?( int, int ); -int ?!=?( float, float ); -int 0; - -void g( float ); -void g( int ); - -void f( int a ) { - int b; - float c; - g( a ? b : c ); - g( a && c ); - g( a || b ); -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/Statement.c =================================================================== --- src/Tests/Statement.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,19 +1,0 @@ -int ?=?( int *, int ); -int ?!=?( int, int ); -int 0; - -void f() { - int a; - struct { int b; } a; - if ( a ) { - while ( a ) { - int *b; - for ( b; a; b ) { - } - } - } -} - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/StructMember.c =================================================================== --- src/Tests/StructMember.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,44 +1,0 @@ -typedef int T; - -struct S { - int m1:3, m2:4; - int :2; - int :3, :4; - int m3; - int m4, m5, m6; - int *m7, *m8, *m9; - int (*m10)(); - int *(*m11)(int); - T T; - T (T); - -// Cforall extensions - - * int m12, m13; - * [ * int ] (int) m14; - int ; - int , , ; - int * , , ; - int *, *, *; - * int , , ; - int (*)(); - int (**)( int ); - T ; - -// errors - -// void f(void); -}; - -struct S s; - -union U { - [5] int m1; - int m2[5]; - * int m3; - int *m4; -} u; - -// Local Variables: // -// tab-width: 4 // -// End: // Index: src/Tests/Subrange.c =================================================================== --- src/Tests/Subrange.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,63 +1,0 @@ -// A small context defining the notion of an ordered otype. (The standard -// library should probably contain a context for this purpose.) -context ordered(otype T) { - int ?&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -39,5 +83,6 @@ cc1lib_PROGRAMS = cc1$(EXEEXT) subdir = src/driver -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/automake/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -56,4 +101,16 @@ cfa_OBJECTS = $(am_cfa_OBJECTS) cfa_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/automake/depcomp @@ -64,8 +121,6 @@ AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ @@ -73,10 +128,30 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = SOURCES = $(cc1_SOURCES) $(cfa_SOURCES) DIST_SOURCES = $(cc1_SOURCES) $(cfa_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags @@ -232,12 +307,16 @@ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ @@ -260,5 +339,6 @@ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ @@ -269,12 +349,16 @@ install-cc1libPROGRAMS: $(cc1lib_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(cc1libdir)" || $(MKDIR_P) "$(DESTDIR)$(cc1libdir)" @list='$(cc1lib_PROGRAMS)'; test -n "$(cc1libdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(cc1libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(cc1libdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ @@ -297,5 +381,6 @@ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(cc1libdir)' && rm -f" $$files ")"; \ @@ -304,7 +389,9 @@ clean-cc1libPROGRAMS: -test -z "$(cc1lib_PROGRAMS)" || rm -f $(cc1lib_PROGRAMS) + cc1$(EXEEXT): $(cc1_OBJECTS) $(cc1_DEPENDENCIES) $(EXTRA_cc1_DEPENDENCIES) @rm -f cc1$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(cc1_OBJECTS) $(cc1_LDADD) $(LIBS) + cfa$(EXEEXT): $(cfa_OBJECTS) $(cfa_DEPENDENCIES) $(EXTRA_cfa_DEPENDENCIES) @rm -f cfa$(EXEEXT) @@ -334,24 +421,13 @@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ @@ -365,13 +441,9 @@ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ @@ -382,4 +454,19 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: @@ -526,17 +613,18 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-cc1libPROGRAMS clean-generic ctags distclean \ - distclean-compile distclean-generic distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-cc1libPROGRAMS 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 uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-cc1libPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-cc1libPROGRAMS 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-binPROGRAMS \ + install-cc1libPROGRAMS 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-binPROGRAMS uninstall-cc1libPROGRAMS Index: src/examples/Makefile.in =================================================================== --- src/examples/Makefile.in (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ src/examples/Makefile.in (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -1,8 +1,7 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,4 +19,49 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -39,5 +83,6 @@ avl_test$(EXEEXT) subdir = src/examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/automake/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -61,4 +106,16 @@ vector_test_OBJECTS = $(am_vector_test_OBJECTS) vector_test_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/automake/depcomp @@ -68,24 +125,43 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ $(vector_test_SOURCES) DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ $(vector_test_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags @@ -238,10 +314,13 @@ clean-noinstPROGRAMS: -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) + avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES) @rm -f avl_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS) + fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES) @rm -f fstream_test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS) + vector_test$(EXEEXT): $(vector_test_OBJECTS) $(vector_test_DEPENDENCIES) $(EXTRA_vector_test_DEPENDENCIES) @rm -f vector_test$(EXEEXT) @@ -271,5 +350,5 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @@ -278,5 +357,5 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` avl_test.o: avltree/avl_test.c @@ -378,24 +457,13 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi` -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ @@ -409,13 +477,9 @@ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ @@ -426,4 +490,19 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: @@ -565,15 +644,15 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am 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 \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-noinstPROGRAMS 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-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 uninstall \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am Index: src/examples/abs.c =================================================================== --- src/examples/abs.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,36 +1,0 @@ -// -// 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. -// -// abs.c -- -// -// Author : Peter A. Buhr -// Created On : Thu Jan 28 18:26:16 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Mar 2 15:07:26 2016 -// Update Count : 51 -// - -#include -#include // abs - -int main( void ) { - char ch = -65; - sout | "char\t\t\t" | ch | "\tabs " | abs( ch ) | endl; - sout | "signed int\t\t" | -65 | "\tabs" | abs( -65 ) | endl; - sout | "signed long int\t\t" | -65l | "\tabs" | abs( -65l ) | endl; - sout | "signed long long int\t" | -65ll | "\tabs" | abs( -65ll ) | endl; - sout | "float\t\t\t" | -65.0f | "\tabs" | abs( -65.0f ) | endl; - sout | "double\t\t\t" | -65.0 | "\tabs" | abs( -65.0 ) | endl; - sout | "long double\t\t" | -65.0l | "\tabs" | abs( -65.0l ) | endl; - sout | "float _Complex\t\t" | -65.0F-2.0iF | "\tabs" | abs( -65.0F-2.0iF ) | endl; - sout | "double _Complex\t\t" | -65.0D-2.0iD | "\tabs" | abs( -65.0D-2.0iD ) | endl; - sout | "long double _Complex\t" | -65.0L-2.0iL | "\tabs" | abs( -65.0L-2.0iL ) | endl; -} // main - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa abs.c" // -// End: // Index: src/examples/array.c =================================================================== --- src/examples/array.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,41 +1,0 @@ -// -// 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. -// -// array.c -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Apr 27 17:21:52 2016 -// Update Count : 3 -// - -#include "array.h" - -/// forall( otype array_type, elt_type | bounded_array( array_type, elt_type ) ) -/// [ array_iterator begin, array_iterator end ] -/// get_iterators( array_type array ) -/// { -/// begin = 0; -/// end = last( array ); -/// } - -// The first element is always at index 0. -forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) -elt_type * begin( array_type * array ) { - return &array[ 0 ]; -} - -// The end iterator should point one past the last element. -forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) -elt_type * end( array_type * array ) { - return &array[ last( array ) ] + 1; -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa array.c" // -// End: // Index: src/examples/array.h =================================================================== --- src/examples/array.h (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,54 +1,0 @@ -// -// 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. -// -// array.h -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Apr 27 17:26:04 2016 -// Update Count : 5 -// - -#ifndef ARRAY_H -#define ARRAY_H - -//#include - -// An array has contiguous elements accessible in any order using integer indicies. The first -// element has index 0. -trait array( otype array_type, otype elt_type ) { - lvalue elt_type ?[?]( array_type, int ); -}; - -// A bounded array is an array that carries its maximum index with it. -trait bounded_array( otype array_type, otype elt_type | array( array_type *, elt_type ) ) { - int last( array_type * ); -}; - -// implement iterator_for - -typedef int array_iterator; - -/// forall( otype array_type, elt_type | bounded_array( array_type, elt_type ) ) -/// [ array_iterator begin, array_iterator end ] get_iterators( array_type ); - - -// A bounded array can be iterated over by using a pointer to the element type. These functions -// return iterators corresponding to the first element and the one-past-the-end element, STL-style. -forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) -elt_type * begin( array_type * array ); - -// The end iterator should point one past the last element. -forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) -elt_type * end( array_type * array ); - -#endif // ARRAY_H - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa array.c" // -// End: // Index: src/examples/assert.c =================================================================== --- src/examples/assert.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,23 +1,0 @@ -// -// 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. -// -// assert.c -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed May 27 18:10:43 2015 -// Update Count : 2 -// - -void f() { - (1) ? (void)(0) : (void)(0); -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa assert.c" // -// End: // Index: src/examples/ato.c =================================================================== --- src/examples/ato.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,56 +1,0 @@ -// -*- Mode: C -*- -// -// 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. -// -// ato.c -- -// -// Author : Peter A. Buhr -// Created On : Thu Feb 4 08:10:57 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Feb 29 17:57:35 2016 -// Update Count : 44 -// - -#include -#include // ato, strto -extern "C" { -#include -#include -} - -int main( void ) { - int i = ato( "-123" ); - sout | i | "-123" | endl; - unsigned int ui = ato( "123" ); - sout | ui | "123" | endl; - long int li = ato( "-123" ); - sout | li | "-123" | endl; - unsigned long int uli = ato( "123" ); - sout | uli | "123" | endl; - long long int lli = ato( "-123" ); - sout | lli | "-123" | endl; - unsigned long long int ulli = ato( "123" ); - sout | ulli | "123" | endl; - float f = ato( "-123.456" ); - sout | f | "-123.456" | endl; - double d = ato( "-123.4567890123456" ); - sout | d | "-123.4567890123456" | endl; - long double ld = ato( "-123.45678901234567890123456789" ); - sout | ld | "-123.45678901234567890123456789" | endl; - float _Complex fc = ato( "-123.456-123.456i" ); - sout | fc | "-123.456-123.456i" | endl; - double _Complex dc = ato( "-123.4567890123456+123.4567890123456i" ); - sout | dc | "-123.4567890123456+123.4567890123456i" | endl; - long double _Complex ldc = ato( "123.45678901234567890123456789-123.45678901234567890123456789i" ); - sout | ldc | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl; - long double _Complex ldc2 = ato( "123.45678901234-123.4567890i" ); - sout | ldc2 | "123.45678901234-123.4567890i" | endl; -} // main - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa ato.c" // -// End: // Index: src/examples/avltree/avl-private.c =================================================================== --- src/examples/avltree/avl-private.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,134 +1,0 @@ -#include "avl.h" -#include "avl-private.h" - -// AVL tree specific (internal) operations: -// rotateLeft, rotateRight, fix -// -// AVL tree enhanced height operation -// -// calcBalance is a simple computation of height(R) - height(L) - -// an AVL tree's height is easy to compute -// just follow path with the larger balance -forall(otype K | Comparable(K), otype V) -int height(tree(K, V) * t){ - int helper(tree(K, V) * t, int ht){ - if (empty(t)){ - return ht; - } else if (t->balance > 0){ - return helper(t->right, 1+ht); - } else { - // can traverse either branch to find the height - // of an AVL tree whose balance is 0 - return helper(t->left, 1+ht); - } - } - return helper(t, 0); -} - -forall(otype K | Comparable(K), otype V) -int calcBalance(tree(K, V) * t){ - int l = height(t->left); - int r = height(t->right); - t->balance = r-l; - return t->balance; -} - -// re-establish the link between parent and child -forall(otype K | Comparable(K), otype V) -void relinkToParent(tree(K, V) * t){ - tree(K, V) * parent = t->parent; // FIX ME!! - if (empty(t->parent)){ - return; - } else if (parent->key < t->key){ - parent->right = t; - } else { - parent->left = t; - } -} - -// rotate left from t -forall(otype K | Comparable(K), otype V) -tree(K, V) * rotateLeft(tree(K, V) * t){ - tree(K, V) * newRoot = t->right; - t->right = newRoot->left; - newRoot->left = t; - - // swap parents - newRoot->parent = t->parent; - t->parent = newRoot; - if (t->right != NULL) { - tree(K, V) * right = t->right; // FIX ME!! - right->parent = t; - } - // re-establish the link between newRoot and its parent - relinkToParent(newRoot); - return newRoot; -} - -// rotate right from t -forall(otype K | Comparable(K), otype V) -tree(K, V) * rotateRight(tree(K, V) * t){ - tree(K, V) * newRoot = t->left; - t->left = newRoot->right; - newRoot->right = t; - - // swap parents - newRoot->parent = t->parent; - t->parent = newRoot; - if (t->left != NULL){ - tree(K, V) * left = t->left; // FIX ME!! - left->parent = t; - } - // re-establish the link between newRoot and its parent - relinkToParent(newRoot); - return newRoot; -} - -// balances a node that has balance factor -2 or 2 -forall(otype K | Comparable(K), otype V) -tree(K, V) * fix(tree(K, V) * t){ - // ensure that t's balance factor is one of - // the appropriate values - assert(t->balance == 2 || t->balance == -2); - - if (t->balance == -2){ - tree(K, V) * left = t->left; // FIX ME!! - if (left->balance == 1){ - t->left = rotateLeft(t->left); - } - return rotateRight(t); - } else if (t->balance == 2){ - tree(K, V) * right = t->right; // FIX ME!! - if (right->balance == -1){ - t->right = rotateRight(t->right); - } - return rotateLeft(t); - } else { - // shouldn't ever get here - assert((int)0); - return t; - } -} - -// attempt to fix the tree, if necessary -forall(otype K | Comparable(K), otype V) -tree(K, V) * tryFix(tree(K, V) * t){ - int b = calcBalance(t); - - if (b == -2 || b == 2){ - t = fix(t); - } else { - assert(b == 0 || b == 1 || b == -1); - } - return t; -} - -// sets parent field of c to be p -forall(otype K | Comparable(K), otype V) -void setParent(tree(K, V) * c, tree(K, V) * p){ - if (! empty(c)){ - c->parent = p; - } -} - Index: src/examples/avltree/avl-private.h =================================================================== --- src/examples/avltree/avl-private.h (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,17 +1,0 @@ -#ifndef AVL_PRIVATE_H -#include "avl.h" - -// functions that really shouldn't be exposed, but are to reduce compilation time - -// attempt to fix the tree, if necessary -forall(otype K | Comparable(K), otype V) -tree(K, V) * tryFix(tree(K, V) * t); - -// sets parent field of c to be p -forall(otype K | Comparable(K), otype V) -void setParent(tree(K, V) * c, tree(K, V) * p); - -forall(otype K | Comparable(K), otype V) -int height(tree(K, V) * t); - -#endif Index: src/examples/avltree/avl.h =================================================================== --- src/examples/avltree/avl.h (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,108 +1,0 @@ -#ifndef AVL_TREE_H -#define AVL_TREE_H - -extern "C" { -#define NULL 0 -void free(void *); -#define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); } -void abort(); -int printf(const char *, ...); -} - -// #include -// #include - -trait Comparable(otype T) { - int ??(T t1, T t2); - -forall(dtype T | { void ^?{}(T *); }) -void delete(T * x); - -// To-do: properly use height or balance factor -// Right now I'm recomputing the height for each -// node multiple times. It's Theta-log(n), but still.. - -// Balanced Binary Search Tree of void pointers; almost an AVL tree - -// just needs to make use of the balance factor properly -// Operations: -// ?{}, ^?{} -// create - allocate a new tree. Just a wrapper around malloc which also calls the tree constructor. -// find - search through the tree for the given key; return the associated value -// empty - return true if the tree is empty -// insert - insert node with key and value pair. Returns 0 on success -// remove - remove node with the given key, returns 0 on success, 1 on failure -// copy - deep copy of a tree -// for_each - applies the given function to every data element in the tree -// assumes that a non-zero return value is an error, will return -// the error code from func - -// temporary: need forward decl to get around typedef problem -forall(otype K | Comparable(K), otype V) -struct tree; - -forall(otype K | Comparable(K), otype V) -struct tree { - K key; - V value; - tree(K, V) * parent; - tree(K, V) * left; - tree(K, V) * right; - int balance; -}; - -forall(otype K | Comparable(K), otype V) -void ?{}(tree(K, V) *t, K key, V value); - -forall(otype K | Comparable(K), otype V) -void ^?{}(tree(K, V) * t); - -forall(otype K | Comparable(K), otype V) -tree(K, V) * create(K key, V value); - -forall(otype K | Comparable(K), otype V) -V * find(tree(K, V) * t, K key); - -forall(otype K | Comparable(K), otype V) -int empty(tree(K, V) * t); - -// returns the root of the tree -forall(otype K | Comparable(K), otype V) -int insert(tree(K, V) ** t, K key, V value); - -forall(otype K | Comparable(K), otype V) -int remove(tree(K, V) ** t, K key); - -forall(otype K | Comparable(K), otype V) -void copy(tree(K, V) * src, tree(K, V) ** ret); - -forall(otype K | Comparable(K), otype V) -void for_each(tree(K, V) * t, void (*func)(V)); - -// // Helper function to print trees -// forall(otype K | Comparable(K), otype V) -// void printTree(tree * t, int level){ -// if (empty(t)){ -// return; -// } - -// printTree(t->left, level+1); -// printf("key: %d, value: %s, level: %d\n", t->key, t->value, level); -// printTree(t->right, level+1); -// } - -// // inorder traversal of t -// // prints each key, followed by the value -// forall(otype K | Comparable(K), otype V) -// void printTree(tree(K, V) * t){ -// printTree(t, 0); -// } - - -#endif Index: src/examples/avltree/avl0.c =================================================================== --- src/examples/avltree/avl0.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,19 +1,0 @@ -#include "avl.h" - -forall(otype T | Comparable(T)) -int ?==?(T t1, T t2) { - return !(t1 < t2) && !(t2 < t1); -} - -forall(otype T | Comparable(T)) -int ?>?(T t1, T t2) { - return t2 < t1; -} - -forall(dtype T | { void ^?{}(T *); }) -void delete(T * x) { - if (x) { - ^?{}(x); - free(x); - } -} Index: src/examples/avltree/avl1.c =================================================================== --- src/examples/avltree/avl1.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,51 +1,0 @@ -#include "avl.h" -// #include "cwrap.h" - -extern "C" { - void * malloc(long int); -} - -forall(otype K | Comparable(K), otype V) -void ?{}(tree(K, V) *t, K key, V value){ - (&t->key) { key }; - (&t->value) { value }; - t->parent = NULL; - t->left = NULL; - t->right = NULL; - t->balance = 0; -} - -forall(otype K | Comparable(K), otype V) -void ^?{}(tree(K, V) * t){ - delete(t->left); - delete(t->right); - ^(&t->key){}; - ^(&t->value){}; -} - -forall(otype K | Comparable(K), otype V) -tree(K, V) * create(K key, V value) { - // infinite loop trying to resolve ... t = malloc(); - tree(K, V) * t = malloc(sizeof(tree(K,V))); - t { key, value }; - return t; -} - -// // Helper function to print trees -// forall(otype K | Comparable(K), otype V) -// void printTree(tree * t, int level){ -// if (empty(t)){ -// return; -// } - -// printTree(t->left, level+1); -// printf("key: %d, value: %s, level: %d\n", t->key, t->value, level); -// printTree(t->right, level+1); -// } - -// // inorder traversal of t -// // prints each key, followed by the value -// forall(otype K | Comparable(K), otype V) -// void printTree(tree(K, V) * t){ -// printTree(t, 0); -// } Index: src/examples/avltree/avl2.c =================================================================== --- src/examples/avltree/avl2.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,84 +1,0 @@ -#include "avl.h" -#include "avl-private.h" - -forall(otype K | Comparable(K), otype V) -V * find(tree(K, V) * t, K key){ - if (empty(t)){ - return NULL; - } - - if (t->key == key){ - return &t->value; - } else if (t->key < key){ - return find(t->right, key); - } else { - // t->key > key - return find(t->left, key); - } -} - -forall(otype K | Comparable(K), otype V) -int empty(tree(K, V) * t){ - return t == NULL; -} - -// returns the root of the tree -forall(otype K | Comparable(K), otype V) -int insert(tree(K, V) ** t, K key, V value) { - // handles a non-empty tree - // problem if the following signature is used: tries to use an adapter to call helper, but shouldn't - // be necessary - seems to be a problem with helper's type variables not being renamed - // tree(K, V) * helper(tree(K, V) * t, K key, V value){ - tree(K, V) * helper(tree(K, V) * t){ - if (t->key == key){ - // ran into the same key - uh-oh - return NULL; - } else if (t->key < key){ - if (t->right == NULL){ - t->right = create(key, value); - tree(K, V) * right = t->right; // FIX ME! - right->parent = t; // !!!!!!! - return t->right; - } else { - return helper(t->right); - } - } else { - if (t->left == NULL){ - t->left = create(key, value); - tree(K, V) * left = t->left; // FIX ME! - left->parent = t; // !!!!!!! - return t->left; - } else { - return helper(t->left); - } - } - } - - if (empty(*t)){ - // be nice and return a new tree - *t = create(key, value); - return 0; - } - tree(K, V) * newTree = helper(*t); - if (newTree == NULL){ - // insert error handling code, only possibility - // currently is that the key already exists - return 99; - } - // move up the tree, updating balance factors - // if the balance factor is -1, 0, or 1 keep going - // if the balance factor is -2 or 2, call fix - while (newTree->parent != NULL){ // loop until newTree == NULL? - newTree = tryFix(newTree); - tree(K, V) * parent = newTree->parent; // FIX ME!! - assert(parent->left == newTree || - parent->right == newTree); - newTree = newTree->parent; - } - insert(t, key, value); - - // do it one more time - this is the root - newTree = tryFix(newTree); - *t = newTree; - return 0; -} Index: src/examples/avltree/avl3.c =================================================================== --- src/examples/avltree/avl3.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,117 +1,0 @@ -#include "avl.h" -#include "avl-private.h" - -// from stdlib -forall(otype T) -void swap(T *, T *); - -// swaps the data within two tree nodes -forall(otype K | Comparable(K), otype V) -void node_swap(tree(K, V) * t, tree(K, V) * t2){ - swap(&t->key, &t2->key); - swap(&t->value, &t2->value); -} - -// go left as deep as possible from within the right subtree -forall(otype K | Comparable(K), otype V) -tree(K, V) * find_successor(tree(K, V) * t){ - tree(K, V) * find_successor_helper(tree(K, V) * t){ - // go left as deep as possible, return the last node - if (empty(t->left)){ - return t; - } else { - return find_successor_helper(t->left); - } - } - return find_successor_helper(t->right); -} - -// cleanup - don't want to deep delete, so set children to NULL first. -forall(otype K | Comparable(K), otype V) -void deleteSingleNode(tree(K, V) * t) { - t->left = NULL; - t->right = NULL; - deleteSingleNode(t); -} - -// does the actual remove operation once we've found the node in question -forall(otype K | Comparable(K), otype V) -tree(K, V) * remove_node(tree(K, V) * t){ - // is the node a leaf? - if (empty(t->left) && empty(t->right)){ - // yes, just delete this node - delete(t); - return NULL; - } else if (empty(t->left)){ - // if the left is empty, there is only one child -> move right up - node_swap(t, t->right); - tree(K, V) * tmp = t->right; - - // relink tree - t->left = tmp->left; - t->right = tmp->right; - - setParent(t->left, t); - setParent(t->right, t); - deleteSingleNode(tmp); - return t; - } else if (empty(t->right)){ - // if the right is empty, there is only one child -> move left up - node_swap(t, t->left); - tree(K, V) * tmp = t->left; - - // relink tree - t->left = tmp->left; - t->right = tmp->right; - - setParent(t->left, t); - setParent(t->right, t); - deleteSingleNode(tmp); - return t; - } else { - // swap with the successor - tree(K, V) * s = find_successor(t); - tree(K, V) * parent = s->parent; - - if (parent->left == s){ - parent->left = s->right; - } else { - assert(parent->right == s); - parent->right = s->right; - } - setParent(s->right, parent); - node_swap(t, s); - deleteSingleNode(s); - return t; - } -} - -// finds the node that needs to be removed -forall(otype K | Comparable(K), otype V) -tree(K, V) * remove_helper(tree(K, V) * t, K key, int * worked){ - if (empty(t)){ - // did not work because key was not found - // set the status variable and return - *worked = 1; - } else if (t->key == key) { - t = remove_node(t); - } else if (t->key < key){ - t->right = remove_helper(t->right, key, worked); - } else { - // t->key > key - t->left = remove_helper(t->left, key, worked); - } - // try to fix after deleting - if (! empty(t)) { - t = tryFix(t); - } - return t; -} - -forall(otype K | Comparable(K), otype V) -int remove(tree(K, V) ** t, K key){ - int worked = 0; - tree(K, V) * newTree = remove_helper(*t, key, &worked); - *t = newTree; - return worked; -} Index: src/examples/avltree/avl4.c =================================================================== --- src/examples/avltree/avl4.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,48 +1,0 @@ -#include "avl.h" -#include "avl-private.h" - -// Perform a shallow copy of src, return the -// new tree in ret -forall(otype K | Comparable(K), otype V) -int copy(tree(K, V) * src, tree(K, V) ** ret){ - tree(K, V) * helper(tree(K, V) * t, int * worked){ - if (empty(t)){ - // given empty tree, return empty tree - return NULL; - } - - // otherwise, this is not an empty node, - // create a new node - tree(K, V) * newTree = create(t->key, t->value); - if (empty(newTree)) { - *worked = 1; - return NULL; - } - - // recursively copy the left and right branches - newTree->left = helper(t->left, worked); - newTree->right = helper(t->right, worked); - - setParent(newTree->left, newTree); - setParent(newTree->right, newTree); - return newTree; - } - - int worked = 0; - *ret = helper(src, &worked); - return worked; -} - -// Apply func to every value element in t, using an in order traversal -forall(otype K | Comparable(K), otype V) -void for_each(tree(K, V) * t, int (*func)(V)) { - if (t == NULL) { - return; - } - // recursively apply the function to the left, - // apply the function to this node, - // recursively apply the function to the right - for_each(t->left, func); - func(t->value); - for_each(t->right, func); -} Index: src/examples/avltree/avl_test.c =================================================================== --- src/examples/avltree/avl_test.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,51 +1,0 @@ -#include "avl.h" -#include "avl-private.h" - -extern "C" { - int printf(const char *, ...); - int strcmp(const char *, const char *); -} - -int main(){ - // operations: - // find(tree(K, V) *, K) - // int empty(tree(K, V) *); - // tree(K, V) * insert(tree(K, V) *, K, V); - // int remove(tree(K, V) **, K); - - // int -> int - tree(int, int) * imap = create(-1, 0); - insert(&imap, 12, 13); - insert(&imap, 2, 3); - assert( height(imap) == 2 ); - - printf("%d %d %d\n", *find(imap, 2), *find(imap, 12), *find(imap, -1)); - - remove(&imap, -1); - delete(imap); - - // int -> char * - tree(int, char *) * smap = create(-1, "baz"); - insert(&smap, 12, "bar"); - insert(&smap, 2, "foo"); - assert( height(smap) == 2 ); - - printf("%s %s %s\n", *find(smap, 2), *find(smap, 12), *find(smap, -1)); - - remove(&smap, -2); - delete(smap); - - // char* -> char* - int ? - -int main( void ) { - int nombre; - sout | "Entrez un nombre, s'il vous plaît:" | endl; - sin | &nombre; - sout | "Vous avez entré" | nombre | "stocké à l'adresse" | &nombre | endl; - sout | "nombre" | nombre | "est" - | (nombre > 0 ? "plus grand que" : nombre == 0 ? "égal à" : "moins de") - | "zéro" | endl; - - sout | "Entrez trois nombres, s'il vous plaît: " | endl; - int i, j, k; - sin | &i | &j | &k; - sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl; -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa fstream_test.c" // -// End: // Index: src/examples/io.c =================================================================== --- src/examples/io.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,113 +1,0 @@ -// -*- Mode: C -*- -// -// 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. -// -// io.c -- -// -// Author : Peter A. Buhr -// Created On : Wed Mar 2 16:56:02 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jun 8 22:52:04 2016 -// Update Count : 30 -// - -#include - -int main() { - char c; // basic types - short int si; - unsigned short int usi; - int i; - unsigned int ui; - long int li; - unsigned long int uli; - long long int lli; - unsigned long long int ulli; - float f; - double d; - long double ld; - float _Complex fc; - double _Complex dc; - long double _Complex ldc; - char s1[10], s2[10]; - - int x = 3, y = 5, z = 7; - sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl; - sout | 1 | 2 | 3 | endl; - sout | '1' | '2' | '3' | endl; - sout | 1 | "" | 2 | "" | 3 | endl; - sout | endl; - - ifstream in; // create / open file - open( &in, "io.data", "r" ); - - &in | &c // character - | &si | &usi | &i | &ui | &li | &uli | &lli | &ulli // integral - | &f | &d | &ld // floating point - | &fc | &dc | &ldc // floating-point complex - | cstr( s1 ) | cstr( s2, 10 ); // C string, length unchecked and checked - - sout | c | ' ' | endl // character - | si | usi | i | ui | li | uli | lli | ulli | endl // integral - | f | d | ld | endl // floating point - | fc | dc | ldc | endl; // complex - sout | endl; - sout | f | "" | d | "" | ld | endl // floating point without separator - | sepDisable | fc | dc | ldc | sepEnable | endl // complex without separator - | sepOn | s1 | sepOff | s2 | endl // local separator removal - | s1 | "" | s2 | endl; // C string without separator - sout | endl; - - sepSet( sout, ", $" ); // change separator, maximum of 15 characters - sout | f | d | ld | endl // floating point without separator - | fc | dc | ldc | endl // complex without separator - | s1 | s2 | endl; - sout | endl; - sepSet( sout, " " ); - - sout - // opening delimiters - | "v(" | 27 - | "v[" | 27 - | "v{" | 27 - | "$" | 27 - | "£" | 27 - | "¥" | 27 - | "¡" | 27 - | "¿" | 27 - | "«" | 27 - | endl - // closing delimiters - | 25 | "," - | 25 | "." - | 25 | ":" - | 25 | ";" - | 25 | "!" - | 25 | "?" - | 25 | ")" - | 25 | "]" - | 25 | "}" - | 25 | "%" - | 25 | "¢" - | 25 | "»" - | endl - // opening-closing delimiters - | 25 | "'" | 27 - | 25 | "`" | 27 - | 25 | "\"" | 27 - | 25 | " " | 27 - | 25 | "\f" | 27 - | 25 | "\n" | 27 - | 25 | "\r" | 27 - | 25 | "\t" | 27 - | 25 | "\v" | 27 - | endl; -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa io.c" // -// End: // Index: src/examples/io.data =================================================================== --- src/examples/io.data (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,1 +1,0 @@ -A 1 2 3 4 5 6 7 8 1.1 1.2 1.3 1.1+2.3 1.1-2.3 1.1-2.3 abc xyz Index: src/examples/limits.c =================================================================== --- src/examples/limits.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,114 +1,0 @@ -// -// 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. -// -// limits.c -- -// -// Author : Peter A. Buhr -// Created On : Tue May 10 20:44:20 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Tue May 10 20:45:28 2016 -// Update Count : 1 -// - -#include - -// Integral Constants - -short int m = MIN; -int m = MIN; -long int m = MIN; -long long int m = MIN; - -short int M = MAX; -unsigned short int M = MAX; -int M = MAX; -unsigned int M = MAX; -long int M = MAX; -unsigned long int M = MAX; -long long int M = MAX; -unsigned long long int M = MAX; - -// Floating-Point Constants - -float pi = PI; -float pi_2 = PI_2; -float pi_4 = PI_4; -float _1_pi = _1_PI; -float _2_pi = _2_PI; -float _2_sqrt_pi = _2_SQRT_PI; - -double pi = PI; -double pi_2 = PI_2; -double pi_4 = PI_4; -double _1_pi = _1_PI; -double _2_pi = _2_PI; -double _2_SQRT_pi = _2_SQRT_PI; - -long double pi = PI; -long double pi_2 = PI_2; -long double pi_4 = PI_4; -long double _1_pi = _1_PI; -long double _2_pi = _2_PI; -long double _2_sqrt_pi = _2_SQRT_PI; - -_Complex pi = PI; -_Complex pi_2 = PI_2; -_Complex pi_4 = PI_4; -_Complex _1_pi = _1_PI; -_Complex _2_pi = _2_PI; -_Complex _2_sqrt_pi = _2_SQRT_PI; - -long _Complex pi = PI; -long _Complex pi_2 = PI_2; -long _Complex pi_4 = PI_4; -long _Complex _1_pi = _1_PI; -long _Complex _2_pi = _2_PI; -long _Complex _2_sqrt_pi = _2_SQRT_PI; - -float e = E; -float log2_e = LOG2_E; -float log10_e = LOG10_E; -float ln_2 = LN_2; -float ln_10 = LN_10; -float sqrt_2 = SQRT_2; -float _1_sqrt_2 = _1_SQRT_2; - -double e = E; -double log2_e = LOG2_E; -double log10_e = LOG10_E; -double ln_2 = LN_2; -double ln_10 = LN_10; -double sqrt_2 = SQRT_2; -double _1_sqrt_2 = _1_SQRT_2; - -long double e = E; -long double log2_e = LOG2_E; -long double log10_e = LOG10_E; -long double ln_2 = LN_2; -long double ln_10 = LN_10; -long double sqrt_2 = SQRT_2; -long double _1_sqrt_2 = _1_SQRT_2; - -_Complex e = E; -_Complex log2_e = LOG2_E; -_Complex log10_e = LOG10_E; -_Complex ln_2 = LN_2; -_Complex ln_10 = LN_10; -_Complex sqrt_2 = SQRT_2; -_Complex _1_sqrt_2 = _1_SQRT_2; - -long _Complex e = E; -long _Complex log2_e = LOG2_E; -long _Complex log10_e = LOG10_E; -long _Complex ln_2 = LN_2; -long _Complex ln_10 = LN_10; -long _Complex sqrt_2 = SQRT_2; -long _Complex _1_sqrt_2 = _1_SQRT_2; - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa limits.c" // -// End: // Index: src/examples/math.c =================================================================== --- src/examples/math.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,144 +1,0 @@ -// -// 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. -// -// math.c -- -// -// Author : Peter A. Buhr -// Created On : Fri Apr 22 14:59:21 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Sun Apr 24 13:24:20 2016 -// Update Count : 70 -// - -#include -#include - -int main( void ) { - float f; - double d; - long double l; - - sout | "fabs:" | fabs( -1.0F ) | fabs( -1.0D ) | fabs( -1.0L ) | cabs( -1.0F+1.0FI ) | cabs( -1.0D+1.0DI ) | cabs( -1.0DL+1.0LI ) | endl; - sout | "fmod:" | 5.0F % -2.0F | fmod( 5.0F, -2.0F ) | 5.0D % -2.0D | fmod( 5.0D, -2.0D ) | 5.0L % -2.0L | fmod( 5.0L, -2.0L ) | endl; - sout | "remainder:" | remainder( 2.0F, 3.0F ) | remainder( 2.0D, 3.0D ) | remainder( 2.0L, 3.0L ) | endl; - int quot; - f = remquo( 3.6F, 0.5F, " ); - sout | "remquo:" | quot | f; - d = remquo( 3.6D, 0.5F, " ); - sout | quot | d; - l = remquo( 3.6L, 0.5L, " ); - sout | quot | l | endl; - f = div( 3.6F, 0.5F, " ); - sout | "div:" | quot | f; - d = div( 3.6D, 0.5F, " ); - sout | quot | d; - l = div( 3.6L, 0.5L, " ); - sout | quot | l | endl; - sout | "fma:" | fma( 3.0F, -1.0F, 1.0F ) | fma( 3.0D, -1.0D, 1.0D ) | fma( 3.0L, -1.0L, , 1.0L ) | endl; - sout | "fdim:" | fdim( 1.0F, -1.0F ) | fdim( 1.0D, -1.0D ) | fdim( 1.0L, -1.0L ) | endl; - sout | "nan:" | (float)nan( "" ) | (double)nan( "" ) | (long double)nan( "" ) | endl; - - //---------------------- Exponential ---------------------- - - sout | "exp:" | exp( 1.0F ) | exp( 1.0D ) | exp( 1.0L ) | exp( 1.0F+1.0FI ) | exp( 1.0D+1.0DI ) | exp( 1.0DL+1.0LI ) | endl; - sout | "exp2:" | exp2( 1.0F ) | exp2( 1.0D ) | exp2( 1.0L ) | endl; - sout | "expm1:" | expm1( 1.0F ) | expm1( 1.0D ) | expm1( 1.0L ) | endl; - sout | "log:" | log( 1.0F ) | log( 1.0D ) | log( 1.0L ) | log( 1.0F+1.0FI ) | log( 1.0D+1.0DI ) | log( 1.0DL+1.0LI ) | endl; - sout | "log2:" | log2( 8.0F ) | log2( 8.0D ) | log2( 8.0L ) | endl; - sout | "log10:" | log10( 100.0F ) | log10( 100.0D ) | log10( 100.0L ) | endl; - sout | "log1p:" | log1p( 1.0F ) | log1p( 1.0D ) | log1p( 1.0L ) | endl; - sout | "ilogb:" | ilogb( 1.0F ) | ilogb( 1.0D ) | ilogb( 1.0L ) | endl; - sout | "logb:" | logb( 8.0F ) | logb( 8.0D ) | logb( 8.0L ) | endl; - - //---------------------- Power ---------------------- - - sout | "sqrt:" | sqrt( 1.0F ) | sqrt( 1.0D ) | sqrt( 1.0L ) | sqrt( 1.0F+1.0FI ) | sqrt( 1.0D+1.0DI ) | sqrt( 1.0DL+1.0LI ) | endl; - sout | "cbrt:" | cbrt( 27.0F ) | cbrt( 27.0D ) | cbrt( 27.0L ) | endl; - sout | "hypot:" | hypot( 1.0F, -1.0F ) | hypot( 1.0D, -1.0D ) | hypot( 1.0L, -1.0L ) | endl; - sout | "pow:" | pow( 1.0F, 1.0F ) | pow( 1.0D, 1.0D ) | pow( 1.0L, 1.0L ) | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.0DL+1.0LI, 1.0DL+1.0LI ) | endl; - - //---------------------- Trigonometric ---------------------- - - sout | "sin:" | sin( 1.0F ) | sin( 1.0D ) | sin( 1.0L ) | sin( 1.0F+1.0FI ) | sin( 1.0D+1.0DI ) | sin( 1.0DL+1.0LI ) | endl; - sout | "cos:" | cos( 1.0F ) | cos( 1.0D ) | cos( 1.0L ) | cos( 1.0F+1.0FI ) | cos( 1.0D+1.0DI ) | cos( 1.0DL+1.0LI ) | endl; - sout | "tan:" | tan( 1.0F ) | tan( 1.0D ) | tan( 1.0L ) | tan( 1.0F+1.0FI ) | tan( 1.0D+1.0DI ) | tan( 1.0DL+1.0LI ) | endl; - sout | "asin:" | asin( 1.0F ) | asin( 1.0D ) | asin( 1.0L ) | asin( 1.0F+1.0FI ) | asin( 1.0D+1.0DI ) | asin( 1.0DL+1.0LI ) | endl; - sout | "acos:" | acos( 1.0F ) | acos( 1.0D ) | acos( 1.0L ) | acos( 1.0F+1.0FI ) | acos( 1.0D+1.0DI ) | acos( 1.0DL+1.0LI ) | endl; - sout | "atan:" | atan( 1.0F ) | atan( 1.0D ) | atan( 1.0L ) | atan( 1.0F+1.0FI ) | atan( 1.0D+1.0DI ) | atan( 1.0DL+1.0LI ) | endl; - sout | "atan2:" | atan2( 1.0F, 1.0F ) | atan2( 1.0D, 1.0D ) | atan2( 1.0L, 1.0L ); - sout | "atan:" | atan( 1.0F, 1.0F ) | atan( 1.0D, 1.0D ) | atan( 1.0L, 1.0L ); - - //---------------------- Hyperbolic ---------------------- - - sout | "sinh:" | sinh( 1.0F ) | sinh( 1.0D ) | sinh( 1.0L ) | sinh( 1.0F+1.0FI ) | sinh( 1.0D+1.0DI ) | sinh( 1.0DL+1.0LI ) | endl; - sout | "cosh:" | cosh( 1.0F ) | cosh( 1.0D ) | cosh( 1.0L ) | cosh( 1.0F+1.0FI ) | cosh( 1.0D+1.0DI ) | cosh( 1.0DL+1.0LI ) | endl; - sout | "tanh:" | tanh( 1.0F ) | tanh( 1.0D ) | tanh( 1.0L ) | tanh( 1.0F+1.0FI ) | tanh( 1.0D+1.0DI ) | tanh( 1.0DL+1.0LI ) | endl; - sout | "acosh:" | acosh( 1.0F ) | acosh( 1.0D ) | acosh( 1.0L ) | acosh( 1.0F+1.0FI ) | acosh( 1.0D+1.0DI ) | acosh( 1.0DL+1.0LI ) | endl; - sout | "asinh:" | asinh( 1.0F ) | asinh( 1.0D ) | asinh( 1.0L ) | asinh( 1.0F+1.0FI ) | asinh( 1.0D+1.0DI ) | asinh( 1.0DL+1.0LI ) | endl; - sout | "atanh:" | atanh( 1.0F ) | atanh( 1.0D ) | atanh( 1.0L ) | atanh( 1.0F+1.0FI ) | atanh( 1.0D+1.0DI ) | atanh( 1.0DL+1.0LI ) | endl; - - //---------------------- Error / Gamma ---------------------- - - sout | "erf:" | erf( 1.0F ) | erf( 1.0D ) | erf( 1.0L ) | endl; - sout | "erfc:" | erfc( 1.0F ) | erfc( 1.0D ) | erfc( 1.0L ) | endl; - sout | "lgamma:" | lgamma( 4.0F ) | lgamma( 4.0D ) | lgamma( 4.0L ) | endl; - int sign; - f = lgamma( 4.0F, &sign ); - sout | "lgamma:" | f | sign; - d = lgamma( 4.0D, &sign ); - sout | d | sign; - l = lgamma( 4.0L, &sign ); - sout | l | sign | endl; - sout | "tgamma:" | tgamma( 4.0F ) | tgamma( 4.0D ) | tgamma( 4.0L ) | endl; - - //---------------------- Nearest Integer ---------------------- - - sout | "floor:" | floor( 1.2F ) | floor( 1.2D ) | floor( 1.2L ) | endl; - sout | "ceil:" | ceil( 1.6F ) | ceil( 1.6D ) | ceil( 1.6L ) | endl; - sout | "trunc:" | trunc( 3.5F ) | trunc( 3.5D ) | trunc( 3.5L ) | endl; - sout | "rint:" | (float)rint( 1.5F ) | (double)rint( 1.5D ) | (long double)rint( 1.5L ) | endl; - sout | "rint:" | (long int)rint( 1.5F ) | (long int)rint( 1.5D ) | (long int)rint( 1.5L ) | endl; - sout | "rint:" | (long long int)rint( 1.5F ) | (long long int)rint( 1.5D ) | (long long int)rint( 1.5L ) | endl; - sout | "lrint:" | lrint( 1.5F ) | lrint( 1.5D ) | lrint( 1.5L ) | endl; - sout | "llrint:" | llrint( 1.5F ) | llrint( 1.5D ) | llrint( 1.5L ) | endl; - sout | "nearbyint:" | nearbyint( 3.5F ) | nearbyint( 3.5D ) | nearbyint( 3.5L ) | endl; - sout | "round:" | (float)round( 1.5F ) | (double)round( 1.5D ) | (long double)round( 1.5L ) | endl; - sout | "round:" | (long int)round( 1.5F ) | (long int)round( 1.5D ) | (long int)round( 1.5L ) | endl; - sout | "round:" | (long long int)round( 1.5F ) | (long long int)round( 1.5D ) | (long long int)round( 1.5L ) | endl; - sout | "lround:" | lround( 1.5F ) | lround( 1.5D ) | lround( 1.5L ) | endl; - sout | "llround:" | llround( 1.5F ) | llround( 1.5D ) | llround( 1.5L ) | endl; - - //---------------------- Manipulation ---------------------- - - sout | "copysign:" | copysign( 1.0F, -1.0F ) | copysign( 1.0D, -1.0D ) | copysign( 1.0L, -1.0L ) | endl; - int exp; - f = frexp( 4.0F, &exp ); - sout | "frexp:" | f | exp; - d = frexp( 4.0D, &exp ); - sout | d | exp; - l = frexp( 4.0L, &exp ); - sout | l | exp | endl; - sout | "ldexp:" | ldexp( 2.0F, 2 ) | ldexp( 2.0D, 2 ) | ldexp( 2.0L, 2 ) | endl; - float fi; - double di; - long double ldi; - f = modf( 2.3F, &fi ); - sout | "modf:" | fi | f; - d = modf( 2.3D, &di ); - sout | di | d; - l = modf( 2.3L, &ldi ); - sout | ldi | l; - sout | "nextafter:" | nextafter( 2.0F, 3.0F ) | nextafter( 2.0D, 3.0D ) | nextafter( 2.0L, 3.0L ) | endl; - sout | "nexttoward:" | nexttoward( 2.0F, 3.0F ) | nexttoward( 2.0D, 3.0D ) | nexttoward( 2.0L, 3.0L ) | endl; - - sout | "scalbn:" | scalbn( 2.0F, 3 ) | scalbn( 2.0D, 3 ) | scalbn( 2.0L, 3 ) | endl; - sout | "scalbln:" | scalbln( 2.0F, 3L ) | scalbln( 2.0D, 3L ) | scalbln( 2.0L, 3L ) | endl; -} // main - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa math.c" // -// End: // Index: src/examples/minmax.c =================================================================== --- src/examples/minmax.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,52 +1,0 @@ -// -// 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. -// -// minmax.c -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Mon Feb 29 23:45:16 2016 -// Update Count : 49 -// - -#include -#include // min, max - -int main( void ) { - // char does not have less or greater than. - int ??( char op1, char op2 ) { return (int)op1 > (int)op2; } - - sout | "char\t\t\t" | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' ) | endl; - sout | "signed int\t\t" | 4 | 3 | "\tmin" | min( 4, 3 ) | endl; - sout | "unsigned int\t\t" | 4u | 3u | "\tmin" | min( 4u, 3u ) | endl; - sout | "signed long int\t\t" | 4l | 3l | "\tmin" | min( 4l, 3l ) | endl; - sout | "unsigned long int\t" | 4ul | 3ul | "\tmin" | min( 4ul, 3ul ) | endl; - sout | "signed long long int\t" | 4ll | 3ll | "\tmin" | min( 4ll, 3ll ) | endl; - sout | "unsigned long long int\t" | 4ull | 3ull | "\tmin" | min( 4ull, 3ull ) | endl; - sout | "float\t\t\t" | 4.0f | 3.1f | "\tmin" | min( 4.0f, 3.1f ) | endl; - sout | "double\t\t\t" | 4.0 | 3.1 | "\tmin" | min( 4.0, 3.1 ) | endl; - sout | "long double\t\t" | 4.0l | 3.1l | "\tmin" | min( 4.0l, 3.1l ) | endl; - - sout | endl; - - sout | "char\t\t\t" | 'z' | ' ' | 'a' | "\tmax " | max( 'z', 'a' ) | endl; - sout | "signed int\t\t" | 4 | 3 | "\tmax" | max( 4, 3 ) | endl; - sout | "unsigned int\t\t" | 4u | 3u | "\tmax" | max( 4u, 3u ) | endl; - sout | "signed long int\t\t" | 4l | 3l | "\tmax" | max( 4l, 3l ) | endl; - sout | "unsigned long int\t" | 4ul | 3ul | "\tmax" | max( 4ul, 3ul ) | endl; - sout | "signed long long int\t" | 4ll | 3ll | "\tmax" | max( 4ll, 3ll ) | endl; - sout | "unsigned long long int\t" | 4ull | 3ull | "\tmax" | max( 4ull, 3ull ) | endl; - sout | "float\t\t\t" | 4.0f | 3.1f | "\tmax" | max( 4.0f, 3.1f ) | endl; - sout | "double\t\t\t" | 4.0 | 3.1 | "\tmax" | max( 4.0, 3.1 ) | endl; - sout | "long double\t\t" | 4.0l | 3.1l | "\tmax" | max( 4.0l, 3.1l ) | endl; -} // main - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa minmax.c" // -// End: // Index: src/examples/poly-bench.c =================================================================== --- src/examples/poly-bench.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,207 +1,0 @@ -// -// 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. -// -// poly-bench.cc -- -// -// Author : Aaron Moss -// Created On : Sat May 16 07:26:30 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed May 27 18:25:19 2015 -// Update Count : 5 -// - -extern "C" { -#include -//#include "my_time.h" -} - -#define N 200000000 - -struct ipoint { - int x; - int y; -}; - -struct ipoint ?+?(struct ipoint a, struct ipoint b) { - struct ipoint r; - r.x = a.x + b.x; - r.y = a.y + b.y; - return r; -} - -struct ipoint ?-?(struct ipoint a, struct ipoint b) { - struct ipoint r; - r.x = a.x - b.x; - r.y = a.y - b.y; - return r; -} - -struct ipoint ?*?(struct ipoint a, struct ipoint b) { - struct ipoint r; - r.x = a.x * b.x; - r.y = a.y * b.y; - return r; -} - -struct dpoint { - double x; - double y; -}; - -struct dpoint ?+?(struct dpoint a, struct dpoint b) { - struct dpoint r; - r.x = a.x + b.x; - r.y = a.y + b.y; - return r; -} - -struct dpoint ?-?(struct dpoint a, struct dpoint b) { - struct dpoint r; - r.x = a.x - b.x; - r.y = a.y - b.y; - return r; -} - -struct dpoint ?*?(struct dpoint a, struct dpoint b) { - struct dpoint r; - r.x = a.x * b.x; - r.y = a.y * b.y; - return r; -} - -int a2b2_mono_int(int a, int b) { - return (a - b)*(a + b); -} - -double a2b2_mono_double(double a, double b) { - return (a - b)*(a + b); -} - -struct ipoint a2b2_mono_ipoint(struct ipoint a, struct ipoint b) { - return (a - b)*(a + b); -} - -struct dpoint a2b2_mono_dpoint(struct dpoint a, struct dpoint b) { - return (a - b)*(a + b); -} - -forall(type T | { T ?+?(T,T); T ?-?(T,T); T ?*?(T,T); }) -T a2b2_poly(T a, T b) { - return (a - b)*(a + b); -} - -typedef int clock_t; -long ms_between(clock_t start, clock_t end) { -// return (end - start) / (CLOCKS_PER_SEC / 1000); - return 0; -} -int clock() { return 3; } - -int main(int argc, char** argv) { - clock_t start, end; - int i; - - int a, b; - double c, d; - struct ipoint p, q; - struct dpoint r, s; - - printf("\n## a^2-b^2 ##\n"); - - a = 5, b = 3; - start = clock(); - for (i = 0; i < N/2; ++i) { - a = a2b2_mono_int(a, b); - b = a2b2_mono_int(b, a); - } - end = clock(); - printf("mono_int: %7ld [%d,%d]\n", ms_between(start, end), a, b); - - a = 5, b = 3; - start = clock(); - for (i = 0; i < N/2; ++i) { - a = a2b2_poly(a, b); - b = a2b2_poly(b, a); - } - end = clock(); - printf("poly_int: %7ld [%d,%d]\n", ms_between(start, end), a, b); - -/* { - a = 5, b = 3; - // below doesn't actually work; a2b2_poly isn't actually assigned, just declared - * [int] (int, int) a2b2_poly = a2b2_mono_int; - start = clock(); - for (i = 0; i < N/2; ++i) { -// printf("\t[%d,%d]\n", a, b); -a = a2b2_poly(a, b); -// printf("\t[%d,%d]\n", a, b); -b = a2b2_poly(b, a); -} -end = clock(); -printf("spec_int: %7ld [%d,%d]\n", ms_between(start, end), a, b); -} -*/ - c = 5.0, d = 3.0; - start = clock(); - for (i = 0; i < N/2; ++i) { - c = a2b2_mono_double(c, d); - d = a2b2_mono_double(d, c); - } - end = clock(); - printf("mono_double:%7ld [%f,%f]\n", ms_between(start, end), c, d); - - c = 5.0, d = 3.0; - start = clock(); - for (i = 0; i < N/2; ++i) { - c = a2b2_poly(c, d); - d = a2b2_poly(d, c); - } - end = clock(); - printf("poly_double:%7ld [%f,%f]\n", ms_between(start, end), c, d); - - p.x = 5, p.y = 5, q.x = 3, q.y = 3; - start = clock(); - for (i = 0; i < N/2; ++i) { - p = a2b2_mono_ipoint(p, q); - q = a2b2_mono_ipoint(q, p); - } - end = clock(); - printf("mono_ipoint:%7ld [(%d,%d),(%d,%d)]\n", ms_between(start, end), p.x, p.y, q.x, q.y); - - p.x = 5, p.y = 5, q.x = 3, q.y = 3; - start = clock(); - for (i = 0; i < N/2; ++i) { - p = a2b2_poly(p, q); - q = a2b2_poly(q, p); - } - end = clock(); - printf("poly_ipoint:%7ld [(%d,%d),(%d,%d)]\n", ms_between(start, end), p.x, p.y, q.x, q.y); - - r.x = 5.0, r.y = 5.0, s.x = 3.0, s.y = 3.0; - start = clock(); - for (i = 0; i < N/2; ++i) { - r = a2b2_mono_dpoint(r, s); - s = a2b2_mono_dpoint(s, r); - } - end = clock(); - printf("mono_dpoint:%7ld [(%f,%f),(%f,%f)]\n", ms_between(start, end), r.x, r.y, s.x, s.y); - - r.x = 5.0, r.y = 5.0, s.x = 3.0, s.y = 3.0; - start = clock(); - for (i = 0; i < N/2; ++i) { - r = a2b2_poly(r, s); - s = a2b2_poly(s, r); - } - end = clock(); - printf("poly_dpoint:%7ld [(%f,%f),(%f,%f)]\n", ms_between(start, end), r.x, r.y, s.x, s.y); - - return 0; -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa poly-bench.c" // -// End: // Index: src/examples/rational.c =================================================================== --- src/examples/rational.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,87 +1,0 @@ -// -*- Mode: C -*- -// -// 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. -// -// rational.c -- test rational number package -// -// Author : Peter A. Buhr -// Created On : Mon Mar 28 08:43:12 2016 -// Last Modified By : Peter A. Buhr -// Last Modified On : Wed May 4 14:19:36 2016 -// Update Count : 24 -// - -#include -#include -#include - -int main() { - sout | "constructor" | endl; - Rational a = { 3 }, b = { 4 }, c; - sout | a | b | c | endl; - a = (Rational){ 4, 8 }; - b = (Rational){ 5, 7 }; - sout | a | b | endl; - a = (Rational){ -2, -3 }; - b = (Rational){ 3, -2 }; - sout | a | b | endl; - a = (Rational){ -2, 3 }; - b = (Rational){ 3, 2 }; - sout | a | b | endl; - - sout | "logical" | endl; - a = (Rational){ -2 }; - b = (Rational){ -3, 2 }; - sout | a | b | endl; - sout | a == 1 | endl; - sout | a != b | endl; - sout | a < b | endl; - sout | a <= b | endl; - sout | a > b | endl; - sout | a >= b | endl; - - sout | "arithmetic" | endl; - sout | a | b | endl; - sout | a + b | endl; - sout | a - b | endl; - sout | a * b | endl; - sout | a / b | endl; - - sout | "conversion" | endl; - a = (Rational){ 3, 4 }; - sout | widen( a ) | endl; - a = (Rational){ 1, 7 }; - sout | widen( a ) | endl; - a = (Rational){ 355, 113 }; - sout | widen( a ) | endl; - sout | narrow( 0.75, 4 ) | endl; - sout | narrow( 0.14285714285714, 16 ) | endl; - sout | narrow( 3.14159265358979, 256 ) | endl; - - Rational x = { 1, 2 }, y = { 2 }; - sout | x - y | endl; - sout | x > y | endl; - sout | x | numerator( x, 2 ) | x | endl; - sout | y | denominator( y, -2 ) | y | endl; - - Rational z = { 0, 5 }; - sout | z | endl; - - sout | x | numerator( x, 0 ) | x | endl; - - x = (Rational){ 1, MAX } + (Rational){ 1, MAX }; - sout | x | endl; - x = (Rational){ 3, MAX } + (Rational){ 2, MAX }; - sout | x | endl; - - sin | &a | &b; - sout | a | b | endl; -} // main - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa rational.c" // -// End: // Index: src/examples/runTests.sh =================================================================== --- src/examples/runTests.sh (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,65 +1,0 @@ -#!/bin/bash - -############################################################################## -# -# 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. -# -# Runs integration tests for cfa-cc. -# -# Output of test run will be copied into $logfile (default: tests/log.txt). -# Build failures for tests will be placed in tests/$test.make.txt, incorrect -# output in tests/$test.run.txt. -# -# Author : Aaron B. Moss -# Created On : Mon Nov 23 14:19:00 2015 -# Last Modified By : Aaron B. Moss -# Last Modified On : Mon Nov 23 14:19:00 2015 -# Update Count : 1 -# -############################################################################## - -# list of tests to run; -# Should be a make target for each test that generates an executable in the -# current directory named the same; should also be an input file -# tests/$test.in.txt and expected output tests/$test.out.txt -tests="vector_test avl_test" - -# log file for test output; -# reset at the beginning of each run -logfile=tests/log.txt -touch $logfile && rm $logfile - -# clean existing build artifacts before run -make clean > /dev/null 2>&1 - -ret_val=0 - -for test in $tests; do - echo -n " $test" | tee -a $logfile - - # build, skipping to next test on error - if ! make -j 8 $test > tests/$test.make.txt 2>&1; then - ret_val=1 - echo -e "\tFAILED with build error:" | tee -a $logfile - cat tests/$test.make.txt | tee -a $logfile - continue - fi - rm tests/$test.make.txt - - # run, testing against expected output - ./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1 - if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then - ret_val=1 - echo -e "\tFAILED with output mismatch:" | tee -a $logfile - cat tests/$test.diff.txt | tee -a $logfile - continue - fi - rm tests/$test.run.txt tests/$test.diff.txt ./$test - - echo -e "\tPASSED" | tee -a $logfile -done - -exit $((ret_val)) Index: src/examples/swap.c =================================================================== --- src/examples/swap.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,95 +1,0 @@ -// -// 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. -// -// swap.c -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Peter A. Buhr -// Last Modified On : Thu Apr 21 08:10:41 2016 -// Update Count : 69 -// - -#include -#include // swap - -int main( void ) { - char c1 = 'a', c2 = 'b'; - sout | "char\t\t\t" | c1 | ' ' | c2 | "\t\t\tswap "; - swap( &c1, &c2 ); - sout | '\t' | c1 | ' ' | c2 | endl; - - signed int i1 = -1, i2 = -2; - sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap "; - swap( &i1, &i2 ); - sout | '\t' | i1 | i2 | endl; - - unsigned int ui1 = 1, ui2 = 2; - sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap "; - swap( &ui1, &ui2 ); - sout | '\t' | ui1 | ui2 | endl; - - signed long int li1 = -1, li2 = -2; - sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap "; - swap( &li1, &li2 ); - sout | '\t' | li1 | li2 | endl; - - unsigned long int uli1 = 1, uli2 = 2; - sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap "; - swap( &uli1, &uli2 ); - sout | '\t' | uli1 | uli2 | endl; - - signed long long int lli1 = -1, lli2 = -2; - sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap "; - swap( &lli1, &lli2 ); - sout | '\t' | lli1 | lli2 | endl; - - unsigned long long int ulli1 = 1, ulli2 = 2; - sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap "; - swap( &ulli1, &ulli2 ); - sout | '\t' | ulli1 | ulli2 | endl; - - float f1 = 1.5, f2 = 2.5; - sout | "float\t\t\t" | f1 | f2 | "\t\t\tswap "; - swap( &f1, &f2 ); - sout | '\t' | f1 | f2 | endl; - - double d1 = 1.5, d2 = 2.5; - sout | "double\t\t\t" | d1 | d2 | "\t\t\tswap "; - swap( &d1, &d2 ); - sout | '\t' | d1 | d2 | endl; - - long double ld1 = 1.5, ld2 = 2.5; - sout | "long double\t\t" | ld1 | ld2 | "\t\t\tswap "; - swap( &ld1, &ld2 ); - sout | '\t' | ld1 | ld2 | endl; - - float _Complex fc1 = 1.5f+1.5if, fc2 = 2.5f+2.5if; - sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap "; - swap( &fc1, &fc2 ); - sout | '\t' | fc1 | fc2 | endl; - - double _Complex dc1 = 1.5d+1.5id, dc2 = 2.5d+2.5id; - sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap "; - swap( &dc1, &dc2 ); - sout | '\t' | dc1 | dc2 | endl; - - long double _Complex ldc1 = 1.5d+1.5il, ldc2 = 2.5d+2.5il; - sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap "; - swap( &ldc1, &ldc2 ); - sout | '\t' | ldc1 | ldc2 | endl; - - struct S { int i, j; } s1 = { 1, 2 }, s2 = { 2, 1 }; - ofstream * ?|?( ofstream * os, S s ) { return os | s.i | s.j; } - sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap "; - swap( &s1, &s2 ); - sout | '\t' | s1 | "," | s2 | endl; -} // main - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa swap.c" // -// End: // Index: src/examples/tests/avl_test.out.txt =================================================================== --- src/examples/tests/avl_test.out.txt (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,3 +1,0 @@ -3 13 0 -foo bar baz -world bar cheese Index: src/examples/tests/vector_test.in.txt =================================================================== --- src/examples/tests/vector_test.in.txt (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,1 +1,0 @@ -1 2 3 4 5 Index: src/examples/tests/vector_test.out.txt =================================================================== --- src/examples/tests/vector_test.out.txt (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,5 +1,0 @@ -enter N elements and C-d on a separate line: -Array elements: -1 2 3 4 5 -Array elements reversed: -5 4 3 2 1 Index: src/examples/vector_int.c =================================================================== --- src/examples/vector_int.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,77 +1,0 @@ -// -// 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. -// -// vector_int.c -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Apr 27 17:27:12 2016 -// Update Count : 3 -// - -#include "vector_int.h" -extern "C" { -#include -#include -} - -#define DEFAULT_CAPACITY 20 - -void ?{}( vector_int * vec ) { - vec { DEFAULT_CAPACITY }; -} - -void ?{}( vector_int * vec, int reserve ) { - vec->last = -1; - vec->capacity = reserve; - vec->data = malloc( sizeof( int ) * reserve ); -} - -void ?{}( vector_int * vec, vector_int other ) { - vec->last = other.last; - vec->capacity = other.capacity; - vec->data = malloc( sizeof( int ) * other.capacity ); - for (int i = 0; i < vec->last; i++) { - vec->data[i] = other.data[i]; - } -} - -void ^?{}( vector_int * vec ) { - free( vec->data ); -} - -void reserve( vector_int *vec, int reserve ) { - if ( reserve > vec->capacity ) { - vec->data = realloc( vec->data, sizeof( int ) * reserve ); - vec->capacity = reserve; - } -} - -void append( vector_int *vec, int element ) { - vec->last++; - if ( vec->last == vec->capacity ) { - vec->capacity *= 2; - vec->data = realloc( vec->data, sizeof( int ) * vec->capacity ); - } - vec->data[ vec->last ] = element; -} - -// implement bounded_array - -lvalue int ?[?]( vector_int * vec, int index ) { - return vec->data[ index ]; -} - -int last( vector_int * vec ) { - return vec->last; -} - - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa vector_int.c" // -// End: // Index: src/examples/vector_int.h =================================================================== --- src/examples/vector_int.h (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,45 +1,0 @@ -// -// 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. -// -// vector_int.h -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Apr 27 17:26:59 2016 -// Update Count : 2 -// - -#ifndef VECTOR_INT_H -#define VECTOR_INT_H - -// A flexible array, similar to a C++ vector, that holds integers and can be resized dynamically - -typedef struct vector_int { - int last; // last used index - int capacity; // last possible index before reallocation - int *data; // array -} vector_int; - -void ?{}( vector_int * ); // allocate vector with default capacity -void ?{}( vector_int *, int reserve ); // allocate vector with specified capacity -void ?{}( vector_int * vec, vector_int other ); // copy constructor -void ^?{}( vector_int * ); // deallocate vector's storage - -void reserve( vector_int *vec, int reserve ); // reserve more capacity -void append( vector_int *vec, int element ); // add element to end of vector, resizing as necessary - -// implement bounded_array - -lvalue int ?[?]( vector_int * vec, int index ); // access to arbitrary element (does not resize) -int last( vector_int * vec ); // return last element - -#endif // VECTOR_INT_H - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa vector_int.c" // -// End: // Index: src/examples/vector_test.c =================================================================== --- src/examples/vector_test.c (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ (revision ) @@ -1,47 +1,0 @@ -// -// 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. -// -// vector_test.c -- -// -// Author : Richard C. Bilson -// Created On : Wed May 27 17:56:53 2015 -// Last Modified By : Rob Schluntz -// Last Modified On : Wed Apr 27 17:31:27 2016 -// Update Count : 18 -// - -#include -#include -#include "vector_int.h" -#include "array.h" - -int main( void ) { - vector_int vec; - - // read in numbers until EOF or error - int num; - - sout | "enter N elements and C-d on a separate line:" | endl; - for ( ;; ) { - sin | # - if ( fail( sin ) || eof( sin ) ) break; - append( &vec, num ); - } - // write out the numbers - - sout | "Array elements:" | endl; - write( begin( &vec ), end( &vec ), sout ); - sout | endl; - - sout | "Array elements reversed:" | endl; - write_reverse( begin( &vec ), end( &vec ), sout ); - sout | endl; -} - -// Local Variables: // -// tab-width: 4 // -// compile-command: "cfa vector_test.c vector_int.o array.o" // -// End: // Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision c8c03683ab886c6aabc128b60ed569f8abadd1c6) +++ src/libcfa/Makefile.in (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -1,8 +1,7 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -22,4 +21,49 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -39,6 +83,6 @@ POST_UNINSTALL = : subdir = src/libcfa -DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/automake/depcomp $(include_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -83,8 +127,6 @@ 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_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libcfa_a_AR = $(AR) $(ARFLAGS) libcfa_a_LIBADD = @@ -94,4 +136,16 @@ am_libcfa_a_OBJECTS = libcfa-prelude.$(OBJEXT) $(am__objects_1) libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/automake/depcomp @@ -102,17 +156,38 @@ AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libcfa_a_SOURCES) DIST_SOURCES = $(libcfa_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(cfalib_DATA) HEADERS = $(include_HEADERS) +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags @@ -134,5 +209,5 @@ CFA_LIBDIR = @CFA_LIBDIR@ CFA_PREFIX = @CFA_PREFIX@ -CFLAGS = -quiet -g -Wall -Wno-unused-function -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2 +CFLAGS = -g -Wall -Wno-unused-function -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2 CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -271,5 +346,4 @@ install-libLIBRARIES: $(lib_LIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ @@ -279,4 +353,6 @@ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; } @@ -299,4 +375,5 @@ clean-libLIBRARIES: -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) + libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES) $(AM_V_at)-rm -f libcfa.a @@ -324,5 +401,5 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @@ -331,9 +408,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` install-cfalibDATA: $(cfalib_DATA) @$(NORMAL_INSTALL) - test -z "$(cfalibdir)" || $(MKDIR_P) "$(DESTDIR)$(cfalibdir)" @list='$(cfalib_DATA)'; test -n "$(cfalibdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(cfalibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(cfalibdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -352,6 +432,9 @@ install-includeHEADERS: $(include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -369,24 +452,13 @@ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ @@ -400,13 +472,9 @@ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ @@ -417,4 +485,19 @@ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: @@ -562,16 +645,16 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-cfalibDATA \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-includeHEADERS install-info install-info-am \ - install-libLIBRARIES install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLIBRARIES 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-cfalibDATA install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-includeHEADERS install-info \ + install-info-am install-libLIBRARIES 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 uninstall \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-cfalibDATA uninstall-includeHEADERS \ uninstall-libLIBRARIES Index: src/tests/Array.c =================================================================== --- src/tests/Array.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Array.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,40 @@ +//Testing array declarations +int a1[]; +//int a2[*]; +//double a4[3.0]; + +int m1[][3]; +//int m2[*][*]; +int m4[3][3]; + +typedef int T; + +int fred() { +// int a1[]; +// int a2[*]; + int a4[3]; + int T[3]; +} + +int mary( int T[3], + int p1[const 3], + int p2[static 3], + int p3[static const 3] + ) { +} + +int (*tom())[3] { +} + +int (*(jane)())( int T[3], + int p1[const 3], + int p2[static 3], + int p3[static const 3] + ) { +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/AsmName.c =================================================================== --- src/tests/AsmName.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/AsmName.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,16 @@ +//Testing assembly declaration +extern int x asm( "xx" ); + +int fred( int x ) { + static int y asm( "yy" ); + +// Cforall extensions + + static * int z asm( "zz" ); +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/Cast.c =================================================================== --- src/tests/Cast.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Cast.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,18 @@ +//Testing some valid casts of chars +char f; + +void f() { + char f; + double f; + (int)f; + short f; + (int)f; + (void(*)())f; + ([long, long double, *[]()])([f, f, f]); +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/CastError.c =================================================================== --- src/tests/CastError.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/CastError.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,15 @@ +//Testing some of the invalid casts of chars +int f; + +void f() { + int f; + double f; + (char)f; + (int(*)())f; +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/CharStringConstants.c =================================================================== --- src/tests/CharStringConstants.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/CharStringConstants.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,87 @@ +int main() { +// character constants + + ' '; + 'a'; + '"'; + '_'; + + '\a'; // simple escape + '\b'; + '\e'; // GCC + '\f'; + '\n'; + '\r'; + '\t'; + '\v'; + '\''; + '\"'; + '\?'; + '\\'; + + '\0'; // octal escape + + '\377'; + + '\xf'; // hex escape + '\xff'; + +// warnings/errors + + ''; // empty character + 'aa'; // multi-character + 'a\na'; // multi-character, embedded escape + 'a\0a'; + '\xfff'; // hex escape out of range + '_\377_'; // multi-character + '_\xff_'; + '\xffff'; // hex escape out of range + 'a\xff34w'; + '\xf_f'; // multi-character + '\xff_ff'; + +// string constants + + " "; + "a"; + "'"; + '_'; + + "\a"; // simple escape + "\b"; + "\e"; // GCC + "\f"; + "\n"; + "\r"; + "\t"; + "\v"; + "\'"; + "\""; + "\?"; + "\\"; + + "\0"; // octal escape + "\377"; + + "\xf"; // hex escape + "\xff"; + + ""; + "aa"; + "a\na"; + "a\0a"; + "_\377_"; + "_\xff_"; + "\xf_f"; + +// warnings/errors + + "\xff_ff"; + "\xfff"; // hex escape out of range + "a\xff34w"; + "\xffff"; +} + +// Local Variables: // +// compile-command: "../../../bin/cfa -std=c99 CharStringConstants.c" // +// End: // Index: src/tests/CommentMisc.c =================================================================== --- src/tests/CommentMisc.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/CommentMisc.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,44 @@ +/* single line */ +// single line + +// single line containing */ +// single line containing /* +// single line containing /* */ + +/* 1st */ int i; +int i; /* 2nd */ +/* 1st */ int i; /* 2nd */ +/* 1st */ /* 2nd */ + +/* 1st + 2nd */ int i; + +/* +*/ + +/* + +*/ + +/* + 1st +*/ + +/* + 1st + 2nd +*/ + +// ignore preprocessor directives + +#line 2 + # + #include + #define mary abc + +// alternative ANSI99 brackets + +int main() <% + int x<:10:>; +%> + Index: src/tests/Constant0-1.c =================================================================== --- src/tests/Constant0-1.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Constant0-1.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,47 @@ +//Constant test declaration +// Cforall extension + +// value + +int 0; +const int 0; +static const int 0; +int 1; +const int 1; +static const int 1; +int 0, 1; +const int 0, 1; +int (0), (1); +int ((0)), ((1)); +static const int 0, 1; +struct { int i; } 0; +const struct { int i; } 1; +static const struct { int i; } 1; + +// pointer + +int *0, *1; +int *(0), *(1); +int (*0), (*1); +int ((*0)), ((*1)); +int * const (0), * const 1; +int (* const 0), (* const 1); +int ((* const 0)), ((* const 1)); +struct { int i; } *0; + +// Cforall style + +* int x, 0; +const * int x, 0; +static const * int x, 0; +* struct { int i; } 0; +const * struct { int i; } 0; +static const * struct { int i; } 0; +static * int x, 0; +static const * int x, 0; +const * * int x, 0; + +int main() { + int 1, * 0; + * int x, 0; +} Index: src/tests/Context.c =================================================================== --- src/tests/Context.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Context.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,18 @@ +//cforall context declaration +context has_q( otype T ) { + T q( T ); +}; + +forall( otype z | has_q( z ) ) void f() { + context has_r( otype T, otype U ) { + T r( T, T (T,U) ); + }; + + extern otype x, y | has_r( x, y ); +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/DeclarationErrors.c =================================================================== --- src/tests/DeclarationErrors.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/DeclarationErrors.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,11 @@ +static short int volatile static const x9; // duplicate static +struct { int i; } const static volatile static x18; // duplicate static +struct { int i; } const static volatile static volatile x19; // duplicate static & volatile +typedef int Int; +static Int volatile static const x28; // duplicate static + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/DeclarationSpecifier.c =================================================================== --- src/tests/DeclarationSpecifier.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/DeclarationSpecifier.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,95 @@ +typedef short int Int; + + +const short int volatile x1; +static const short int volatile x2; +const static short int volatile x3; +const short static int volatile x4; +const static volatile short int x4; +const short int static volatile x5; +const short int volatile static x6; +const short volatile int static x7; +short int volatile static const x8; +static short int volatile static const x9; // duplicate static + +const volatile struct { int i; } x10; +const struct { int i; } volatile x11; +struct { int i; } const volatile x12; +static const volatile struct { int i; } x13; +const static struct { int i; } volatile x14; +struct { int i; } static const volatile x15; +struct { int i; } const static volatile x16; +struct { int i; } const volatile static x17; +struct { int i; } const static volatile static x18; // duplicate static +struct { int i; } const static volatile static volatile x19; // duplicate static & volatile + +const Int volatile x20; +static const Int volatile x21; +const static Int volatile x22; +const static Int volatile x23; +const Int static volatile x24; +const Int volatile static x25; +const volatile Int static x26; +Int volatile static const x27; +static Int volatile static const x28; // duplicate static + +const volatile struct { Int i; } x29; +const struct { Int i; } volatile x30; +struct { Int i; } const volatile x31; +static const volatile struct { Int i; } x32; +const static struct { Int i; } volatile x33; +struct { Int i; } static const volatile x34; +struct { Int i; } const static volatile x35; +struct { Int i; } const volatile static x36; + + +const static inline const volatile int f01(); // duplicate const +volatile inline const volatile static int f02(); // duplicate volatile +const inline const volatile int static f03(); // duplicate const +volatile inline static const volatile int f04(); // duplicate volatile +const static const inline volatile int f05(); // duplicate const +volatile static const volatile inline int f06(); // duplicate volatile +const static const volatile int inline f07(); // duplicate const +volatile static const int inline volatile f08(); // duplicate volatile + +static inline const volatile int f11(); +inline const volatile static int f12(); +inline const volatile int static f13(); +inline static const volatile int f14(); +static const inline volatile int f15(); +static const volatile inline int f16(); +static const volatile int inline f17(); +static const int inline volatile f18(); + +short static inline const volatile int f21(); +inline short const volatile static int f22(); +inline const short volatile int static f23(); +inline static const short volatile int f24(); +static const inline volatile short int f25(); +static const volatile inline int short f26(); +static const volatile int inline short f27(); +static const int inline volatile short f28(); + +static inline const volatile struct { int i; } f31(); +inline const volatile static struct { int i; } f32(); +inline const volatile struct { int i; } static f33(); +inline static const volatile struct { int i; } f34(); +static const inline volatile struct { int i; } f35(); +static const volatile inline struct { int i; } f36(); +static const volatile struct { int i; } inline f37(); +static const struct { int i; } inline volatile f38(); + +static inline const volatile Int f41(); +inline const volatile static Int f42(); +inline const volatile Int static f43(); +inline static const volatile Int f44(); +static const inline volatile Int f45(); +static const volatile inline Int f46(); +static const volatile Int inline f47(); +static const Int inline volatile f48(); + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/Enum.c =================================================================== --- src/tests/Enum.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Enum.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,25 @@ +//Testing enum declaration +enum Colors { + Red, + Yellow, + Pink, + Blue, + Purple, + Orange, + Green +}; + +void f( void ) { + enum Fruits { + Apple, + Banana, + Pear, + Mango + } fruit = Mango; +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/Exception.c =================================================================== --- src/tests/Exception.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Exception.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,31 @@ +//Testing esceptions syntax +int fred() { + int x; + throw 3; + throw x = 5; + + try { + } catch( int i ) {} + + try { + x/4; + } catch( int) { + } catch( int x ) { + } catch( struct { int i; } ) { + } catch( struct { int i; } x ) { + } catch( struct { int i; } *x ) { + +// Cforall extensions + + } catch( * struct { int i; } ) { + } catch( * struct { int i; } x ) { + } catch( ... ) { +// } finally { + } // try +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/Expression.c =================================================================== --- src/tests/Expression.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Expression.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,73 @@ +int fred() { + struct s { int i; } *p; + int i; + + // order of evaluation (GCC is different) +/* + i = sizeof( (int) {3} ); + i = sizeof (int) {3}; +*/ + // operators + + ! i; + ~i; + +i; + -i; + *p; + ++p; + --p; + p++; + p--; + + i+i; + i-i; + i*i; + + i/i; + i%i; + i^i; + i&i; + i|i; + ii; + i=i; + + i==i; + i!=i; + i<>i; + i<=i; + i>=i; + i&&i; + i||i; + p->i; + i+=i; + i-=i; + i*=i; + i/=i; + i%=i; + i&=i; + i|=i; + i^=i; + i<<=i; + i>>=i; + + i?i:i; + + // cast +/* + double d; + int *ip; + (int *) i; + (* int) i; + ([char, int *])[d, d]; + [i,ip,ip] = ([int, * int, int *])[1,(void *)2,(void *)3]; + [i,ip,ip] = ([int, * int, int *])([1,(void *)2,(void *)3]); +*/ +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/Forall.c =================================================================== --- src/tests/Forall.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Forall.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,98 @@ +int ?=?( int*, int ); +float ?=?( float*, float ); +int * ?=?( int **, int * ); +float * ?=?( float **, float * ); +char ?=?( char*, char ); +void (* ?=?( void (**)(void), void (*)(void) ))(void); + +void g1() { + forall( otype T ) T f( T ); + void f( int ); + void h( void (*p)(void) ); + + int x; + void (*y)(void); + char z; + float w; + + f( x ); + f( y ); + f( z ); + f( w ); + h( f( y ) ); +} + +void g2() { + forall( otype T ) void f( T, T ); + forall( otype T, otype U ) void f( T, U ); + + int x; + float y; + int *z; + float *w; + + f( x, y ); + f( z, w ); + f( x, z ); +} + +typedef forall ( otype T ) int (*f)( int ); + +forall( otype T ) +void swap( T left, T right ) { + T temp = left; + left = right; + right = temp; +} + +context sumable( otype T ) { + const T 0; + T ?+?(T, T); + T ?++(T); + [T] ?+=?(T,T); +}; + +otype T1 | { const T1 0; T1 ?+?(T1, T1); T1 ?++(T1); [T1] ?+=?(T1,T1); }, + T2(otype P1, otype P2 ), + T3 | sumable(T3); + +otype T2(otype P1, otype P2) | sumable(T2(P1,P2)) = struct { P1 i; P2 j; }; + +T2(int, int) w1; +typedef T2(int, int) w2; +w2 g2; +otype w3 = T2(int, int); +w3 g3; + +forall( otype T | sumable( T ) ) +T sum( int n, T a[] ) { + T total = 0; + int i; + for ( i = 0; i < n; i += 1 ) + total = total + a[i]; + return total; +} + +forall( otype T | { const T 0; T ?+?(T, T); T ?++(T); [T] ?+=?(T,T); } ) +T twice( T t ) { + return t + t; +} + +forall( otype T | { const T 0; int ?!=?(T, T); int ? int f11( int ), f12( int ); + +[int] f( + int ( int, int p ), + [int](int) + ) { + int (*(*p)[][10])[][3]; + * [][10] * [][3] int p; + * [] * [int](int) p; +} + +static const int *f1() {} +static [ const int ] f2() {} +static inline [ const * int ] f3() {} +static inline [ const [ * int, int ] ] f4() {} +static [ const [ * int, const int ] ] f5() {} + +// unnamed parameter + +int f( + int (), + + int *(), + int **(), + int * const *(), + int * const * const (), + + int ([]), + int ([10]), + + int *([]), + int *([10]), + int **([]), + int **([10]), + int * const *([]), + int * const *([10]), + int * const * const ([]), + int * const * const ([10]) + ); + +int f( + int (), + + int *(), + int **(), + int * const *(), + int * const * const (), + + int ([]), + int ([10]), + + int *([]), + int *([10]), + int **([]), + int **([10]), + int * const *([]), + int * const *([10]), + int * const * const ([]), + int * const * const ([10]) + ) { +} + +typedef int T; + +int f( T (*f), T t ) { + T (T); +} + +// errors + +//int f()[] {} +//int (f[])() {} +//int f[]() {} +//int ((*f15())())[] {} + +// Local Variables: // +// tab-width: 4 // +// End: // Index: src/tests/GccExtensions.c =================================================================== --- src/tests/GccExtensions.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/GccExtensions.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,50 @@ +int main(int argc, char const *argv[]) + asm( "nop" ); + __asm( "nop" ); + __asm__( "nop" ); + + __complex__ c1; + _Complex c2; + + const int i1; + __const int i2; + __const__ int i3; + + __extension__ const int ex; + + __inline int f1(); + __inline__ int f2(); + + __signed s1; + __signed s2; + + __otypeof(s1) t1; + __otypeof__(s1) t2; + + __volatile int v1; + __volatile__ int v2; + + __attribute__(()) int a1; + const __attribute(()) int a2; + const static __attribute(()) int a3; + const static int __attribute(()) a4; + const static int a5 __attribute(()); + const static int a6, __attribute(()) a7; + + int * __attribute(()) p1; + int (* __attribute(()) p2); +// int (__attribute(()) (p3)); +// int ( __attribute(()) (* __attribute(()) p4)); + + struct __attribute(()) s1; + struct __attribute(()) s2 { int i; }; + struct __attribute(()) s3 { int i; } x1, __attribute(()) y1; + struct __attribute(()) s4 { int i; } x2, y2 __attribute(()); + + int m1 [10] __attribute(()); + int m2 [10][10] __attribute(()); + int __attribute(()) m3 [10][10]; +// int ( __attribute(()) m4 [10] )[10]; + + return 0; +} Index: src/tests/IdentFuncDeclarator.c =================================================================== --- src/tests/IdentFuncDeclarator.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/IdentFuncDeclarator.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,105 @@ +int main() { + //int f0[](); + //int (f0[])(); + //int f0()[]; + //int f0()(); + //int (*f0)()(); + //int ((*f0())())[]; + + int f1; + int (f2); + + int *f3; + int **f4; + int * const *f5; + int * const * const f6; + + int *(f7); + int **(f8); + int * const *(f9); + int * const * const (f10); + + int (*f11); + int (**f12); + int (* const *f13); + int (* const * const f14); + + int f15[]; + int f16[10]; + int (f17[]); + int (f18[10]); + + int *f19[]; + int *f20[10]; + int **f21[]; + int **f22[10]; + int * const *f23[]; + int * const *f24[10]; + int * const * const f25[]; + int * const * const f26[10]; + + int *(f27[]); + int *(f28[10]); + int **(f29[]); + int **(f30[10]); + int * const *(f31[]); + int * const *(f32[10]); + int * const * const (f33[]); + int * const * const (f34[10]); + + int (*f35[]); + int (*f36[10]); + int (**f37[]); + int (**f38[10]); + int (* const *f39[]); + int (* const *f40[10]); + int (* const * const f41[]); + int (* const * const f42[10]); + + int f43[][3]; + int f44[3][3]; + int (f45[])[3]; + int (f46[3])[3]; + int ((f47[]))[3]; + int ((f48[3]))[3]; + + int *f49[][3]; + int *f50[3][3]; + int **f51[][3]; + int **f52[3][3]; + int * const *f53[][3]; + int * const *f54[3][3]; + int * const * const f55[][3]; + int * const * const f56[3][3]; + + int (*f57[][3]); + int (*f58[3][3]); + int (**f59[][3]); + int (**f60[3][3]); + int (* const *f61[][3]); + int (* const *f62[3][3]); + int (* const * const f63[][3]); + int (* const * const f64[3][3]); + + int f65(int); + int (f66)(int); + + int *f67(int); + int **f68(int); + int * const *f69(int); + int * const * const f70(int); + + int *(f71)(int); + int **(f72)(int); + int * const *(f73)(int); + int * const * const (f74)(int); + + int (*f75)(int); + int (**f76)(int); + int (* const *f77)(int); + int (* const * const f78)(int); + + int (*(*f79)(int))(); + int (*(* const f80)(int))(); + int (* const(* const f81)(int))(); +} Index: src/tests/IdentFuncParamDeclarator.c =================================================================== --- src/tests/IdentFuncParamDeclarator.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/IdentFuncParamDeclarator.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,156 @@ +int fred( + //int f0[](), + //int (f0[])(), + //int f0()[], + //int f0()(), + //int (*f0)()(), + //int ((*f0())())[], + + int f1, + int (f2), + + int *f3, + int **f4, + int * const *f5, + int * const * const f6, + + int *(f7), + int **(f8), + int * const *(f9), + int * const * const (f10), + + int (*f11), + int (**f12), + int (* const *f13), + int (* const * const f14), + + int f15[], + int f16[10], + int (f17[]), + int (f18[10]), + + int *f19[], + int *f20[10], + int **f21[], + int **f22[10], + int * const *f23[], + int * const *f24[10], + int * const * const f25[], + int * const * const f26[10], + + int *(f27[]), + int *(f28[10]), + int **(f29[]), + int **(f30[10]), + int * const *(f31[]), + int * const *(f32[10]), + int * const * const (f33[]), + int * const * const (f34[10]), + + int (*f35[]), + int (*f36[10]), + int (**f37[]), + int (**f38[10]), + int (* const *f39[]), + int (* const *f40[10]), + int (* const * const f41[]), + int (* const * const f42[10]), + + int f43[][3], + int f44[3][3], + int (f45[])[3], + int (f46[3])[3], + int ((f47[]))[3], + int ((f48[3]))[3], + + int *f49[][3], + int *f50[3][3], + int **f51[][3], + int **f52[3][3], + int * const *f53[][3], + int * const *f54[3][3], + int * const * const f55[][3], + int * const * const f56[3][3], + + int (*f57[][3]), + int (*f58[3][3]), + int (**f59[][3]), + int (**f60[3][3]), + int (* const *f61[][3]), + int (* const *f62[3][3]), + int (* const * const f63[][3]), + int (* const * const f64[3][3]), + + int f65(int), + int (f66)(int), + + int *f67(int), + int **f68(int), + int * const *f69(int), + int * const * const f70(int), + + int *(f71)(int), + int **(f72)(int), + int * const *(f73)(int), + int * const * const (f74)(int), + + int (*f75)(int), + int (**f76)(int), + int (* const *f77)(int), + int (* const * const f78)(int), + + int (*(*f79)(int))(), + int (*(* const f80)(int))(), + int (* const(* const f81)(int))(), + + int f82[const *], + int f83[const 3], + int f84[static 3], + int f85[static const 3], + + int (f86[const *]), + int (f87[const 3]), + int (f88[static 3]), + int (f89[static const 3]), + + int *f90[const *], + int *f91[const 3], + int **f92[static 3], + int * const *f93[static const 3], + int * const * const f94[static const 3], + + int *(f95[const *]), + int *(f96[const 3]), + int **(f97[static 3]), + int * const *(f98[static const 3]), + int * const * const (f99[static const 3]), + + int f100[const *][3], + int f101[const 3][3], + int f102[static 3][3], + int f103[static const 3][3], + + int (f104[const *][3]), + int (f105[const 3][3]), + int (f106[static 3][3]), + int (f107[static const 3][3]), + + int *f108[const *][3], + int *f109[const 3][3], + int **f110[static 3][3], + int * const *f111[static const 3][3], + int * const * const f112[static const 3][3], + + int *(f113[const *][3]), + int *(f114[const 3][3]), + int **(f115[static 3][3]), + int * const *(f116[static const 3][3]), + int * const * const (f117[static const 3][3]) + ) { +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/LabelledExit.c =================================================================== --- src/tests/LabelledExit.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/LabelledExit.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,144 @@ +int main() { + int i; + int x, y; + + x = 0; y = 0; + + // block, labelled exits + + Block: { + if ( x == y ) { + for ( ; i < y; ) { + y += 1; + if ( y < 10 ) break Block; + } + } + } + + // loops, labelled exits + + w1: while ( y == 10 ); + + w2: while ( x < 10 ) { + while (y < 5 ) { + if ( y == 3 ) break w2; + } + x += 1; + } + + A: for ( i = 0; i < 10; i += 1 ) { + B: for ( i = 0; i < 10; i += 1 ) { + C: for ( i = 0; i < 10; i += 1 ) { + goto A; + goto B; + goto C; + continue A; + continue B; + continue C; + continue; + break A; + break B; + break C; + break; + } + } + } + + D: for ( ;; ) { + break D; + continue D; + } + + Z : i += 1; + goto Z; + X: Y: for ( ;; ) { + i += 1; + if ( i > 5 ) continue X; + if ( i < 5 ) break X; + if ( i < 5 ) break Y; + break; + } + XX: for ( ;; ) { + YY: for ( ;; ) { + ZZ: for ( ;; ) { + i += 1; + if ( i > 5 ) continue XX; + if ( i < 5 ) continue YY; + if ( i < 5 ) continue ZZ; + if ( i > 5 ) break XX; + if ( i < 5 ) break YY; + if ( i < 5 ) break ZZ; + break; + } + } + } + + for ( ;; ) ; + for ( int i = 0 ;; ) ; + for ( ; i < 0; ) ; + for ( ; ; i += 1 ) ; + L0: L1: L2: L3: L4: L5: L6: L7: L8: L9: + L10: L11: L12: L13: L14: L15: L16: L17: L18: L19: + L20: L21: L22: L23: L24: L25: L26: L27: L28: L29: + L31: L32: L33: L34: + for ( ;; ) { + break L0; + } + + // switch/choose, labelled exits + + Switch: switch ( i ) { + default: + i += 1; + case 0: + i += 1; + break Switch; + case 1: + switch ( i ) { + case 0: + break Switch; + default: + ; break; + } + } + + Choose: choose ( i ) { + default: + i += 1; + case 0: + i += 1; + break Choose; + case 1: + choose ( i ) { + case 0: + break; + default: + break Choose; + } + fallthru; + case 2: + i += 1; + } + + // computed goto + { + void *array[] = { &&foo, &&bar, &&hack }; + foo: bar: hack: + &&foo; + &&bar; + goto *array[i]; + } + +#if 0 + Q: if ( i > 5 ) { + i += 1; + break Q; + } else + i += 1; +#endif +} + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa LabelledExit.c" // +// End: // Index: src/tests/Makefile.am =================================================================== --- src/tests/Makefile.am (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Makefile.am (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,24 @@ +######################## -*- 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 -- +## +## Author : Peter A. Buhr +## Created On : Sun May 31 09:08:15 2015 +## Last Modified By : Peter A. Buhr +## Last Modified On : Mon Jan 25 22:31:42 2016 +## Update Count : 25 +############################################################################### + +# applies to both programs +CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2 +CC = @CFA_BINDIR@/cfa + +noinst_PROGRAMS = fstream_test vector_test avl_test # build but do not install +fstream_test_SOURCES = fstream_test.c +vector_test_SOURCES = vector_int.c array.c vector_test.c +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 Index: src/tests/Makefile.in =================================================================== --- src/tests/Makefile.in (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Makefile.in (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,662 @@ +# Makefile.in generated by automake 1.14.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +######################## -*- Mode: Makefile-Automake -*- ###################### +############################################################################### + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +noinst_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \ + avl_test$(EXEEXT) +subdir = src/tests +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/automake/depcomp +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +PROGRAMS = $(noinst_PROGRAMS) +am_avl_test_OBJECTS = avl_test.$(OBJEXT) avl0.$(OBJEXT) avl1.$(OBJEXT) \ + avl2.$(OBJEXT) avl3.$(OBJEXT) avl4.$(OBJEXT) \ + avl-private.$(OBJEXT) +avl_test_OBJECTS = $(am_avl_test_OBJECTS) +avl_test_LDADD = $(LDADD) +am_fstream_test_OBJECTS = fstream_test.$(OBJEXT) +fstream_test_OBJECTS = $(am_fstream_test_OBJECTS) +fstream_test_LDADD = $(LDADD) +am_vector_test_OBJECTS = vector_int.$(OBJEXT) array.$(OBJEXT) \ + vector_test.$(OBJEXT) +vector_test_OBJECTS = $(am_vector_test_OBJECTS) +vector_test_LDADD = $(LDADD) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/automake/depcomp +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 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ + $(vector_test_SOURCES) +DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \ + $(vector_test_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +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 +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BACKEND_CC = @BACKEND_CC@ +CC = @CFA_BINDIR@/cfa +CCDEPMODE = @CCDEPMODE@ +CFA_BACKEND_CC = @CFA_BACKEND_CC@ +CFA_BINDIR = @CFA_BINDIR@ +CFA_INCDIR = @CFA_INCDIR@ +CFA_LIBDIR = @CFA_LIBDIR@ +CFA_PREFIX = @CFA_PREFIX@ + +# applies to both programs +CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2 +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +fstream_test_SOURCES = fstream_test.c +vector_test_SOURCES = vector_int.c array.c vector_test.c +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 +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/tests/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/tests/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(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) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(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) + +avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES) + @rm -f avl_test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS) + +fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES) + @rm -f fstream_test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS) + +vector_test$(EXEEXT): $(vector_test_OBJECTS) $(vector_test_DEPENDENCIES) $(EXTRA_vector_test_DEPENDENCIES) + @rm -f vector_test$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(vector_test_OBJECTS) $(vector_test_LDADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl-private.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl3.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl4.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_int.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_test.Po@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +avl_test.o: avltree/avl_test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl_test.o -MD -MP -MF $(DEPDIR)/avl_test.Tpo -c -o avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl_test.Tpo $(DEPDIR)/avl_test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl_test.c' object='avl_test.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c + +avl_test.obj: avltree/avl_test.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl_test.obj -MD -MP -MF $(DEPDIR)/avl_test.Tpo -c -o avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl_test.Tpo $(DEPDIR)/avl_test.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl_test.c' object='avl_test.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi` + +avl0.o: avltree/avl0.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl0.o -MD -MP -MF $(DEPDIR)/avl0.Tpo -c -o avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl0.Tpo $(DEPDIR)/avl0.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl0.c' object='avl0.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c + +avl0.obj: avltree/avl0.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl0.obj -MD -MP -MF $(DEPDIR)/avl0.Tpo -c -o avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl0.Tpo $(DEPDIR)/avl0.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl0.c' object='avl0.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi` + +avl1.o: avltree/avl1.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl1.o -MD -MP -MF $(DEPDIR)/avl1.Tpo -c -o avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl1.Tpo $(DEPDIR)/avl1.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl1.c' object='avl1.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c + +avl1.obj: avltree/avl1.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl1.obj -MD -MP -MF $(DEPDIR)/avl1.Tpo -c -o avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl1.Tpo $(DEPDIR)/avl1.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl1.c' object='avl1.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi` + +avl2.o: avltree/avl2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl2.o -MD -MP -MF $(DEPDIR)/avl2.Tpo -c -o avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl2.Tpo $(DEPDIR)/avl2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl2.c' object='avl2.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c + +avl2.obj: avltree/avl2.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl2.obj -MD -MP -MF $(DEPDIR)/avl2.Tpo -c -o avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl2.Tpo $(DEPDIR)/avl2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl2.c' object='avl2.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi` + +avl3.o: avltree/avl3.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl3.o -MD -MP -MF $(DEPDIR)/avl3.Tpo -c -o avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl3.Tpo $(DEPDIR)/avl3.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl3.c' object='avl3.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c + +avl3.obj: avltree/avl3.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl3.obj -MD -MP -MF $(DEPDIR)/avl3.Tpo -c -o avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl3.Tpo $(DEPDIR)/avl3.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl3.c' object='avl3.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi` + +avl4.o: avltree/avl4.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl4.o -MD -MP -MF $(DEPDIR)/avl4.Tpo -c -o avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl4.Tpo $(DEPDIR)/avl4.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl4.c' object='avl4.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c + +avl4.obj: avltree/avl4.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl4.obj -MD -MP -MF $(DEPDIR)/avl4.Tpo -c -o avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl4.Tpo $(DEPDIR)/avl4.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl4.c' object='avl4.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi` + +avl-private.o: avltree/avl-private.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl-private.o -MD -MP -MF $(DEPDIR)/avl-private.Tpo -c -o avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl-private.Tpo $(DEPDIR)/avl-private.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl-private.c' object='avl-private.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c + +avl-private.obj: avltree/avl-private.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT avl-private.obj -MD -MP -MF $(DEPDIR)/avl-private.Tpo -c -o avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/avl-private.Tpo $(DEPDIR)/avl-private.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl-private.c' object='avl-private.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(PROGRAMS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-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) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-noinstPROGRAMS 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-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 + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Index: src/tests/NamedParmArg.c =================================================================== --- src/tests/NamedParmArg.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/NamedParmArg.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,14 @@ +int f1( int i = 3, int *j = 0 ) {} /* ANSI */ +[int, int ] f2( int i = 3, * int j = 0 ) {} /* CFA */ + +int main() { + f1(); /* identical calls */ + f1( 3 ); + f1( 3, ); + f1( 3, 0 ); + f1( 3, j : 0 ); + f1( j : 0, 3 ); + f1( i : 3, j : 0 ); + f1( j : 0, i : 3 ); + f1( [j, i] : f2() ); +} Index: src/tests/NumericConstants.c =================================================================== --- src/tests/NumericConstants.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/NumericConstants.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,54 @@ +int main() { + 1; /* decimal */ + 2_1; + 2_147_483_647; + 37LL; + 45ull; + 89llu; + 99LLu; + 56_lu; + 88_LLu; + +// 0; /* octal */ + 0u; + 0_3_77; + 0_377_ul; + + 0x1; /* hexadecimal */ + 0x1u; + 0xabL; + 0x_80000000; + 0x_fff; + 0x_ef3d_aa5c; + 0x_3LL; + + 3.; /* integral real */ + 3_100.; + 1_000_000.; + + 3.1; /* integral/fractional real */ + 3.141_592_654L; + 123_456.123_456; + + 3E1; /* integral/exponent real */ + 3_e1f; + 3_E1_1_F; + 3_E_11; + 3_e_+11; + 3_E_-11; + + 3.0E1; /* integral/fractional/exponent real */ + 3.0_E1L; + 3.0_e1_1; + 3.0_E_11_l; + 3.0_e_+11l; + 3.0_E_-11; + 123_456.123_456E-16; + + 0x_ff.ffp0; /* hex real */ + 0x_1.ffff_ffff_p_128_l; +} + +// Local Variables: // +// compile-command: "../../../bin/cfa -std=c99 NumericConstants.c" // +// End: // Index: src/tests/Operators.c =================================================================== --- src/tests/Operators.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Operators.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,27 @@ +int ?*?( int, int ); + +int ?()( int number1, int number2 ) { + return number1 * number2; +} + +int ?+?( int, int ); + +int ?=?( int *, int ); +struct accumulator { + int total; +}; + +char ?()( struct accumulator a, char number1, char number2 ); + +void f( void ) { + char a, b; + ?()( a, b ); + a(b); + a + b; + struct accumulator ?+?; // why not, eh? + a + b; +} + +// Local Variables: // +// tab-width: 4 // +// End: // Index: src/tests/Scope.c =================================================================== --- src/tests/Scope.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Scope.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,66 @@ +int x; +typedef double y; +typedef float t; +y z; +otype u = struct { int a; double b; }; +int f( int y ); +y q; + +y w( y y, u v ) { + otype x | { x t(u); }; + u u = y; + x z = t(u); +} + +y p; + +context has_u( otype z ) { + z u(z); +}; + +forall( otype t | has_u( t ) ) +y q( t the_t ) { + t y = u( the_t ); +} + +t f( y p ) { + int y; + typedef char x; + { + x y; + typedef x z; + { + z x; + typedef z y; + y z = x; + } + z x = y; + } + x q = y; +} + +t g( void ) { + typedef char x; + try { + some_func(); + } catch ( x x ) { + t y = x; + } + x z; +} + +y q( i ) /* K&R style */ + int i; +{ + switch ( i ) { + y q = i; + case 0: + return q; + default: + return i; + } +} + +// Local Variables: // +// tab-width: 4 // +// End: // Index: src/tests/ShortCircuit.c =================================================================== --- src/tests/ShortCircuit.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/ShortCircuit.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,20 @@ +int ?!=?( int, int ); +int ?!=?( float, float ); +int 0; + +void g( float ); +void g( int ); + +void f( int a ) { + int b; + float c; + g( a ? b : c ); + g( a && c ); + g( a || b ); +} + +//Dummy main +int main(int argc, char const *argv[]) +{ + return 0; +} Index: src/tests/Statement.c =================================================================== --- src/tests/Statement.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Statement.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,19 @@ +int ?=?( int *, int ); +int ?!=?( int, int ); +int 0; + +void f() { + int a; + struct { int b; } a; + if ( a ) { + while ( a ) { + int *b; + for ( b; a; b ) { + } + } + } +} + +// Local Variables: // +// tab-width: 4 // +// End: // Index: src/tests/StructMember.c =================================================================== --- src/tests/StructMember.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/StructMember.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,44 @@ +typedef int T; + +struct S { + int m1:3, m2:4; + int :2; + int :3, :4; + int m3; + int m4, m5, m6; + int *m7, *m8, *m9; + int (*m10)(); + int *(*m11)(int); + T T; + T (T); + +// Cforall extensions + + * int m12, m13; + * [ * int ] (int) m14; + int ; + int , , ; + int * , , ; + int *, *, *; + * int , , ; + int (*)(); + int (**)( int ); + T ; + +// errors + +// void f(void); +}; + +struct S s; + +union U { + [5] int m1; + int m2[5]; + * int m3; + int *m4; +} u; + +// Local Variables: // +// tab-width: 4 // +// End: // Index: src/tests/Subrange.c =================================================================== --- src/tests/Subrange.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/Subrange.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,63 @@ +// A small context defining the notion of an ordered otype. (The standard +// library should probably contain a context for this purpose.) +context ordered(otype T) { + int ? +#include // abs + +int main( void ) { + char ch = -65; + sout | "char\t\t\t" | ch | "\tabs " | abs( ch ) | endl; + sout | "signed int\t\t" | -65 | "\tabs" | abs( -65 ) | endl; + sout | "signed long int\t\t" | -65l | "\tabs" | abs( -65l ) | endl; + sout | "signed long long int\t" | -65ll | "\tabs" | abs( -65ll ) | endl; + sout | "float\t\t\t" | -65.0f | "\tabs" | abs( -65.0f ) | endl; + sout | "double\t\t\t" | -65.0 | "\tabs" | abs( -65.0 ) | endl; + sout | "long double\t\t" | -65.0l | "\tabs" | abs( -65.0l ) | endl; + sout | "float _Complex\t\t" | -65.0F-2.0iF | "\tabs" | abs( -65.0F-2.0iF ) | endl; + sout | "double _Complex\t\t" | -65.0D-2.0iD | "\tabs" | abs( -65.0D-2.0iD ) | endl; + sout | "long double _Complex\t" | -65.0L-2.0iL | "\tabs" | abs( -65.0L-2.0iL ) | endl; +} // main + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa abs.c" // +// End: // Index: src/tests/array.c =================================================================== --- src/tests/array.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/array.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,41 @@ +// +// 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. +// +// array.c -- +// +// Author : Richard C. Bilson +// Created On : Wed May 27 17:56:53 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Apr 27 17:21:52 2016 +// Update Count : 3 +// + +#include "array.h" + +/// forall( otype array_type, elt_type | bounded_array( array_type, elt_type ) ) +/// [ array_iterator begin, array_iterator end ] +/// get_iterators( array_type array ) +/// { +/// begin = 0; +/// end = last( array ); +/// } + +// The first element is always at index 0. +forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) +elt_type * begin( array_type * array ) { + return &array[ 0 ]; +} + +// The end iterator should point one past the last element. +forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) +elt_type * end( array_type * array ) { + return &array[ last( array ) ] + 1; +} + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa array.c" // +// End: // Index: src/tests/array.h =================================================================== --- src/tests/array.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/array.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,54 @@ +// +// 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. +// +// array.h -- +// +// Author : Richard C. Bilson +// Created On : Wed May 27 17:56:53 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Apr 27 17:26:04 2016 +// Update Count : 5 +// + +#ifndef ARRAY_H +#define ARRAY_H + +//#include + +// An array has contiguous elements accessible in any order using integer indicies. The first +// element has index 0. +trait array( otype array_type, otype elt_type ) { + lvalue elt_type ?[?]( array_type, int ); +}; + +// A bounded array is an array that carries its maximum index with it. +trait bounded_array( otype array_type, otype elt_type | array( array_type *, elt_type ) ) { + int last( array_type * ); +}; + +// implement iterator_for + +typedef int array_iterator; + +/// forall( otype array_type, elt_type | bounded_array( array_type, elt_type ) ) +/// [ array_iterator begin, array_iterator end ] get_iterators( array_type ); + + +// A bounded array can be iterated over by using a pointer to the element type. These functions +// return iterators corresponding to the first element and the one-past-the-end element, STL-style. +forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) +elt_type * begin( array_type * array ); + +// The end iterator should point one past the last element. +forall( otype array_type, otype elt_type | bounded_array( array_type, elt_type ) ) +elt_type * end( array_type * array ); + +#endif // ARRAY_H + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa array.c" // +// End: // Index: src/tests/ato.c =================================================================== --- src/tests/ato.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/ato.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,56 @@ +// -*- Mode: C -*- +// +// 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. +// +// ato.c -- +// +// Author : Peter A. Buhr +// Created On : Thu Feb 4 08:10:57 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Mon Feb 29 17:57:35 2016 +// Update Count : 44 +// + +#include +#include // ato, strto +extern "C" { +#include +#include +} + +int main( void ) { + int i = ato( "-123" ); + sout | i | "-123" | endl; + unsigned int ui = ato( "123" ); + sout | ui | "123" | endl; + long int li = ato( "-123" ); + sout | li | "-123" | endl; + unsigned long int uli = ato( "123" ); + sout | uli | "123" | endl; + long long int lli = ato( "-123" ); + sout | lli | "-123" | endl; + unsigned long long int ulli = ato( "123" ); + sout | ulli | "123" | endl; + float f = ato( "-123.456" ); + sout | f | "-123.456" | endl; + double d = ato( "-123.4567890123456" ); + sout | d | "-123.4567890123456" | endl; + long double ld = ato( "-123.45678901234567890123456789" ); + sout | ld | "-123.45678901234567890123456789" | endl; + float _Complex fc = ato( "-123.456-123.456i" ); + sout | fc | "-123.456-123.456i" | endl; + double _Complex dc = ato( "-123.4567890123456+123.4567890123456i" ); + sout | dc | "-123.4567890123456+123.4567890123456i" | endl; + long double _Complex ldc = ato( "123.45678901234567890123456789-123.45678901234567890123456789i" ); + sout | ldc | "123.45678901234567890123456789-123.45678901234567890123456789i" | endl; + long double _Complex ldc2 = ato( "123.45678901234-123.4567890i" ); + sout | ldc2 | "123.45678901234-123.4567890i" | endl; +} // main + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa ato.c" // +// End: // Index: src/tests/avltree/avl-private.c =================================================================== --- src/tests/avltree/avl-private.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl-private.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,134 @@ +#include "avl.h" +#include "avl-private.h" + +// AVL tree specific (internal) operations: +// rotateLeft, rotateRight, fix +// +// AVL tree enhanced height operation +// +// calcBalance is a simple computation of height(R) - height(L) + +// an AVL tree's height is easy to compute +// just follow path with the larger balance +forall(otype K | Comparable(K), otype V) +int height(tree(K, V) * t){ + int helper(tree(K, V) * t, int ht){ + if (empty(t)){ + return ht; + } else if (t->balance > 0){ + return helper(t->right, 1+ht); + } else { + // can traverse either branch to find the height + // of an AVL tree whose balance is 0 + return helper(t->left, 1+ht); + } + } + return helper(t, 0); +} + +forall(otype K | Comparable(K), otype V) +int calcBalance(tree(K, V) * t){ + int l = height(t->left); + int r = height(t->right); + t->balance = r-l; + return t->balance; +} + +// re-establish the link between parent and child +forall(otype K | Comparable(K), otype V) +void relinkToParent(tree(K, V) * t){ + tree(K, V) * parent = t->parent; // FIX ME!! + if (empty(t->parent)){ + return; + } else if (parent->key < t->key){ + parent->right = t; + } else { + parent->left = t; + } +} + +// rotate left from t +forall(otype K | Comparable(K), otype V) +tree(K, V) * rotateLeft(tree(K, V) * t){ + tree(K, V) * newRoot = t->right; + t->right = newRoot->left; + newRoot->left = t; + + // swap parents + newRoot->parent = t->parent; + t->parent = newRoot; + if (t->right != NULL) { + tree(K, V) * right = t->right; // FIX ME!! + right->parent = t; + } + // re-establish the link between newRoot and its parent + relinkToParent(newRoot); + return newRoot; +} + +// rotate right from t +forall(otype K | Comparable(K), otype V) +tree(K, V) * rotateRight(tree(K, V) * t){ + tree(K, V) * newRoot = t->left; + t->left = newRoot->right; + newRoot->right = t; + + // swap parents + newRoot->parent = t->parent; + t->parent = newRoot; + if (t->left != NULL){ + tree(K, V) * left = t->left; // FIX ME!! + left->parent = t; + } + // re-establish the link between newRoot and its parent + relinkToParent(newRoot); + return newRoot; +} + +// balances a node that has balance factor -2 or 2 +forall(otype K | Comparable(K), otype V) +tree(K, V) * fix(tree(K, V) * t){ + // ensure that t's balance factor is one of + // the appropriate values + assert(t->balance == 2 || t->balance == -2); + + if (t->balance == -2){ + tree(K, V) * left = t->left; // FIX ME!! + if (left->balance == 1){ + t->left = rotateLeft(t->left); + } + return rotateRight(t); + } else if (t->balance == 2){ + tree(K, V) * right = t->right; // FIX ME!! + if (right->balance == -1){ + t->right = rotateRight(t->right); + } + return rotateLeft(t); + } else { + // shouldn't ever get here + assert((int)0); + return t; + } +} + +// attempt to fix the tree, if necessary +forall(otype K | Comparable(K), otype V) +tree(K, V) * tryFix(tree(K, V) * t){ + int b = calcBalance(t); + + if (b == -2 || b == 2){ + t = fix(t); + } else { + assert(b == 0 || b == 1 || b == -1); + } + return t; +} + +// sets parent field of c to be p +forall(otype K | Comparable(K), otype V) +void setParent(tree(K, V) * c, tree(K, V) * p){ + if (! empty(c)){ + c->parent = p; + } +} + Index: src/tests/avltree/avl-private.h =================================================================== --- src/tests/avltree/avl-private.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl-private.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,17 @@ +#ifndef AVL_PRIVATE_H +#include "avl.h" + +// functions that really shouldn't be exposed, but are to reduce compilation time + +// attempt to fix the tree, if necessary +forall(otype K | Comparable(K), otype V) +tree(K, V) * tryFix(tree(K, V) * t); + +// sets parent field of c to be p +forall(otype K | Comparable(K), otype V) +void setParent(tree(K, V) * c, tree(K, V) * p); + +forall(otype K | Comparable(K), otype V) +int height(tree(K, V) * t); + +#endif Index: src/tests/avltree/avl.h =================================================================== --- src/tests/avltree/avl.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,108 @@ +#ifndef AVL_TREE_H +#define AVL_TREE_H + +extern "C" { +#define NULL 0 +void free(void *); +#define assert(cond) if (! (cond)) { printf("Assertion failed: (%s) at %s:%d\n", #cond, __FILE__, __LINE__); abort(); } +void abort(); +int printf(const char *, ...); +} + +// #include +// #include + +trait Comparable(otype T) { + int ??(T t1, T t2); + +forall(dtype T | { void ^?{}(T *); }) +void delete(T * x); + +// To-do: properly use height or balance factor +// Right now I'm recomputing the height for each +// node multiple times. It's Theta-log(n), but still.. + +// Balanced Binary Search Tree of void pointers; almost an AVL tree - +// just needs to make use of the balance factor properly +// Operations: +// ?{}, ^?{} +// create - allocate a new tree. Just a wrapper around malloc which also calls the tree constructor. +// find - search through the tree for the given key; return the associated value +// empty - return true if the tree is empty +// insert - insert node with key and value pair. Returns 0 on success +// remove - remove node with the given key, returns 0 on success, 1 on failure +// copy - deep copy of a tree +// for_each - applies the given function to every data element in the tree +// assumes that a non-zero return value is an error, will return +// the error code from func + +// temporary: need forward decl to get around typedef problem +forall(otype K | Comparable(K), otype V) +struct tree; + +forall(otype K | Comparable(K), otype V) +struct tree { + K key; + V value; + tree(K, V) * parent; + tree(K, V) * left; + tree(K, V) * right; + int balance; +}; + +forall(otype K | Comparable(K), otype V) +void ?{}(tree(K, V) *t, K key, V value); + +forall(otype K | Comparable(K), otype V) +void ^?{}(tree(K, V) * t); + +forall(otype K | Comparable(K), otype V) +tree(K, V) * create(K key, V value); + +forall(otype K | Comparable(K), otype V) +V * find(tree(K, V) * t, K key); + +forall(otype K | Comparable(K), otype V) +int empty(tree(K, V) * t); + +// returns the root of the tree +forall(otype K | Comparable(K), otype V) +int insert(tree(K, V) ** t, K key, V value); + +forall(otype K | Comparable(K), otype V) +int remove(tree(K, V) ** t, K key); + +forall(otype K | Comparable(K), otype V) +void copy(tree(K, V) * src, tree(K, V) ** ret); + +forall(otype K | Comparable(K), otype V) +void for_each(tree(K, V) * t, void (*func)(V)); + +// // Helper function to print trees +// forall(otype K | Comparable(K), otype V) +// void printTree(tree * t, int level){ +// if (empty(t)){ +// return; +// } + +// printTree(t->left, level+1); +// printf("key: %d, value: %s, level: %d\n", t->key, t->value, level); +// printTree(t->right, level+1); +// } + +// // inorder traversal of t +// // prints each key, followed by the value +// forall(otype K | Comparable(K), otype V) +// void printTree(tree(K, V) * t){ +// printTree(t, 0); +// } + + +#endif Index: src/tests/avltree/avl0.c =================================================================== --- src/tests/avltree/avl0.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl0.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,19 @@ +#include "avl.h" + +forall(otype T | Comparable(T)) +int ?==?(T t1, T t2) { + return !(t1 < t2) && !(t2 < t1); +} + +forall(otype T | Comparable(T)) +int ?>?(T t1, T t2) { + return t2 < t1; +} + +forall(dtype T | { void ^?{}(T *); }) +void delete(T * x) { + if (x) { + ^?{}(x); + free(x); + } +} Index: src/tests/avltree/avl1.c =================================================================== --- src/tests/avltree/avl1.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl1.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,51 @@ +#include "avl.h" +// #include "cwrap.h" + +extern "C" { + void * malloc(long int); +} + +forall(otype K | Comparable(K), otype V) +void ?{}(tree(K, V) *t, K key, V value){ + (&t->key) { key }; + (&t->value) { value }; + t->parent = NULL; + t->left = NULL; + t->right = NULL; + t->balance = 0; +} + +forall(otype K | Comparable(K), otype V) +void ^?{}(tree(K, V) * t){ + delete(t->left); + delete(t->right); + ^(&t->key){}; + ^(&t->value){}; +} + +forall(otype K | Comparable(K), otype V) +tree(K, V) * create(K key, V value) { + // infinite loop trying to resolve ... t = malloc(); + tree(K, V) * t = malloc(sizeof(tree(K,V))); + t { key, value }; + return t; +} + +// // Helper function to print trees +// forall(otype K | Comparable(K), otype V) +// void printTree(tree * t, int level){ +// if (empty(t)){ +// return; +// } + +// printTree(t->left, level+1); +// printf("key: %d, value: %s, level: %d\n", t->key, t->value, level); +// printTree(t->right, level+1); +// } + +// // inorder traversal of t +// // prints each key, followed by the value +// forall(otype K | Comparable(K), otype V) +// void printTree(tree(K, V) * t){ +// printTree(t, 0); +// } Index: src/tests/avltree/avl2.c =================================================================== --- src/tests/avltree/avl2.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl2.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,84 @@ +#include "avl.h" +#include "avl-private.h" + +forall(otype K | Comparable(K), otype V) +V * find(tree(K, V) * t, K key){ + if (empty(t)){ + return NULL; + } + + if (t->key == key){ + return &t->value; + } else if (t->key < key){ + return find(t->right, key); + } else { + // t->key > key + return find(t->left, key); + } +} + +forall(otype K | Comparable(K), otype V) +int empty(tree(K, V) * t){ + return t == NULL; +} + +// returns the root of the tree +forall(otype K | Comparable(K), otype V) +int insert(tree(K, V) ** t, K key, V value) { + // handles a non-empty tree + // problem if the following signature is used: tries to use an adapter to call helper, but shouldn't + // be necessary - seems to be a problem with helper's type variables not being renamed + // tree(K, V) * helper(tree(K, V) * t, K key, V value){ + tree(K, V) * helper(tree(K, V) * t){ + if (t->key == key){ + // ran into the same key - uh-oh + return NULL; + } else if (t->key < key){ + if (t->right == NULL){ + t->right = create(key, value); + tree(K, V) * right = t->right; // FIX ME! + right->parent = t; // !!!!!!! + return t->right; + } else { + return helper(t->right); + } + } else { + if (t->left == NULL){ + t->left = create(key, value); + tree(K, V) * left = t->left; // FIX ME! + left->parent = t; // !!!!!!! + return t->left; + } else { + return helper(t->left); + } + } + } + + if (empty(*t)){ + // be nice and return a new tree + *t = create(key, value); + return 0; + } + tree(K, V) * newTree = helper(*t); + if (newTree == NULL){ + // insert error handling code, only possibility + // currently is that the key already exists + return 99; + } + // move up the tree, updating balance factors + // if the balance factor is -1, 0, or 1 keep going + // if the balance factor is -2 or 2, call fix + while (newTree->parent != NULL){ // loop until newTree == NULL? + newTree = tryFix(newTree); + tree(K, V) * parent = newTree->parent; // FIX ME!! + assert(parent->left == newTree || + parent->right == newTree); + newTree = newTree->parent; + } + insert(t, key, value); + + // do it one more time - this is the root + newTree = tryFix(newTree); + *t = newTree; + return 0; +} Index: src/tests/avltree/avl3.c =================================================================== --- src/tests/avltree/avl3.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl3.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,117 @@ +#include "avl.h" +#include "avl-private.h" + +// from stdlib +forall(otype T) +void swap(T *, T *); + +// swaps the data within two tree nodes +forall(otype K | Comparable(K), otype V) +void node_swap(tree(K, V) * t, tree(K, V) * t2){ + swap(&t->key, &t2->key); + swap(&t->value, &t2->value); +} + +// go left as deep as possible from within the right subtree +forall(otype K | Comparable(K), otype V) +tree(K, V) * find_successor(tree(K, V) * t){ + tree(K, V) * find_successor_helper(tree(K, V) * t){ + // go left as deep as possible, return the last node + if (empty(t->left)){ + return t; + } else { + return find_successor_helper(t->left); + } + } + return find_successor_helper(t->right); +} + +// cleanup - don't want to deep delete, so set children to NULL first. +forall(otype K | Comparable(K), otype V) +void deleteSingleNode(tree(K, V) * t) { + t->left = NULL; + t->right = NULL; + deleteSingleNode(t); +} + +// does the actual remove operation once we've found the node in question +forall(otype K | Comparable(K), otype V) +tree(K, V) * remove_node(tree(K, V) * t){ + // is the node a leaf? + if (empty(t->left) && empty(t->right)){ + // yes, just delete this node + delete(t); + return NULL; + } else if (empty(t->left)){ + // if the left is empty, there is only one child -> move right up + node_swap(t, t->right); + tree(K, V) * tmp = t->right; + + // relink tree + t->left = tmp->left; + t->right = tmp->right; + + setParent(t->left, t); + setParent(t->right, t); + deleteSingleNode(tmp); + return t; + } else if (empty(t->right)){ + // if the right is empty, there is only one child -> move left up + node_swap(t, t->left); + tree(K, V) * tmp = t->left; + + // relink tree + t->left = tmp->left; + t->right = tmp->right; + + setParent(t->left, t); + setParent(t->right, t); + deleteSingleNode(tmp); + return t; + } else { + // swap with the successor + tree(K, V) * s = find_successor(t); + tree(K, V) * parent = s->parent; + + if (parent->left == s){ + parent->left = s->right; + } else { + assert(parent->right == s); + parent->right = s->right; + } + setParent(s->right, parent); + node_swap(t, s); + deleteSingleNode(s); + return t; + } +} + +// finds the node that needs to be removed +forall(otype K | Comparable(K), otype V) +tree(K, V) * remove_helper(tree(K, V) * t, K key, int * worked){ + if (empty(t)){ + // did not work because key was not found + // set the status variable and return + *worked = 1; + } else if (t->key == key) { + t = remove_node(t); + } else if (t->key < key){ + t->right = remove_helper(t->right, key, worked); + } else { + // t->key > key + t->left = remove_helper(t->left, key, worked); + } + // try to fix after deleting + if (! empty(t)) { + t = tryFix(t); + } + return t; +} + +forall(otype K | Comparable(K), otype V) +int remove(tree(K, V) ** t, K key){ + int worked = 0; + tree(K, V) * newTree = remove_helper(*t, key, &worked); + *t = newTree; + return worked; +} Index: src/tests/avltree/avl4.c =================================================================== --- src/tests/avltree/avl4.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl4.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,48 @@ +#include "avl.h" +#include "avl-private.h" + +// Perform a shallow copy of src, return the +// new tree in ret +forall(otype K | Comparable(K), otype V) +int copy(tree(K, V) * src, tree(K, V) ** ret){ + tree(K, V) * helper(tree(K, V) * t, int * worked){ + if (empty(t)){ + // given empty tree, return empty tree + return NULL; + } + + // otherwise, this is not an empty node, + // create a new node + tree(K, V) * newTree = create(t->key, t->value); + if (empty(newTree)) { + *worked = 1; + return NULL; + } + + // recursively copy the left and right branches + newTree->left = helper(t->left, worked); + newTree->right = helper(t->right, worked); + + setParent(newTree->left, newTree); + setParent(newTree->right, newTree); + return newTree; + } + + int worked = 0; + *ret = helper(src, &worked); + return worked; +} + +// Apply func to every value element in t, using an in order traversal +forall(otype K | Comparable(K), otype V) +void for_each(tree(K, V) * t, int (*func)(V)) { + if (t == NULL) { + return; + } + // recursively apply the function to the left, + // apply the function to this node, + // recursively apply the function to the right + for_each(t->left, func); + func(t->value); + for_each(t->right, func); +} Index: src/tests/avltree/avl_test.c =================================================================== --- src/tests/avltree/avl_test.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/avltree/avl_test.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,51 @@ +#include "avl.h" +#include "avl-private.h" + +extern "C" { + int printf(const char *, ...); + int strcmp(const char *, const char *); +} + +int main(){ + // operations: + // find(tree(K, V) *, K) + // int empty(tree(K, V) *); + // tree(K, V) * insert(tree(K, V) *, K, V); + // int remove(tree(K, V) **, K); + + // int -> int + tree(int, int) * imap = create(-1, 0); + insert(&imap, 12, 13); + insert(&imap, 2, 3); + assert( height(imap) == 2 ); + + printf("%d %d %d\n", *find(imap, 2), *find(imap, 12), *find(imap, -1)); + + remove(&imap, -1); + delete(imap); + + // int -> char * + tree(int, char *) * smap = create(-1, "baz"); + insert(&smap, 12, "bar"); + insert(&smap, 2, "foo"); + assert( height(smap) == 2 ); + + printf("%s %s %s\n", *find(smap, 2), *find(smap, 12), *find(smap, -1)); + + remove(&smap, -2); + delete(smap); + + // char* -> char* + int ? + +int main( void ) { + int nombre; + sout | "Entrez un nombre, s'il vous plaît:" | endl; + sin | &nombre; + sout | "Vous avez entré" | nombre | "stocké à l'adresse" | &nombre | endl; + sout | "nombre" | nombre | "est" + | (nombre > 0 ? "plus grand que" : nombre == 0 ? "égal à" : "moins de") + | "zéro" | endl; + + sout | "Entrez trois nombres, s'il vous plaît: " | endl; + int i, j, k; + sin | &i | &j | &k; + sout | "Vous avez entré" | "i:" | "" | i | "j:" | "" | j | "k:" | "" | k | endl; +} + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa fstream_test.c" // +// End: // Index: src/tests/io.c =================================================================== --- src/tests/io.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/io.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,113 @@ +// -*- Mode: C -*- +// +// 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. +// +// io.c -- +// +// Author : Peter A. Buhr +// Created On : Wed Mar 2 16:56:02 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed Jun 8 22:52:04 2016 +// Update Count : 30 +// + +#include + +int main() { + char c; // basic types + short int si; + unsigned short int usi; + int i; + unsigned int ui; + long int li; + unsigned long int uli; + long long int lli; + unsigned long long int ulli; + float f; + double d; + long double ld; + float _Complex fc; + double _Complex dc; + long double _Complex ldc; + char s1[10], s2[10]; + + int x = 3, y = 5, z = 7; + sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl; + sout | 1 | 2 | 3 | endl; + sout | '1' | '2' | '3' | endl; + sout | 1 | "" | 2 | "" | 3 | endl; + sout | endl; + + ifstream in; // create / open file + open( &in, "io.data", "r" ); + + &in | &c // character + | &si | &usi | &i | &ui | &li | &uli | &lli | &ulli // integral + | &f | &d | &ld // floating point + | &fc | &dc | &ldc // floating-point complex + | cstr( s1 ) | cstr( s2, 10 ); // C string, length unchecked and checked + + sout | c | ' ' | endl // character + | si | usi | i | ui | li | uli | lli | ulli | endl // integral + | f | d | ld | endl // floating point + | fc | dc | ldc | endl; // complex + sout | endl; + sout | f | "" | d | "" | ld | endl // floating point without separator + | sepDisable | fc | dc | ldc | sepEnable | endl // complex without separator + | sepOn | s1 | sepOff | s2 | endl // local separator removal + | s1 | "" | s2 | endl; // C string without separator + sout | endl; + + sepSet( sout, ", $" ); // change separator, maximum of 15 characters + sout | f | d | ld | endl // floating point without separator + | fc | dc | ldc | endl // complex without separator + | s1 | s2 | endl; + sout | endl; + sepSet( sout, " " ); + + sout + // opening delimiters + | "v(" | 27 + | "v[" | 27 + | "v{" | 27 + | "$" | 27 + | "£" | 27 + | "¥" | 27 + | "¡" | 27 + | "¿" | 27 + | "«" | 27 + | endl + // closing delimiters + | 25 | "," + | 25 | "." + | 25 | ":" + | 25 | ";" + | 25 | "!" + | 25 | "?" + | 25 | ")" + | 25 | "]" + | 25 | "}" + | 25 | "%" + | 25 | "¢" + | 25 | "»" + | endl + // opening-closing delimiters + | 25 | "'" | 27 + | 25 | "`" | 27 + | 25 | "\"" | 27 + | 25 | " " | 27 + | 25 | "\f" | 27 + | 25 | "\n" | 27 + | 25 | "\r" | 27 + | 25 | "\t" | 27 + | 25 | "\v" | 27 + | endl; +} + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa io.c" // +// End: // Index: src/tests/io.data =================================================================== --- src/tests/io.data (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/io.data (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,1 @@ +A 1 2 3 4 5 6 7 8 1.1 1.2 1.3 1.1+2.3 1.1-2.3 1.1-2.3 abc xyz Index: src/tests/limits.c =================================================================== --- src/tests/limits.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/limits.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,114 @@ +// +// 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. +// +// limits.c -- +// +// Author : Peter A. Buhr +// Created On : Tue May 10 20:44:20 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Tue May 10 20:45:28 2016 +// Update Count : 1 +// + +#include + +// Integral Constants + +short int m = MIN; +int m = MIN; +long int m = MIN; +long long int m = MIN; + +short int M = MAX; +unsigned short int M = MAX; +int M = MAX; +unsigned int M = MAX; +long int M = MAX; +unsigned long int M = MAX; +long long int M = MAX; +unsigned long long int M = MAX; + +// Floating-Point Constants + +float pi = PI; +float pi_2 = PI_2; +float pi_4 = PI_4; +float _1_pi = _1_PI; +float _2_pi = _2_PI; +float _2_sqrt_pi = _2_SQRT_PI; + +double pi = PI; +double pi_2 = PI_2; +double pi_4 = PI_4; +double _1_pi = _1_PI; +double _2_pi = _2_PI; +double _2_SQRT_pi = _2_SQRT_PI; + +long double pi = PI; +long double pi_2 = PI_2; +long double pi_4 = PI_4; +long double _1_pi = _1_PI; +long double _2_pi = _2_PI; +long double _2_sqrt_pi = _2_SQRT_PI; + +_Complex pi = PI; +_Complex pi_2 = PI_2; +_Complex pi_4 = PI_4; +_Complex _1_pi = _1_PI; +_Complex _2_pi = _2_PI; +_Complex _2_sqrt_pi = _2_SQRT_PI; + +long _Complex pi = PI; +long _Complex pi_2 = PI_2; +long _Complex pi_4 = PI_4; +long _Complex _1_pi = _1_PI; +long _Complex _2_pi = _2_PI; +long _Complex _2_sqrt_pi = _2_SQRT_PI; + +float e = E; +float log2_e = LOG2_E; +float log10_e = LOG10_E; +float ln_2 = LN_2; +float ln_10 = LN_10; +float sqrt_2 = SQRT_2; +float _1_sqrt_2 = _1_SQRT_2; + +double e = E; +double log2_e = LOG2_E; +double log10_e = LOG10_E; +double ln_2 = LN_2; +double ln_10 = LN_10; +double sqrt_2 = SQRT_2; +double _1_sqrt_2 = _1_SQRT_2; + +long double e = E; +long double log2_e = LOG2_E; +long double log10_e = LOG10_E; +long double ln_2 = LN_2; +long double ln_10 = LN_10; +long double sqrt_2 = SQRT_2; +long double _1_sqrt_2 = _1_SQRT_2; + +_Complex e = E; +_Complex log2_e = LOG2_E; +_Complex log10_e = LOG10_E; +_Complex ln_2 = LN_2; +_Complex ln_10 = LN_10; +_Complex sqrt_2 = SQRT_2; +_Complex _1_sqrt_2 = _1_SQRT_2; + +long _Complex e = E; +long _Complex log2_e = LOG2_E; +long _Complex log10_e = LOG10_E; +long _Complex ln_2 = LN_2; +long _Complex ln_10 = LN_10; +long _Complex sqrt_2 = SQRT_2; +long _Complex _1_sqrt_2 = _1_SQRT_2; + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa limits.c" // +// End: // Index: src/tests/math.c =================================================================== --- src/tests/math.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/math.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,144 @@ +// +// 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. +// +// math.c -- +// +// Author : Peter A. Buhr +// Created On : Fri Apr 22 14:59:21 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Sun Apr 24 13:24:20 2016 +// Update Count : 70 +// + +#include +#include + +int main( void ) { + float f; + double d; + long double l; + + sout | "fabs:" | fabs( -1.0F ) | fabs( -1.0D ) | fabs( -1.0L ) | cabs( -1.0F+1.0FI ) | cabs( -1.0D+1.0DI ) | cabs( -1.0DL+1.0LI ) | endl; + sout | "fmod:" | 5.0F % -2.0F | fmod( 5.0F, -2.0F ) | 5.0D % -2.0D | fmod( 5.0D, -2.0D ) | 5.0L % -2.0L | fmod( 5.0L, -2.0L ) | endl; + sout | "remainder:" | remainder( 2.0F, 3.0F ) | remainder( 2.0D, 3.0D ) | remainder( 2.0L, 3.0L ) | endl; + int quot; + f = remquo( 3.6F, 0.5F, " ); + sout | "remquo:" | quot | f; + d = remquo( 3.6D, 0.5F, " ); + sout | quot | d; + l = remquo( 3.6L, 0.5L, " ); + sout | quot | l | endl; + f = div( 3.6F, 0.5F, " ); + sout | "div:" | quot | f; + d = div( 3.6D, 0.5F, " ); + sout | quot | d; + l = div( 3.6L, 0.5L, " ); + sout | quot | l | endl; + sout | "fma:" | fma( 3.0F, -1.0F, 1.0F ) | fma( 3.0D, -1.0D, 1.0D ) | fma( 3.0L, -1.0L, , 1.0L ) | endl; + sout | "fdim:" | fdim( 1.0F, -1.0F ) | fdim( 1.0D, -1.0D ) | fdim( 1.0L, -1.0L ) | endl; + sout | "nan:" | (float)nan( "" ) | (double)nan( "" ) | (long double)nan( "" ) | endl; + + //---------------------- Exponential ---------------------- + + sout | "exp:" | exp( 1.0F ) | exp( 1.0D ) | exp( 1.0L ) | exp( 1.0F+1.0FI ) | exp( 1.0D+1.0DI ) | exp( 1.0DL+1.0LI ) | endl; + sout | "exp2:" | exp2( 1.0F ) | exp2( 1.0D ) | exp2( 1.0L ) | endl; + sout | "expm1:" | expm1( 1.0F ) | expm1( 1.0D ) | expm1( 1.0L ) | endl; + sout | "log:" | log( 1.0F ) | log( 1.0D ) | log( 1.0L ) | log( 1.0F+1.0FI ) | log( 1.0D+1.0DI ) | log( 1.0DL+1.0LI ) | endl; + sout | "log2:" | log2( 8.0F ) | log2( 8.0D ) | log2( 8.0L ) | endl; + sout | "log10:" | log10( 100.0F ) | log10( 100.0D ) | log10( 100.0L ) | endl; + sout | "log1p:" | log1p( 1.0F ) | log1p( 1.0D ) | log1p( 1.0L ) | endl; + sout | "ilogb:" | ilogb( 1.0F ) | ilogb( 1.0D ) | ilogb( 1.0L ) | endl; + sout | "logb:" | logb( 8.0F ) | logb( 8.0D ) | logb( 8.0L ) | endl; + + //---------------------- Power ---------------------- + + sout | "sqrt:" | sqrt( 1.0F ) | sqrt( 1.0D ) | sqrt( 1.0L ) | sqrt( 1.0F+1.0FI ) | sqrt( 1.0D+1.0DI ) | sqrt( 1.0DL+1.0LI ) | endl; + sout | "cbrt:" | cbrt( 27.0F ) | cbrt( 27.0D ) | cbrt( 27.0L ) | endl; + sout | "hypot:" | hypot( 1.0F, -1.0F ) | hypot( 1.0D, -1.0D ) | hypot( 1.0L, -1.0L ) | endl; + sout | "pow:" | pow( 1.0F, 1.0F ) | pow( 1.0D, 1.0D ) | pow( 1.0L, 1.0L ) | pow( 1.0F+1.0FI, 1.0F+1.0FI ) | pow( 1.0D+1.0DI, 1.0D+1.0DI ) | pow( 1.0DL+1.0LI, 1.0DL+1.0LI ) | endl; + + //---------------------- Trigonometric ---------------------- + + sout | "sin:" | sin( 1.0F ) | sin( 1.0D ) | sin( 1.0L ) | sin( 1.0F+1.0FI ) | sin( 1.0D+1.0DI ) | sin( 1.0DL+1.0LI ) | endl; + sout | "cos:" | cos( 1.0F ) | cos( 1.0D ) | cos( 1.0L ) | cos( 1.0F+1.0FI ) | cos( 1.0D+1.0DI ) | cos( 1.0DL+1.0LI ) | endl; + sout | "tan:" | tan( 1.0F ) | tan( 1.0D ) | tan( 1.0L ) | tan( 1.0F+1.0FI ) | tan( 1.0D+1.0DI ) | tan( 1.0DL+1.0LI ) | endl; + sout | "asin:" | asin( 1.0F ) | asin( 1.0D ) | asin( 1.0L ) | asin( 1.0F+1.0FI ) | asin( 1.0D+1.0DI ) | asin( 1.0DL+1.0LI ) | endl; + sout | "acos:" | acos( 1.0F ) | acos( 1.0D ) | acos( 1.0L ) | acos( 1.0F+1.0FI ) | acos( 1.0D+1.0DI ) | acos( 1.0DL+1.0LI ) | endl; + sout | "atan:" | atan( 1.0F ) | atan( 1.0D ) | atan( 1.0L ) | atan( 1.0F+1.0FI ) | atan( 1.0D+1.0DI ) | atan( 1.0DL+1.0LI ) | endl; + sout | "atan2:" | atan2( 1.0F, 1.0F ) | atan2( 1.0D, 1.0D ) | atan2( 1.0L, 1.0L ); + sout | "atan:" | atan( 1.0F, 1.0F ) | atan( 1.0D, 1.0D ) | atan( 1.0L, 1.0L ); + + //---------------------- Hyperbolic ---------------------- + + sout | "sinh:" | sinh( 1.0F ) | sinh( 1.0D ) | sinh( 1.0L ) | sinh( 1.0F+1.0FI ) | sinh( 1.0D+1.0DI ) | sinh( 1.0DL+1.0LI ) | endl; + sout | "cosh:" | cosh( 1.0F ) | cosh( 1.0D ) | cosh( 1.0L ) | cosh( 1.0F+1.0FI ) | cosh( 1.0D+1.0DI ) | cosh( 1.0DL+1.0LI ) | endl; + sout | "tanh:" | tanh( 1.0F ) | tanh( 1.0D ) | tanh( 1.0L ) | tanh( 1.0F+1.0FI ) | tanh( 1.0D+1.0DI ) | tanh( 1.0DL+1.0LI ) | endl; + sout | "acosh:" | acosh( 1.0F ) | acosh( 1.0D ) | acosh( 1.0L ) | acosh( 1.0F+1.0FI ) | acosh( 1.0D+1.0DI ) | acosh( 1.0DL+1.0LI ) | endl; + sout | "asinh:" | asinh( 1.0F ) | asinh( 1.0D ) | asinh( 1.0L ) | asinh( 1.0F+1.0FI ) | asinh( 1.0D+1.0DI ) | asinh( 1.0DL+1.0LI ) | endl; + sout | "atanh:" | atanh( 1.0F ) | atanh( 1.0D ) | atanh( 1.0L ) | atanh( 1.0F+1.0FI ) | atanh( 1.0D+1.0DI ) | atanh( 1.0DL+1.0LI ) | endl; + + //---------------------- Error / Gamma ---------------------- + + sout | "erf:" | erf( 1.0F ) | erf( 1.0D ) | erf( 1.0L ) | endl; + sout | "erfc:" | erfc( 1.0F ) | erfc( 1.0D ) | erfc( 1.0L ) | endl; + sout | "lgamma:" | lgamma( 4.0F ) | lgamma( 4.0D ) | lgamma( 4.0L ) | endl; + int sign; + f = lgamma( 4.0F, &sign ); + sout | "lgamma:" | f | sign; + d = lgamma( 4.0D, &sign ); + sout | d | sign; + l = lgamma( 4.0L, &sign ); + sout | l | sign | endl; + sout | "tgamma:" | tgamma( 4.0F ) | tgamma( 4.0D ) | tgamma( 4.0L ) | endl; + + //---------------------- Nearest Integer ---------------------- + + sout | "floor:" | floor( 1.2F ) | floor( 1.2D ) | floor( 1.2L ) | endl; + sout | "ceil:" | ceil( 1.6F ) | ceil( 1.6D ) | ceil( 1.6L ) | endl; + sout | "trunc:" | trunc( 3.5F ) | trunc( 3.5D ) | trunc( 3.5L ) | endl; + sout | "rint:" | (float)rint( 1.5F ) | (double)rint( 1.5D ) | (long double)rint( 1.5L ) | endl; + sout | "rint:" | (long int)rint( 1.5F ) | (long int)rint( 1.5D ) | (long int)rint( 1.5L ) | endl; + sout | "rint:" | (long long int)rint( 1.5F ) | (long long int)rint( 1.5D ) | (long long int)rint( 1.5L ) | endl; + sout | "lrint:" | lrint( 1.5F ) | lrint( 1.5D ) | lrint( 1.5L ) | endl; + sout | "llrint:" | llrint( 1.5F ) | llrint( 1.5D ) | llrint( 1.5L ) | endl; + sout | "nearbyint:" | nearbyint( 3.5F ) | nearbyint( 3.5D ) | nearbyint( 3.5L ) | endl; + sout | "round:" | (float)round( 1.5F ) | (double)round( 1.5D ) | (long double)round( 1.5L ) | endl; + sout | "round:" | (long int)round( 1.5F ) | (long int)round( 1.5D ) | (long int)round( 1.5L ) | endl; + sout | "round:" | (long long int)round( 1.5F ) | (long long int)round( 1.5D ) | (long long int)round( 1.5L ) | endl; + sout | "lround:" | lround( 1.5F ) | lround( 1.5D ) | lround( 1.5L ) | endl; + sout | "llround:" | llround( 1.5F ) | llround( 1.5D ) | llround( 1.5L ) | endl; + + //---------------------- Manipulation ---------------------- + + sout | "copysign:" | copysign( 1.0F, -1.0F ) | copysign( 1.0D, -1.0D ) | copysign( 1.0L, -1.0L ) | endl; + int exp; + f = frexp( 4.0F, &exp ); + sout | "frexp:" | f | exp; + d = frexp( 4.0D, &exp ); + sout | d | exp; + l = frexp( 4.0L, &exp ); + sout | l | exp | endl; + sout | "ldexp:" | ldexp( 2.0F, 2 ) | ldexp( 2.0D, 2 ) | ldexp( 2.0L, 2 ) | endl; + float fi; + double di; + long double ldi; + f = modf( 2.3F, &fi ); + sout | "modf:" | fi | f; + d = modf( 2.3D, &di ); + sout | di | d; + l = modf( 2.3L, &ldi ); + sout | ldi | l; + sout | "nextafter:" | nextafter( 2.0F, 3.0F ) | nextafter( 2.0D, 3.0D ) | nextafter( 2.0L, 3.0L ) | endl; + sout | "nexttoward:" | nexttoward( 2.0F, 3.0F ) | nexttoward( 2.0D, 3.0D ) | nexttoward( 2.0L, 3.0L ) | endl; + + sout | "scalbn:" | scalbn( 2.0F, 3 ) | scalbn( 2.0D, 3 ) | scalbn( 2.0L, 3 ) | endl; + sout | "scalbln:" | scalbln( 2.0F, 3L ) | scalbln( 2.0D, 3L ) | scalbln( 2.0L, 3L ) | endl; +} // main + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa math.c" // +// End: // Index: src/tests/minmax.c =================================================================== --- src/tests/minmax.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/minmax.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,52 @@ +// +// 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. +// +// minmax.c -- +// +// Author : Richard C. Bilson +// Created On : Wed May 27 17:56:53 2015 +// Last Modified By : Peter A. Buhr +// Last Modified On : Mon Feb 29 23:45:16 2016 +// Update Count : 49 +// + +#include +#include // min, max + +int main( void ) { + // char does not have less or greater than. + int ??( char op1, char op2 ) { return (int)op1 > (int)op2; } + + sout | "char\t\t\t" | 'z' | ' ' | 'a' | "\tmin " | min( 'z', 'a' ) | endl; + sout | "signed int\t\t" | 4 | 3 | "\tmin" | min( 4, 3 ) | endl; + sout | "unsigned int\t\t" | 4u | 3u | "\tmin" | min( 4u, 3u ) | endl; + sout | "signed long int\t\t" | 4l | 3l | "\tmin" | min( 4l, 3l ) | endl; + sout | "unsigned long int\t" | 4ul | 3ul | "\tmin" | min( 4ul, 3ul ) | endl; + sout | "signed long long int\t" | 4ll | 3ll | "\tmin" | min( 4ll, 3ll ) | endl; + sout | "unsigned long long int\t" | 4ull | 3ull | "\tmin" | min( 4ull, 3ull ) | endl; + sout | "float\t\t\t" | 4.0f | 3.1f | "\tmin" | min( 4.0f, 3.1f ) | endl; + sout | "double\t\t\t" | 4.0 | 3.1 | "\tmin" | min( 4.0, 3.1 ) | endl; + sout | "long double\t\t" | 4.0l | 3.1l | "\tmin" | min( 4.0l, 3.1l ) | endl; + + sout | endl; + + sout | "char\t\t\t" | 'z' | ' ' | 'a' | "\tmax " | max( 'z', 'a' ) | endl; + sout | "signed int\t\t" | 4 | 3 | "\tmax" | max( 4, 3 ) | endl; + sout | "unsigned int\t\t" | 4u | 3u | "\tmax" | max( 4u, 3u ) | endl; + sout | "signed long int\t\t" | 4l | 3l | "\tmax" | max( 4l, 3l ) | endl; + sout | "unsigned long int\t" | 4ul | 3ul | "\tmax" | max( 4ul, 3ul ) | endl; + sout | "signed long long int\t" | 4ll | 3ll | "\tmax" | max( 4ll, 3ll ) | endl; + sout | "unsigned long long int\t" | 4ull | 3ull | "\tmax" | max( 4ull, 3ull ) | endl; + sout | "float\t\t\t" | 4.0f | 3.1f | "\tmax" | max( 4.0f, 3.1f ) | endl; + sout | "double\t\t\t" | 4.0 | 3.1 | "\tmax" | max( 4.0, 3.1 ) | endl; + sout | "long double\t\t" | 4.0l | 3.1l | "\tmax" | max( 4.0l, 3.1l ) | endl; +} // main + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa minmax.c" // +// End: // Index: src/tests/poly-bench.c =================================================================== --- src/tests/poly-bench.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/poly-bench.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,207 @@ +// +// 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. +// +// poly-bench.cc -- +// +// Author : Aaron Moss +// Created On : Sat May 16 07:26:30 2015 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed May 27 18:25:19 2015 +// Update Count : 5 +// + +extern "C" { +#include +//#include "my_time.h" +} + +#define N 200000000 + +struct ipoint { + int x; + int y; +}; + +struct ipoint ?+?(struct ipoint a, struct ipoint b) { + struct ipoint r; + r.x = a.x + b.x; + r.y = a.y + b.y; + return r; +} + +struct ipoint ?-?(struct ipoint a, struct ipoint b) { + struct ipoint r; + r.x = a.x - b.x; + r.y = a.y - b.y; + return r; +} + +struct ipoint ?*?(struct ipoint a, struct ipoint b) { + struct ipoint r; + r.x = a.x * b.x; + r.y = a.y * b.y; + return r; +} + +struct dpoint { + double x; + double y; +}; + +struct dpoint ?+?(struct dpoint a, struct dpoint b) { + struct dpoint r; + r.x = a.x + b.x; + r.y = a.y + b.y; + return r; +} + +struct dpoint ?-?(struct dpoint a, struct dpoint b) { + struct dpoint r; + r.x = a.x - b.x; + r.y = a.y - b.y; + return r; +} + +struct dpoint ?*?(struct dpoint a, struct dpoint b) { + struct dpoint r; + r.x = a.x * b.x; + r.y = a.y * b.y; + return r; +} + +int a2b2_mono_int(int a, int b) { + return (a - b)*(a + b); +} + +double a2b2_mono_double(double a, double b) { + return (a - b)*(a + b); +} + +struct ipoint a2b2_mono_ipoint(struct ipoint a, struct ipoint b) { + return (a - b)*(a + b); +} + +struct dpoint a2b2_mono_dpoint(struct dpoint a, struct dpoint b) { + return (a - b)*(a + b); +} + +forall(type T | { T ?+?(T,T); T ?-?(T,T); T ?*?(T,T); }) +T a2b2_poly(T a, T b) { + return (a - b)*(a + b); +} + +typedef int clock_t; +long ms_between(clock_t start, clock_t end) { +// return (end - start) / (CLOCKS_PER_SEC / 1000); + return 0; +} +int clock() { return 3; } + +int main(int argc, char** argv) { + clock_t start, end; + int i; + + int a, b; + double c, d; + struct ipoint p, q; + struct dpoint r, s; + + printf("\n## a^2-b^2 ##\n"); + + a = 5, b = 3; + start = clock(); + for (i = 0; i < N/2; ++i) { + a = a2b2_mono_int(a, b); + b = a2b2_mono_int(b, a); + } + end = clock(); + printf("mono_int: %7ld [%d,%d]\n", ms_between(start, end), a, b); + + a = 5, b = 3; + start = clock(); + for (i = 0; i < N/2; ++i) { + a = a2b2_poly(a, b); + b = a2b2_poly(b, a); + } + end = clock(); + printf("poly_int: %7ld [%d,%d]\n", ms_between(start, end), a, b); + +/* { + a = 5, b = 3; + // below doesn't actually work; a2b2_poly isn't actually assigned, just declared + * [int] (int, int) a2b2_poly = a2b2_mono_int; + start = clock(); + for (i = 0; i < N/2; ++i) { +// printf("\t[%d,%d]\n", a, b); +a = a2b2_poly(a, b); +// printf("\t[%d,%d]\n", a, b); +b = a2b2_poly(b, a); +} +end = clock(); +printf("spec_int: %7ld [%d,%d]\n", ms_between(start, end), a, b); +} +*/ + c = 5.0, d = 3.0; + start = clock(); + for (i = 0; i < N/2; ++i) { + c = a2b2_mono_double(c, d); + d = a2b2_mono_double(d, c); + } + end = clock(); + printf("mono_double:%7ld [%f,%f]\n", ms_between(start, end), c, d); + + c = 5.0, d = 3.0; + start = clock(); + for (i = 0; i < N/2; ++i) { + c = a2b2_poly(c, d); + d = a2b2_poly(d, c); + } + end = clock(); + printf("poly_double:%7ld [%f,%f]\n", ms_between(start, end), c, d); + + p.x = 5, p.y = 5, q.x = 3, q.y = 3; + start = clock(); + for (i = 0; i < N/2; ++i) { + p = a2b2_mono_ipoint(p, q); + q = a2b2_mono_ipoint(q, p); + } + end = clock(); + printf("mono_ipoint:%7ld [(%d,%d),(%d,%d)]\n", ms_between(start, end), p.x, p.y, q.x, q.y); + + p.x = 5, p.y = 5, q.x = 3, q.y = 3; + start = clock(); + for (i = 0; i < N/2; ++i) { + p = a2b2_poly(p, q); + q = a2b2_poly(q, p); + } + end = clock(); + printf("poly_ipoint:%7ld [(%d,%d),(%d,%d)]\n", ms_between(start, end), p.x, p.y, q.x, q.y); + + r.x = 5.0, r.y = 5.0, s.x = 3.0, s.y = 3.0; + start = clock(); + for (i = 0; i < N/2; ++i) { + r = a2b2_mono_dpoint(r, s); + s = a2b2_mono_dpoint(s, r); + } + end = clock(); + printf("mono_dpoint:%7ld [(%f,%f),(%f,%f)]\n", ms_between(start, end), r.x, r.y, s.x, s.y); + + r.x = 5.0, r.y = 5.0, s.x = 3.0, s.y = 3.0; + start = clock(); + for (i = 0; i < N/2; ++i) { + r = a2b2_poly(r, s); + s = a2b2_poly(s, r); + } + end = clock(); + printf("poly_dpoint:%7ld [(%f,%f),(%f,%f)]\n", ms_between(start, end), r.x, r.y, s.x, s.y); + + return 0; +} + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa poly-bench.c" // +// End: // Index: src/tests/rational.c =================================================================== --- src/tests/rational.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/rational.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,87 @@ +// -*- Mode: C -*- +// +// 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. +// +// rational.c -- test rational number package +// +// Author : Peter A. Buhr +// Created On : Mon Mar 28 08:43:12 2016 +// Last Modified By : Peter A. Buhr +// Last Modified On : Wed May 4 14:19:36 2016 +// Update Count : 24 +// + +#include +#include +#include + +int main() { + sout | "constructor" | endl; + Rational a = { 3 }, b = { 4 }, c; + sout | a | b | c | endl; + a = (Rational){ 4, 8 }; + b = (Rational){ 5, 7 }; + sout | a | b | endl; + a = (Rational){ -2, -3 }; + b = (Rational){ 3, -2 }; + sout | a | b | endl; + a = (Rational){ -2, 3 }; + b = (Rational){ 3, 2 }; + sout | a | b | endl; + + sout | "logical" | endl; + a = (Rational){ -2 }; + b = (Rational){ -3, 2 }; + sout | a | b | endl; + sout | a == 1 | endl; + sout | a != b | endl; + sout | a < b | endl; + sout | a <= b | endl; + sout | a > b | endl; + sout | a >= b | endl; + + sout | "arithmetic" | endl; + sout | a | b | endl; + sout | a + b | endl; + sout | a - b | endl; + sout | a * b | endl; + sout | a / b | endl; + + sout | "conversion" | endl; + a = (Rational){ 3, 4 }; + sout | widen( a ) | endl; + a = (Rational){ 1, 7 }; + sout | widen( a ) | endl; + a = (Rational){ 355, 113 }; + sout | widen( a ) | endl; + sout | narrow( 0.75, 4 ) | endl; + sout | narrow( 0.14285714285714, 16 ) | endl; + sout | narrow( 3.14159265358979, 256 ) | endl; + + Rational x = { 1, 2 }, y = { 2 }; + sout | x - y | endl; + sout | x > y | endl; + sout | x | numerator( x, 2 ) | x | endl; + sout | y | denominator( y, -2 ) | y | endl; + + Rational z = { 0, 5 }; + sout | z | endl; + + sout | x | numerator( x, 0 ) | x | endl; + + x = (Rational){ 1, MAX } + (Rational){ 1, MAX }; + sout | x | endl; + x = (Rational){ 3, MAX } + (Rational){ 2, MAX }; + sout | x | endl; + + sin | &a | &b; + sout | a | b | endl; +} // main + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa rational.c" // +// End: // Index: src/tests/runTests.sh =================================================================== --- src/tests/runTests.sh (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/runTests.sh (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,65 @@ +#!/bin/bash + +############################################################################## +# +# 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. +# +# Runs integration tests for cfa-cc. +# +# Output of test run will be copied into $logfile (default: tests/log.txt). +# Build failures for tests will be placed in tests/$test.make.txt, incorrect +# output in tests/$test.run.txt. +# +# Author : Aaron B. Moss +# Created On : Mon Nov 23 14:19:00 2015 +# Last Modified By : Aaron B. Moss +# Last Modified On : Mon Nov 23 14:19:00 2015 +# Update Count : 1 +# +############################################################################## + +# list of tests to run; +# Should be a make target for each test that generates an executable in the +# current directory named the same; should also be an input file +# tests/$test.in.txt and expected output tests/$test.out.txt +tests="vector_test avl_test" + +# log file for test output; +# reset at the beginning of each run +logfile=tests/log.txt +touch $logfile && rm $logfile + +# clean existing build artifacts before run +make clean > /dev/null 2>&1 + +ret_val=0 + +for test in $tests; do + echo -n " $test" | tee -a $logfile + + # build, skipping to next test on error + if ! make -j 8 $test > tests/$test.make.txt 2>&1; then + ret_val=1 + echo -e "\tFAILED with build error:" | tee -a $logfile + cat tests/$test.make.txt | tee -a $logfile + continue + fi + rm tests/$test.make.txt + + # run, testing against expected output + ./$test < tests/$test.in.txt > tests/$test.run.txt 2>&1 + if ! diff tests/$test.out.txt tests/$test.run.txt > tests/$test.diff.txt; then + ret_val=1 + echo -e "\tFAILED with output mismatch:" | tee -a $logfile + cat tests/$test.diff.txt | tee -a $logfile + continue + fi + rm tests/$test.run.txt tests/$test.diff.txt ./$test + + echo -e "\tPASSED" | tee -a $logfile +done + +exit $((ret_val)) Index: src/tests/swap.c =================================================================== --- src/tests/swap.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/swap.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,95 @@ +// +// 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. +// +// swap.c -- +// +// Author : Richard C. Bilson +// Created On : Wed May 27 17:56:53 2015 +// Last Modified By : Peter A. Buhr +// Last Modified On : Thu Apr 21 08:10:41 2016 +// Update Count : 69 +// + +#include +#include // swap + +int main( void ) { + char c1 = 'a', c2 = 'b'; + sout | "char\t\t\t" | c1 | ' ' | c2 | "\t\t\tswap "; + swap( &c1, &c2 ); + sout | '\t' | c1 | ' ' | c2 | endl; + + signed int i1 = -1, i2 = -2; + sout | "signed int\t\t" | i1 | i2 | "\t\t\tswap "; + swap( &i1, &i2 ); + sout | '\t' | i1 | i2 | endl; + + unsigned int ui1 = 1, ui2 = 2; + sout | "unsigned int\t\t" | ui1 | ui2 | "\t\t\tswap "; + swap( &ui1, &ui2 ); + sout | '\t' | ui1 | ui2 | endl; + + signed long int li1 = -1, li2 = -2; + sout | "signed long int\t\t" | li1 | li2 | "\t\t\tswap "; + swap( &li1, &li2 ); + sout | '\t' | li1 | li2 | endl; + + unsigned long int uli1 = 1, uli2 = 2; + sout | "unsigned long int\t" | uli1 | uli2 | "\t\t\tswap "; + swap( &uli1, &uli2 ); + sout | '\t' | uli1 | uli2 | endl; + + signed long long int lli1 = -1, lli2 = -2; + sout | "signed long long int\t" | lli1 | lli2 | "\t\t\tswap "; + swap( &lli1, &lli2 ); + sout | '\t' | lli1 | lli2 | endl; + + unsigned long long int ulli1 = 1, ulli2 = 2; + sout | "unsigned long long int\t" | ulli1 | ulli2 | "\t\t\tswap "; + swap( &ulli1, &ulli2 ); + sout | '\t' | ulli1 | ulli2 | endl; + + float f1 = 1.5, f2 = 2.5; + sout | "float\t\t\t" | f1 | f2 | "\t\t\tswap "; + swap( &f1, &f2 ); + sout | '\t' | f1 | f2 | endl; + + double d1 = 1.5, d2 = 2.5; + sout | "double\t\t\t" | d1 | d2 | "\t\t\tswap "; + swap( &d1, &d2 ); + sout | '\t' | d1 | d2 | endl; + + long double ld1 = 1.5, ld2 = 2.5; + sout | "long double\t\t" | ld1 | ld2 | "\t\t\tswap "; + swap( &ld1, &ld2 ); + sout | '\t' | ld1 | ld2 | endl; + + float _Complex fc1 = 1.5f+1.5if, fc2 = 2.5f+2.5if; + sout | "float _Complex\t\t" | fc1 | fc2 | "\tswap "; + swap( &fc1, &fc2 ); + sout | '\t' | fc1 | fc2 | endl; + + double _Complex dc1 = 1.5d+1.5id, dc2 = 2.5d+2.5id; + sout | "double _Complex\t\t" | dc1 | dc2 | "\tswap "; + swap( &dc1, &dc2 ); + sout | '\t' | dc1 | dc2 | endl; + + long double _Complex ldc1 = 1.5d+1.5il, ldc2 = 2.5d+2.5il; + sout | "long double _Complex\t" | ldc1 | ldc2 | "\tswap "; + swap( &ldc1, &ldc2 ); + sout | '\t' | ldc1 | ldc2 | endl; + + struct S { int i, j; } s1 = { 1, 2 }, s2 = { 2, 1 }; + ofstream * ?|?( ofstream * os, S s ) { return os | s.i | s.j; } + sout | "struct S\t\t" | s1 | "," | s2 | "\t\tswap "; + swap( &s1, &s2 ); + sout | '\t' | s1 | "," | s2 | endl; +} // main + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa swap.c" // +// End: // Index: src/tests/tests/avl_test.make.txt =================================================================== --- src/tests/tests/avl_test.make.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/tests/avl_test.make.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,1 @@ +make: *** No rule to make target `avl_test'. Stop. Index: src/tests/tests/avl_test.out.txt =================================================================== --- src/tests/tests/avl_test.out.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/tests/avl_test.out.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,3 @@ +3 13 0 +foo bar baz +world bar cheese Index: src/tests/tests/log.txt =================================================================== --- src/tests/tests/log.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/tests/log.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,305 @@ + vector_test FAILED with build error: +cc vector_test.c -o vector_test +In file included from /usr/local/include/iostream:19:0, + from /usr/local/include/fstream:19, + from vector_test.c:16: +/usr/local/include/iterator:20:1: error: unknown type name 'trait' + trait iterator( otype iterator_type, otype elt_type ) { + ^ +/usr/local/include/iterator:20:17: error: unknown type name 'otype' + trait iterator( otype iterator_type, otype elt_type ) { + ^ +/usr/local/include/iterator:20:38: error: unknown type name 'otype' + trait iterator( otype iterator_type, otype elt_type ) { + ^ +/usr/local/include/iterator:34:1: error: unknown type name 'trait' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:34:21: error: unknown type name 'otype' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:34:42: error: unknown type name 'otype' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:34:65: error: unknown type name 'otype' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:40:9: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +/usr/local/include/iterator:40:30: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +/usr/local/include/iterator:43:9: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +/usr/local/include/iterator:43:30: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +In file included from /usr/local/include/fstream:19:0, + from vector_test.c:16: +/usr/local/include/iostream:21:1: error: unknown type name 'trait' + trait ostream( dtype ostype ) { + ^ +/usr/local/include/iostream:21:16: error: unknown type name 'dtype' + trait ostream( dtype ostype ) { + ^ +/usr/local/include/iostream:40:1: error: unknown type name 'trait' + trait writeable( otype T ) { + ^ +/usr/local/include/iostream:40:18: error: unknown type name 'otype' + trait writeable( otype T ) { + ^ +/usr/local/include/iostream:46:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char ); + ^ +/usr/local/include/iostream:48:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, short int ); + ^ +/usr/local/include/iostream:49:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned short int ); + ^ +/usr/local/include/iostream:50:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, int ); + ^ +/usr/local/include/iostream:51:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned int ); + ^ +/usr/local/include/iostream:52:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long int ); + ^ +/usr/local/include/iostream:53:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long long int ); + ^ +/usr/local/include/iostream:54:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long int ); + ^ +/usr/local/include/iostream:55:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long long int ); + ^ +/usr/local/include/iostream:57:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, float ); // FIX ME: should not be required + ^ +/usr/local/include/iostream:58:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, double ); + ^ +/usr/local/include/iostream:59:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long double ); + ^ +/usr/local/include/iostream:61:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, float _Complex ); + ^ +/usr/local/include/iostream:62:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, double _Complex ); + ^ +/usr/local/include/iostream:63:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long double _Complex ); + ^ +/usr/local/include/iostream:65:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const char * ); + ^ +/usr/local/include/iostream:66:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const void * ); + ^ +/usr/local/include/iostream:68:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) ); + ^ +/usr/local/include/iostream:69:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * ); + ^ +/usr/local/include/iostream:70:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * ); + ^ +/usr/local/include/iostream:71:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepOff( ostype * ); + ^ +/usr/local/include/iostream:72:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepDisable( ostype * ); + ^ +/usr/local/include/iostream:73:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepEnable( ostype * ); + ^ +/usr/local/include/iostream:76:9: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:76:49: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:76:108: error: unknown type name 'dtype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +In file included from /usr/local/include/fstream:19:0, + from vector_test.c:16: +/usr/local/include/iostream:79:9: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:79:49: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:79:108: error: unknown type name 'dtype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:84:1: error: unknown type name 'trait' + trait istream( dtype istype ) { + ^ +/usr/local/include/iostream:84:16: error: unknown type name 'dtype' + trait istream( dtype istype ) { + ^ +/usr/local/include/iostream:94:1: error: unknown type name 'trait' + trait readable( otype T ) { + ^ +/usr/local/include/iostream:94:17: error: unknown type name 'otype' + trait readable( otype T ) { + ^ +/usr/local/include/iostream:98:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, char * ); + ^ +/usr/local/include/iostream:100:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, short int * ); + ^ +/usr/local/include/iostream:101:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned short int * ); + ^ +/usr/local/include/iostream:102:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, int * ); + ^ +/usr/local/include/iostream:103:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned int * ); + ^ +/usr/local/include/iostream:104:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long int * ); + ^ +/usr/local/include/iostream:105:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long long int * ); + ^ +/usr/local/include/iostream:106:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned long int * ); + ^ +/usr/local/include/iostream:107:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned long long int * ); + ^ +/usr/local/include/iostream:109:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, float * ); + ^ +/usr/local/include/iostream:110:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, double * ); + ^ +/usr/local/include/iostream:111:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long double * ); + ^ +/usr/local/include/iostream:113:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, float _Complex * ); + ^ +/usr/local/include/iostream:114:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, double _Complex * ); + ^ +/usr/local/include/iostream:115:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long double _Complex * ); + ^ +/usr/local/include/iostream:118:1: error: unknown type name '_Istream_cstrUC' + _Istream_cstrUC cstr( char * ); + ^ +/usr/local/include/iostream:119:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrUC ); + ^ +/usr/local/include/iostream:122:1: error: unknown type name '_Istream_cstrC' + _Istream_cstrC cstr( char *, int size ); + ^ +/usr/local/include/iostream:122:16: error: conflicting types for 'cstr' + _Istream_cstrC cstr( char *, int size ); + ^ +/usr/local/include/iostream:118:17: note: previous declaration of 'cstr' was here + _Istream_cstrUC cstr( char * ); + ^ +/usr/local/include/iostream:123:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrC ); + ^ +In file included from vector_test.c:16:0: +/usr/local/include/fstream:29:15: error: unknown type name 'ofstream' + _Bool sepPrt( ofstream * ); + ^ +/usr/local/include/fstream:30:13: error: unknown type name 'ofstream' + void sepOn( ofstream * ); + ^ +/usr/local/include/fstream:31:14: error: unknown type name 'ofstream' + void sepOff( ofstream * ); + ^ +/usr/local/include/fstream:32:16: error: unknown type name 'ofstream' + void sepReset( ofstream * ); + ^ +/usr/local/include/fstream:33:16: error: unknown type name 'ofstream' + void sepReset( ofstream *, _Bool ); + ^ +/usr/local/include/fstream:34:14: error: unknown type name 'ofstream' + void sepSet( ofstream *, const char * ); + ^ +/usr/local/include/fstream:35:22: error: unknown type name 'ofstream' + const char * sepGet( ofstream * ); + ^ +/usr/local/include/fstream:36:19: error: unknown type name 'ofstream' + _Bool sepDisable( ofstream * ); + ^ +/usr/local/include/fstream:37:18: error: unknown type name 'ofstream' + _Bool sepEnable( ofstream * ); + ^ +/usr/local/include/fstream:38:11: error: unknown type name 'ofstream' + int fail( ofstream * ); + ^ +/usr/local/include/fstream:39:12: error: unknown type name 'ofstream' + int flush( ofstream * ); + ^ +/usr/local/include/fstream:40:12: error: unknown type name 'ofstream' + void open( ofstream *, const char * name, const char * mode ); + ^ +/usr/local/include/fstream:41:13: error: unknown type name 'ofstream' + void close( ofstream * ); + ^ +/usr/local/include/fstream:42:1: error: unknown type name 'ofstream' + ofstream * write( ofstream *, const char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:42:19: error: unknown type name 'ofstream' + ofstream * write( ofstream *, const char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:43:13: error: unknown type name 'ofstream' + int prtfmt( ofstream *, const char fmt[], ... ); + ^ +/usr/local/include/fstream:45:1: error: unknown type name 'ofstream' + extern ofstream * sout, * serr; + ^ +/usr/local/include/fstream:52:11: error: unknown type name 'ifstream' + int fail( ifstream * is ); + ^ +/usr/local/include/fstream:53:10: error: unknown type name 'ifstream' + int eof( ifstream * is ); + ^ +/usr/local/include/fstream:54:12: error: unknown type name 'ifstream' + void open( ifstream * is, const char * name, const char * mode ); + ^ +/usr/local/include/fstream:55:13: error: unknown type name 'ifstream' + void close( ifstream * is ); + ^ +/usr/local/include/fstream:56:1: error: unknown type name 'ifstream' + ifstream * read( ifstream * is, char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:56:18: error: unknown type name 'ifstream' + ifstream * read( ifstream * is, char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:57:1: error: unknown type name 'ifstream' + ifstream * ungetc( ifstream * is, char c ); + ^ +/usr/local/include/fstream:57:20: error: unknown type name 'ifstream' + ifstream * ungetc( ifstream * is, char c ); + ^ +/usr/local/include/fstream:58:14: error: unknown type name 'ifstream' + int scanfmt( ifstream *, const char fmt[], ... ); + ^ +/usr/local/include/fstream:60:1: error: unknown type name 'ifstream' + extern ifstream *sin; + ^ +vector_test.c:18:24: fatal error: vector_int.h: No such file or directory + #include "vector_int.h" + ^ +compilation terminated. +make: *** [vector_test] Error 1 + avl_test FAILED with build error: +make: *** No rule to make target `avl_test'. Stop. Index: src/tests/tests/vector_test.in.txt =================================================================== --- src/tests/tests/vector_test.in.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/tests/vector_test.in.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,1 @@ +1 2 3 4 5 Index: src/tests/tests/vector_test.make.txt =================================================================== --- src/tests/tests/vector_test.make.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/tests/vector_test.make.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,302 @@ +cc vector_test.c -o vector_test +In file included from /usr/local/include/iostream:19:0, + from /usr/local/include/fstream:19, + from vector_test.c:16: +/usr/local/include/iterator:20:1: error: unknown type name 'trait' + trait iterator( otype iterator_type, otype elt_type ) { + ^ +/usr/local/include/iterator:20:17: error: unknown type name 'otype' + trait iterator( otype iterator_type, otype elt_type ) { + ^ +/usr/local/include/iterator:20:38: error: unknown type name 'otype' + trait iterator( otype iterator_type, otype elt_type ) { + ^ +/usr/local/include/iterator:34:1: error: unknown type name 'trait' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:34:21: error: unknown type name 'otype' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:34:42: error: unknown type name 'otype' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:34:65: error: unknown type name 'otype' + trait iterator_for( otype iterator_type, otype collection_type, otype elt_type | iterator( iterator_type, elt_type ) ) { + ^ +/usr/local/include/iterator:40:9: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +/usr/local/include/iterator:40:30: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +/usr/local/include/iterator:43:9: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +/usr/local/include/iterator:43:30: error: unknown type name 'otype' + forall( otype iterator_type, otype elt_type | iterator( iterator_type, elt_type ) ) + ^ +In file included from /usr/local/include/fstream:19:0, + from vector_test.c:16: +/usr/local/include/iostream:21:1: error: unknown type name 'trait' + trait ostream( dtype ostype ) { + ^ +/usr/local/include/iostream:21:16: error: unknown type name 'dtype' + trait ostream( dtype ostype ) { + ^ +/usr/local/include/iostream:40:1: error: unknown type name 'trait' + trait writeable( otype T ) { + ^ +/usr/local/include/iostream:40:18: error: unknown type name 'otype' + trait writeable( otype T ) { + ^ +/usr/local/include/iostream:46:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, char ); + ^ +/usr/local/include/iostream:48:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, short int ); + ^ +/usr/local/include/iostream:49:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned short int ); + ^ +/usr/local/include/iostream:50:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, int ); + ^ +/usr/local/include/iostream:51:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned int ); + ^ +/usr/local/include/iostream:52:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long int ); + ^ +/usr/local/include/iostream:53:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long long int ); + ^ +/usr/local/include/iostream:54:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long int ); + ^ +/usr/local/include/iostream:55:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, unsigned long long int ); + ^ +/usr/local/include/iostream:57:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, float ); // FIX ME: should not be required + ^ +/usr/local/include/iostream:58:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, double ); + ^ +/usr/local/include/iostream:59:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long double ); + ^ +/usr/local/include/iostream:61:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, float _Complex ); + ^ +/usr/local/include/iostream:62:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, double _Complex ); + ^ +/usr/local/include/iostream:63:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, long double _Complex ); + ^ +/usr/local/include/iostream:65:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const char * ); + ^ +/usr/local/include/iostream:66:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, const void * ); + ^ +/usr/local/include/iostream:68:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, ostype * (*)( ostype * ) ); + ^ +/usr/local/include/iostream:69:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * endl( ostype * ); + ^ +/usr/local/include/iostream:70:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepOn( ostype * ); + ^ +/usr/local/include/iostream:71:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepOff( ostype * ); + ^ +/usr/local/include/iostream:72:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepDisable( ostype * ); + ^ +/usr/local/include/iostream:73:9: error: unknown type name 'dtype' + forall( dtype ostype | ostream( ostype ) ) ostype * sepEnable( ostype * ); + ^ +/usr/local/include/iostream:76:9: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:76:49: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:76:108: error: unknown type name 'dtype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +In file included from /usr/local/include/fstream:19:0, + from vector_test.c:16: +/usr/local/include/iostream:79:9: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:79:49: error: unknown type name 'otype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:79:108: error: unknown type name 'dtype' + forall( otype elt_type | writeable( elt_type ), otype iterator_type | iterator( iterator_type, elt_type ), dtype os_type | ostream( os_type ) ) + ^ +/usr/local/include/iostream:84:1: error: unknown type name 'trait' + trait istream( dtype istype ) { + ^ +/usr/local/include/iostream:84:16: error: unknown type name 'dtype' + trait istream( dtype istype ) { + ^ +/usr/local/include/iostream:94:1: error: unknown type name 'trait' + trait readable( otype T ) { + ^ +/usr/local/include/iostream:94:17: error: unknown type name 'otype' + trait readable( otype T ) { + ^ +/usr/local/include/iostream:98:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, char * ); + ^ +/usr/local/include/iostream:100:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, short int * ); + ^ +/usr/local/include/iostream:101:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned short int * ); + ^ +/usr/local/include/iostream:102:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, int * ); + ^ +/usr/local/include/iostream:103:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned int * ); + ^ +/usr/local/include/iostream:104:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long int * ); + ^ +/usr/local/include/iostream:105:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long long int * ); + ^ +/usr/local/include/iostream:106:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned long int * ); + ^ +/usr/local/include/iostream:107:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, unsigned long long int * ); + ^ +/usr/local/include/iostream:109:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, float * ); + ^ +/usr/local/include/iostream:110:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, double * ); + ^ +/usr/local/include/iostream:111:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long double * ); + ^ +/usr/local/include/iostream:113:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, float _Complex * ); + ^ +/usr/local/include/iostream:114:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, double _Complex * ); + ^ +/usr/local/include/iostream:115:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, long double _Complex * ); + ^ +/usr/local/include/iostream:118:1: error: unknown type name '_Istream_cstrUC' + _Istream_cstrUC cstr( char * ); + ^ +/usr/local/include/iostream:119:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrUC ); + ^ +/usr/local/include/iostream:122:1: error: unknown type name '_Istream_cstrC' + _Istream_cstrC cstr( char *, int size ); + ^ +/usr/local/include/iostream:122:16: error: conflicting types for 'cstr' + _Istream_cstrC cstr( char *, int size ); + ^ +/usr/local/include/iostream:118:17: note: previous declaration of 'cstr' was here + _Istream_cstrUC cstr( char * ); + ^ +/usr/local/include/iostream:123:9: error: unknown type name 'dtype' + forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, _Istream_cstrC ); + ^ +In file included from vector_test.c:16:0: +/usr/local/include/fstream:29:15: error: unknown type name 'ofstream' + _Bool sepPrt( ofstream * ); + ^ +/usr/local/include/fstream:30:13: error: unknown type name 'ofstream' + void sepOn( ofstream * ); + ^ +/usr/local/include/fstream:31:14: error: unknown type name 'ofstream' + void sepOff( ofstream * ); + ^ +/usr/local/include/fstream:32:16: error: unknown type name 'ofstream' + void sepReset( ofstream * ); + ^ +/usr/local/include/fstream:33:16: error: unknown type name 'ofstream' + void sepReset( ofstream *, _Bool ); + ^ +/usr/local/include/fstream:34:14: error: unknown type name 'ofstream' + void sepSet( ofstream *, const char * ); + ^ +/usr/local/include/fstream:35:22: error: unknown type name 'ofstream' + const char * sepGet( ofstream * ); + ^ +/usr/local/include/fstream:36:19: error: unknown type name 'ofstream' + _Bool sepDisable( ofstream * ); + ^ +/usr/local/include/fstream:37:18: error: unknown type name 'ofstream' + _Bool sepEnable( ofstream * ); + ^ +/usr/local/include/fstream:38:11: error: unknown type name 'ofstream' + int fail( ofstream * ); + ^ +/usr/local/include/fstream:39:12: error: unknown type name 'ofstream' + int flush( ofstream * ); + ^ +/usr/local/include/fstream:40:12: error: unknown type name 'ofstream' + void open( ofstream *, const char * name, const char * mode ); + ^ +/usr/local/include/fstream:41:13: error: unknown type name 'ofstream' + void close( ofstream * ); + ^ +/usr/local/include/fstream:42:1: error: unknown type name 'ofstream' + ofstream * write( ofstream *, const char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:42:19: error: unknown type name 'ofstream' + ofstream * write( ofstream *, const char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:43:13: error: unknown type name 'ofstream' + int prtfmt( ofstream *, const char fmt[], ... ); + ^ +/usr/local/include/fstream:45:1: error: unknown type name 'ofstream' + extern ofstream * sout, * serr; + ^ +/usr/local/include/fstream:52:11: error: unknown type name 'ifstream' + int fail( ifstream * is ); + ^ +/usr/local/include/fstream:53:10: error: unknown type name 'ifstream' + int eof( ifstream * is ); + ^ +/usr/local/include/fstream:54:12: error: unknown type name 'ifstream' + void open( ifstream * is, const char * name, const char * mode ); + ^ +/usr/local/include/fstream:55:13: error: unknown type name 'ifstream' + void close( ifstream * is ); + ^ +/usr/local/include/fstream:56:1: error: unknown type name 'ifstream' + ifstream * read( ifstream * is, char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:56:18: error: unknown type name 'ifstream' + ifstream * read( ifstream * is, char * data, unsigned long int size ); + ^ +/usr/local/include/fstream:57:1: error: unknown type name 'ifstream' + ifstream * ungetc( ifstream * is, char c ); + ^ +/usr/local/include/fstream:57:20: error: unknown type name 'ifstream' + ifstream * ungetc( ifstream * is, char c ); + ^ +/usr/local/include/fstream:58:14: error: unknown type name 'ifstream' + int scanfmt( ifstream *, const char fmt[], ... ); + ^ +/usr/local/include/fstream:60:1: error: unknown type name 'ifstream' + extern ifstream *sin; + ^ +vector_test.c:18:24: fatal error: vector_int.h: No such file or directory + #include "vector_int.h" + ^ +compilation terminated. +make: *** [vector_test] Error 1 Index: src/tests/tests/vector_test.out.txt =================================================================== --- src/tests/tests/vector_test.out.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/tests/vector_test.out.txt (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,5 @@ +enter N elements and C-d on a separate line: +Array elements: +1 2 3 4 5 +Array elements reversed: +5 4 3 2 1 Index: src/tests/vector_int.c =================================================================== --- src/tests/vector_int.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/vector_int.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,77 @@ +// +// 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. +// +// vector_int.c -- +// +// Author : Richard C. Bilson +// Created On : Wed May 27 17:56:53 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Apr 27 17:27:12 2016 +// Update Count : 3 +// + +#include "vector_int.h" +extern "C" { +#include +#include +} + +#define DEFAULT_CAPACITY 20 + +void ?{}( vector_int * vec ) { + vec { DEFAULT_CAPACITY }; +} + +void ?{}( vector_int * vec, int reserve ) { + vec->last = -1; + vec->capacity = reserve; + vec->data = malloc( sizeof( int ) * reserve ); +} + +void ?{}( vector_int * vec, vector_int other ) { + vec->last = other.last; + vec->capacity = other.capacity; + vec->data = malloc( sizeof( int ) * other.capacity ); + for (int i = 0; i < vec->last; i++) { + vec->data[i] = other.data[i]; + } +} + +void ^?{}( vector_int * vec ) { + free( vec->data ); +} + +void reserve( vector_int *vec, int reserve ) { + if ( reserve > vec->capacity ) { + vec->data = realloc( vec->data, sizeof( int ) * reserve ); + vec->capacity = reserve; + } +} + +void append( vector_int *vec, int element ) { + vec->last++; + if ( vec->last == vec->capacity ) { + vec->capacity *= 2; + vec->data = realloc( vec->data, sizeof( int ) * vec->capacity ); + } + vec->data[ vec->last ] = element; +} + +// implement bounded_array + +lvalue int ?[?]( vector_int * vec, int index ) { + return vec->data[ index ]; +} + +int last( vector_int * vec ) { + return vec->last; +} + + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa vector_int.c" // +// End: // Index: src/tests/vector_int.h =================================================================== --- src/tests/vector_int.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/vector_int.h (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,45 @@ +// +// 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. +// +// vector_int.h -- +// +// Author : Richard C. Bilson +// Created On : Wed May 27 17:56:53 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Apr 27 17:26:59 2016 +// Update Count : 2 +// + +#ifndef VECTOR_INT_H +#define VECTOR_INT_H + +// A flexible array, similar to a C++ vector, that holds integers and can be resized dynamically + +typedef struct vector_int { + int last; // last used index + int capacity; // last possible index before reallocation + int *data; // array +} vector_int; + +void ?{}( vector_int * ); // allocate vector with default capacity +void ?{}( vector_int *, int reserve ); // allocate vector with specified capacity +void ?{}( vector_int * vec, vector_int other ); // copy constructor +void ^?{}( vector_int * ); // deallocate vector's storage + +void reserve( vector_int *vec, int reserve ); // reserve more capacity +void append( vector_int *vec, int element ); // add element to end of vector, resizing as necessary + +// implement bounded_array + +lvalue int ?[?]( vector_int * vec, int index ); // access to arbitrary element (does not resize) +int last( vector_int * vec ); // return last element + +#endif // VECTOR_INT_H + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa vector_int.c" // +// End: // Index: src/tests/vector_test.c =================================================================== --- src/tests/vector_test.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) +++ src/tests/vector_test.c (revision 7ff30d07fc0faa6fe08d4b36246cc54d7712881c) @@ -0,0 +1,47 @@ +// +// 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. +// +// vector_test.c -- +// +// Author : Richard C. Bilson +// Created On : Wed May 27 17:56:53 2015 +// Last Modified By : Rob Schluntz +// Last Modified On : Wed Apr 27 17:31:27 2016 +// Update Count : 18 +// + +#include +#include +#include "vector_int.h" +#include "array.h" + +int main( void ) { + vector_int vec; + + // read in numbers until EOF or error + int num; + + sout | "enter N elements and C-d on a separate line:" | endl; + for ( ;; ) { + sin | # + if ( fail( sin ) || eof( sin ) ) break; + append( &vec, num ); + } + // write out the numbers + + sout | "Array elements:" | endl; + write( begin( &vec ), end( &vec ), sout ); + sout | endl; + + sout | "Array elements reversed:" | endl; + write_reverse( begin( &vec ), end( &vec ), sout ); + sout | endl; +} + +// Local Variables: // +// tab-width: 4 // +// compile-command: "cfa vector_test.c vector_int.o array.o" // +// End: //