diff -Nru libgee-0.8-0.10.2/ChangeLog libgee-0.8-0.10.5/ChangeLog --- libgee-0.8-0.10.2/ChangeLog 2013-07-12 20:03:43.000000000 +0000 +++ libgee-0.8-0.10.5/ChangeLog 2013-09-16 17:43:26.000000000 +0000 @@ -1,3 +1,49 @@ +2013-09-14 Maciej Piechotka + + Override read_only_view property in ReadOnlySortedMap and its subclasses + +2013-08-19 Maciej Piechotka + + Release 0.10.4 + +2013-08-18 Maciej Piechotka + + Fix Collection.remove_all_array for primitives + + Fix Collection.contains_all_array for primitives + + Fix Collection.add_all_array for primitives + + Fix to_array for boxed values + +2013-08-02 Maciej Piechotka + + Fix problem with wrapping of ArrayList + +2013-07-30 Maciej Piechotka + + Release 0.10.3 + +2013-07-24 Maciej Piechotka + + Fix the foreach in TreeMap.values + +2013-07-16 Maciej Piechotka + + Fix Gee.TreeSet.Iterator.foreach + + Fix Gee.ArrayQueue.Iterator.foreach + +2013-07-15 Maciej Piechotka + + Fix the PriorityQueue.Iterator.foreach + + Fix the HashSet.Iterator.foreach + +2013-07-12 Maciej Piechotka + + Release 0.10.2 + 2013-07-06 Maciej Piechotka Use .value instead of value directly in unfold diff -Nru libgee-0.8-0.10.2/Makefile.in libgee-0.8-0.10.5/Makefile.in --- libgee-0.8-0.10.2/Makefile.in 2013-07-12 20:03:05.000000000 +0000 +++ libgee-0.8-0.10.5/Makefile.in 2013-09-16 17:43:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 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, @@ -17,23 +17,51 @@ # GLIB - Library of useful C routines VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + 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@ @@ -52,12 +80,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/gee-0.8.pc.in $(top_srcdir)/Makefile.decl \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh ltmain.sh \ - missing +DIST_COMMON = $(top_srcdir)/Makefile.decl INSTALL NEWS README AUTHORS \ + ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/gee-0.8.pc.in COPYING compile \ + config.guess config.sub depcomp install-sh missing ltmain.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ @@ -86,13 +113,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -129,9 +157,30 @@ DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# 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 CSCOPE = cscope @@ -384,8 +433,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -436,14 +485,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -464,31 +512,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -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 +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -504,12 +534,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(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 \ test -n "$$unique" || unique=$$empty_fix; \ @@ -521,15 +546,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(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-recursive + +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 @@ -538,18 +559,16 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" - cscope: cscope.files test ! -s cscope.files \ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) - clean-cscope: -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive -cscope.files: clean-cscope cscopelist-recursive cscopelist - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -655,10 +674,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -864,27 +889,25 @@ uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am check-local clean \ - clean-cscope clean-generic clean-libtool cscope cscopelist \ - cscopelist-recursive ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck 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-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-pkgconfigDATA +.MAKE: $(am__recursive_targets) all check-am install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am check-local clean clean-cscope \ + clean-generic clean-libtool cscope cscopelist-am ctags \ + ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \ + dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck 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-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkgconfigDATA ### testing rules diff -Nru libgee-0.8-0.10.2/NEWS libgee-0.8-0.10.5/NEWS --- libgee-0.8-0.10.2/NEWS 2013-07-12 19:56:30.000000000 +0000 +++ libgee-0.8-0.10.5/NEWS 2013-09-16 17:42:50.000000000 +0000 @@ -1,3 +1,15 @@ +libgee 0.10.5 +============= + * Override read_only_view property in ReadOnlySortedMap and its subclasses + +libgee 0.10.4 +============= + * Fix various problems with generic arrays + +libgee 0.10.3 +============= + * Fix various .foreach + libgee 0.10.2 ============= * Use .value instead of value directly in unfold diff -Nru libgee-0.8-0.10.2/aclocal.m4 libgee-0.8-0.10.5/aclocal.m4 --- libgee-0.8-0.10.2/aclocal.m4 2013-07-12 20:03:04.000000000 +0000 +++ libgee-0.8-0.10.5/aclocal.m4 2013-09-16 17:42:59.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, @@ -331,7 +332,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -343,10 +344,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.12' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.6], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -362,14 +363,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.6])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -422,7 +423,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -453,7 +454,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -644,7 +645,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -655,7 +656,7 @@ # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -684,7 +685,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -720,7 +721,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -729,6 +730,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -741,7 +748,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -771,8 +778,7 @@ dnl Distinguish between old-style and new-style calls. m4_ifval([$2], [AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) + [$0: two- and three-arguments forms are deprecated.]) m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], @@ -826,22 +832,60 @@ [_AM_DEPENDENCIES([OBJC])], [m4_define([AC_PROG_OBJC], m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -dnl Support for Objective C++ was only introduced in Autoconf 2.65, -dnl but we still cater to Autoconf 2.62. -m4_ifdef([AC_PROG_OBJCXX], -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -849,7 +893,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -871,7 +914,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -892,7 +935,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -913,7 +956,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -961,41 +1004,9 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. -# -# This file 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. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1010,8 +1021,8 @@ # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -1024,8 +1035,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= AC_MSG_WARN(['missing' script is too old or missing]) @@ -1034,7 +1045,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1063,9 +1074,73 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file 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. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file 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. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1146,7 +1221,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1206,7 +1281,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1234,7 +1309,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1253,7 +1328,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1272,83 +1347,121 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR # Autoconf support for the Vala compiler -# Copyright (C) 2008-2012 Free Software Foundation, Inc. +# Copyright (C) 2008-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru libgee-0.8-0.10.2/benchmark/Makefile.in libgee-0.8-0.10.5/benchmark/Makefile.in --- libgee-0.8-0.10.2/benchmark/Makefile.in 2013-07-12 20:03:05.000000000 +0000 +++ libgee-0.8-0.10.5/benchmark/Makefile.in 2013-09-16 17:43:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 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, @@ -17,23 +17,51 @@ # GLIB - Library of useful C routines VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + 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; \ - test $$am__dry = yes; \ - } + 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@ @@ -52,9 +80,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/benchmarks_vala.stamp $(top_srcdir)/Makefile.decl \ - $(top_srcdir)/depcomp benchmark.c benchmarksorts.c +DIST_COMMON = $(top_srcdir)/Makefile.decl $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am benchmark.c benchmarksorts.c \ + $(top_srcdir)/depcomp $(srcdir)/benchmarks_vala.stamp noinst_PROGRAMS = benchmarks$(EXEEXT) subdir = benchmark ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -132,6 +160,23 @@ 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) @@ -348,6 +393,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + benchmarks$(EXEEXT): $(benchmarks_OBJECTS) $(benchmarks_DEPENDENCIES) $(EXTRA_benchmarks_DEPENDENCIES) @rm -f benchmarks$(EXEEXT) $(AM_V_CCLD)$(benchmarks_LINK) $(benchmarks_OBJECTS) $(benchmarks_LDADD) $(LIBS) @@ -366,14 +412,14 @@ @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 $< +@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 `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -430,26 +476,15 @@ clean-libtool: -rm -rf .libs _libs -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 +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +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 \ test -n "$$unique" || unique=$$empty_fix; \ @@ -461,15 +496,11 @@ $$unique; \ 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) \ $$unique @@ -478,9 +509,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -639,9 +671,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libtool clean-noinstPROGRAMS cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool 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 \ @@ -651,7 +683,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am ### testing rules diff -Nru libgee-0.8-0.10.2/benchmark/benchmark.c libgee-0.8-0.10.5/benchmark/benchmark.c --- libgee-0.8-0.10.2/benchmark/benchmark.c 2013-07-10 06:50:21.000000000 +0000 +++ libgee-0.8-0.10.5/benchmark/benchmark.c 2013-09-16 17:43:26.000000000 +0000 @@ -1,4 +1,4 @@ -/* benchmark.c generated by valac 0.20.1.52-2186, the Vala compiler +/* benchmark.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from benchmark.vala, do not modify */ /* benchmark.vala diff -Nru libgee-0.8-0.10.2/benchmark/benchmarksorts.c libgee-0.8-0.10.5/benchmark/benchmarksorts.c --- libgee-0.8-0.10.2/benchmark/benchmarksorts.c 2013-07-10 06:50:21.000000000 +0000 +++ libgee-0.8-0.10.5/benchmark/benchmarksorts.c 2013-09-16 17:43:26.000000000 +0000 @@ -1,4 +1,4 @@ -/* benchmarksorts.c generated by valac 0.20.1.52-2186, the Vala compiler +/* benchmarksorts.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from benchmarksorts.vala, do not modify */ /* benchmarksorts.vala diff -Nru libgee-0.8-0.10.2/config.h.in libgee-0.8-0.10.5/config.h.in --- libgee-0.8-0.10.2/config.h.in 2013-07-12 20:03:19.000000000 +0000 +++ libgee-0.8-0.10.5/config.h.in 2013-09-16 17:43:03.000000000 +0000 @@ -34,9 +34,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -Nru libgee-0.8-0.10.2/configure libgee-0.8-0.10.5/configure --- libgee-0.8-0.10.2/configure 2013-07-12 20:03:05.000000000 +0000 +++ libgee-0.8-0.10.5/configure 2013-09-16 17:43:00.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libgee 0.10.2. +# Generated by GNU Autoconf 2.69 for libgee 0.10.5. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='libgee' PACKAGE_TARNAME='libgee' -PACKAGE_VERSION='0.10.2' -PACKAGE_STRING='libgee 0.10.2' +PACKAGE_VERSION='0.10.5' +PACKAGE_STRING='libgee 0.10.5' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=libgee' PACKAGE_URL='' @@ -1409,7 +1409,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libgee 0.10.2 to adapt to many kinds of systems. +\`configure' configures libgee 0.10.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1479,7 +1479,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libgee 0.10.2:";; + short | recursive ) echo "Configuration of libgee 0.10.5:";; esac cat <<\_ACEOF @@ -1596,7 +1596,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libgee configure 0.10.2 +libgee configure 0.10.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1874,7 +1874,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libgee $as_me 0.10.2, which was +It was created by libgee $as_me 0.10.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2226,7 +2226,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.12' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2439,8 +2439,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -2680,6 +2680,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2702,7 +2741,7 @@ # Define the identity of the package. PACKAGE='libgee' - VERSION='0.10.2' + VERSION='0.10.5' cat >>confdefs.h <<_ACEOF @@ -2742,12 +2781,58 @@ # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3577,6 +3662,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3769,131 +3913,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # Check whether --enable-static was given. if test "${enable_static+set}" = set; then : @@ -11492,7 +11511,7 @@ -LIBGEE_LT_VERSION="4:0:2" +LIBGEE_LT_VERSION="4:3:2" GLIB_REQUIRED=2.32 @@ -12582,7 +12601,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libgee $as_me 0.10.2, which was +This file was extended by libgee $as_me 0.10.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12648,7 +12667,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libgee config.status 0.10.2 +libgee config.status 0.10.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -13659,7 +13678,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -13710,7 +13729,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff -Nru libgee-0.8-0.10.2/configure.ac libgee-0.8-0.10.5/configure.ac --- libgee-0.8-0.10.2/configure.ac 2013-07-12 19:54:05.000000000 +0000 +++ libgee-0.8-0.10.5/configure.ac 2013-09-16 17:42:21.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([libgee], [0.10.2], [https://bugzilla.gnome.org/enter_bug.cgi?product=libgee], [libgee]) +AC_INIT([libgee], [0.10.5], [https://bugzilla.gnome.org/enter_bug.cgi?product=libgee], [libgee]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) @@ -11,7 +11,7 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL -LIBGEE_LT_VERSION="4:0:2" +LIBGEE_LT_VERSION="4:3:2" AC_SUBST(LIBGEE_LT_VERSION) GLIB_REQUIRED=2.32 diff -Nru libgee-0.8-0.10.2/debian/changelog libgee-0.8-0.10.5/debian/changelog --- libgee-0.8-0.10.2/debian/changelog 2013-07-16 09:06:07.000000000 +0000 +++ libgee-0.8-0.10.5/debian/changelog 2013-09-23 06:51:54.000000000 +0000 @@ -1,8 +1,16 @@ -libgee-0.8 (0.10.2-1~precise1) precise; urgency=medium +libgee-0.8 (0.10.5-1~12.04~valateam1) precise; urgency=low - * Copied from saucy + * Copied from debian - -- Rico Tzschichholz Tue, 16 Jul 2013 11:05:07 +0200 + -- Rico Tzschichholz Mon, 23 Sep 2013 08:49:28 +0200 + +libgee-0.8 (0.10.5-1) unstable; urgency=low + + * Team upload. + * New upstream release. + * debian/watch: Track stable releases. + + -- Michael Biebl Sun, 22 Sep 2013 22:43:58 +0200 libgee-0.8 (0.10.2-1) unstable; urgency=low diff -Nru libgee-0.8-0.10.2/debian/watch libgee-0.8-0.10.5/debian/watch --- libgee-0.8-0.10.2/debian/watch 2013-07-15 00:11:41.000000000 +0000 +++ libgee-0.8-0.10.5/debian/watch 2013-09-22 20:44:20.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/gnome/sources/libgee/([\d\.]+)/libgee-([\d\.]+)\.tar\.xz +http://ftp.gnome.org/pub/gnome/sources/libgee/([\d\.]+[02468])/libgee-([\d\.]+)\.tar\.xz diff -Nru libgee-0.8-0.10.2/doc/Makefile.in libgee-0.8-0.10.5/doc/Makefile.in --- libgee-0.8-0.10.2/doc/Makefile.in 2013-07-12 20:03:05.000000000 +0000 +++ libgee-0.8-0.10.5/doc/Makefile.in 2013-09-16 17:43:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 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, @@ -17,23 +17,51 @@ # GLIB - Library of useful C routines VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + 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@ @@ -52,8 +80,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/Makefile.decl +DIST_COMMON = $(top_srcdir)/Makefile.decl $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ @@ -115,6 +143,7 @@ am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(imgdir)" \ "$(DESTDIR)$(innerdocdir)" DATA = $(doc_DATA) $(img_DATA) $(innerdoc_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -385,11 +414,9 @@ @list='$(innerdoc_DATA)'; test -n "$(innerdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(innerdocdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -532,17 +559,19 @@ .MAKE: check-am install-am install-strip .PHONY: all all-am check check-am check-local clean clean-generic \ - clean-libtool distclean distclean-generic distclean-libtool \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-docDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-imgDATA install-info \ - install-info-am install-innerdocDATA install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + clean-libtool cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-docDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-imgDATA install-info install-info-am \ + install-innerdocDATA 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-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-docDATA uninstall-imgDATA uninstall-innerdocDATA + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-docDATA uninstall-imgDATA \ + uninstall-innerdocDATA ### testing rules diff -Nru libgee-0.8-0.10.2/gee/Makefile.in libgee-0.8-0.10.5/gee/Makefile.in --- libgee-0.8-0.10.2/gee/Makefile.in 2013-07-12 20:03:05.000000000 +0000 +++ libgee-0.8-0.10.5/gee/Makefile.in 2013-09-16 17:43:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 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, @@ -19,23 +19,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + 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@ @@ -54,30 +82,30 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(dist_vapi_DATA) $(geeinclude_HEADERS) \ - $(srcdir)/Gee-0.8.gir $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gee-0.8.vapi \ - $(srcdir)/gee-internals-0.8.vapi $(srcdir)/gee-internals.h \ - $(srcdir)/gee.h $(srcdir)/libgee_0_8_la_vala.stamp \ - $(top_srcdir)/Makefile.decl $(top_srcdir)/depcomp \ - abstractbidirlist.c abstractbidirsortedmap.c \ - abstractbidirsortedset.c abstractcollection.c abstractlist.c \ - abstractmap.c abstractmultimap.c abstractmultiset.c \ - abstractqueue.c abstractset.c abstractsortedmap.c \ - abstractsortedset.c arraylist.c arrayqueue.c assemblyinfo.c \ - bidiriterator.c bidirlist.c bidirlistiterator.c \ - bidirmapiterator.c bidirsortedmap.c bidirsortedset.c \ - collection.c comparable.c concurrentlist.c concurrentset.c \ - deque.c functions.c hashable.c hashmap.c hashmultimap.c \ - hashmultiset.c hashset.c hazardpointer.c iterable.c iterator.c \ - lazy.c linkedlist.c list.c listiterator.c map.c mapiterator.c \ - multimap.c multiset.c priorityqueue.c queue.c \ - readonlybidirlist.c readonlybidirsortedmap.c \ - readonlybidirsortedset.c readonlycollection.c readonlylist.c \ - readonlymap.c readonlymultimap.c readonlymultiset.c \ - readonlyset.c readonlysortedmap.c readonlysortedset.c set.c \ - sortedmap.c sortedset.c timsort.c traversable.c treemap.c \ - treemultimap.c treemultiset.c treeset.c unfolditerator.c +DIST_COMMON = $(top_srcdir)/Makefile.decl $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am assemblyinfo.c abstractbidirlist.c \ + abstractbidirsortedset.c abstractbidirsortedmap.c \ + abstractcollection.c abstractlist.c abstractmap.c \ + abstractmultimap.c abstractmultiset.c abstractqueue.c \ + abstractset.c abstractsortedmap.c abstractsortedset.c \ + arraylist.c arrayqueue.c bidiriterator.c bidirlist.c \ + bidirlistiterator.c bidirmapiterator.c bidirsortedset.c \ + bidirsortedmap.c collection.c comparable.c concurrentlist.c \ + concurrentset.c deque.c functions.c hashable.c hashmap.c \ + hashmultimap.c hashmultiset.c hashset.c hazardpointer.c \ + iterable.c iterator.c lazy.c linkedlist.c list.c \ + listiterator.c map.c mapiterator.c multimap.c multiset.c \ + priorityqueue.c queue.c readonlybidirlist.c \ + readonlybidirsortedset.c readonlybidirsortedmap.c \ + readonlycollection.c readonlylist.c readonlymap.c \ + readonlymultimap.c readonlymultiset.c readonlyset.c \ + readonlysortedmap.c readonlysortedset.c set.c sortedmap.c \ + sortedset.c timsort.c traversable.c treemap.c treemultimap.c \ + treemultiset.c treeset.c unfolditerator.c \ + $(top_srcdir)/depcomp $(srcdir)/gee.h $(srcdir)/gee-0.8.vapi \ + $(srcdir)/gee-internals.h $(srcdir)/gee-internals-0.8.vapi \ + $(srcdir)/Gee-0.8.gir $(srcdir)/libgee_0_8_la_vala.stamp \ + $(dist_vapi_DATA) $(geeinclude_HEADERS) subdir = gee ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ @@ -225,6 +253,23 @@ esac DATA = $(dist_vapi_DATA) $(gir_DATA) $(typelib_DATA) HEADERS = $(geeinclude_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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -539,6 +584,7 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -573,6 +619,7 @@ echo rm -f $${locs}; \ rm -f $${locs}; \ } + libgee-0.8.la: $(libgee_0_8_la_OBJECTS) $(libgee_0_8_la_DEPENDENCIES) $(EXTRA_libgee_0_8_la_DEPENDENCIES) $(AM_V_CCLD)$(libgee_0_8_la_LINK) -rpath $(libdir) $(libgee_0_8_la_OBJECTS) $(libgee_0_8_la_LIBADD) $(LIBS) @@ -654,14 +701,14 @@ @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 $< +@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 `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1581,26 +1628,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(geeincludedir)'; $(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 +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +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 \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1612,15 +1648,11 @@ $$unique; \ 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) \ $$unique @@ -1629,9 +1661,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1930,9 +1963,9 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-generic clean-libLTLIBRARIES clean-libtool cscopelist \ - ctags distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dist_vapiDATA install-dvi \ @@ -1944,7 +1977,7 @@ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dist_vapiDATA \ + tags tags-am uninstall uninstall-am uninstall-dist_vapiDATA \ uninstall-geeincludeHEADERS uninstall-girDATA \ uninstall-libLTLIBRARIES uninstall-typelibDATA diff -Nru libgee-0.8-0.10.2/gee/abstractbidirlist.c libgee-0.8-0.10.5/gee/abstractbidirlist.c --- libgee-0.8-0.10.2/gee/abstractbidirlist.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractbidirlist.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractbidirlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractbidirlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractbidirlist.vala, do not modify */ /* bidirlistiterator.vala diff -Nru libgee-0.8-0.10.2/gee/abstractbidirsortedmap.c libgee-0.8-0.10.5/gee/abstractbidirsortedmap.c --- libgee-0.8-0.10.2/gee/abstractbidirsortedmap.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractbidirsortedmap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractbidirsortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractbidirsortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractbidirsortedmap.vala, do not modify */ /* abstractbidirsortedmap.vala diff -Nru libgee-0.8-0.10.2/gee/abstractbidirsortedset.c libgee-0.8-0.10.5/gee/abstractbidirsortedset.c --- libgee-0.8-0.10.2/gee/abstractbidirsortedset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractbidirsortedset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractbidirsortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractbidirsortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractbidirsortedset.vala, do not modify */ /* abstractbidirsortedset.vala diff -Nru libgee-0.8-0.10.2/gee/abstractcollection.c libgee-0.8-0.10.5/gee/abstractcollection.c --- libgee-0.8-0.10.2/gee/abstractcollection.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractcollection.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractcollection.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractcollection.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractcollection.vala, do not modify */ /* abstractcollection.vala diff -Nru libgee-0.8-0.10.2/gee/abstractlist.c libgee-0.8-0.10.5/gee/abstractlist.c --- libgee-0.8-0.10.2/gee/abstractlist.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractlist.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractlist.vala, do not modify */ /* abstractlist.vala diff -Nru libgee-0.8-0.10.2/gee/abstractmap.c libgee-0.8-0.10.5/gee/abstractmap.c --- libgee-0.8-0.10.2/gee/abstractmap.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractmap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractmap.vala, do not modify */ /* abstractmap.vala diff -Nru libgee-0.8-0.10.2/gee/abstractmultimap.c libgee-0.8-0.10.5/gee/abstractmultimap.c --- libgee-0.8-0.10.2/gee/abstractmultimap.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractmultimap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractmultimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractmultimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractmultimap.vala, do not modify */ /* abstractmultimap.vala diff -Nru libgee-0.8-0.10.2/gee/abstractmultiset.c libgee-0.8-0.10.5/gee/abstractmultiset.c --- libgee-0.8-0.10.2/gee/abstractmultiset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractmultiset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractmultiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractmultiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractmultiset.vala, do not modify */ /* abstractmultiset.vala diff -Nru libgee-0.8-0.10.2/gee/abstractqueue.c libgee-0.8-0.10.5/gee/abstractqueue.c --- libgee-0.8-0.10.2/gee/abstractqueue.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractqueue.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractqueue.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractqueue.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractqueue.vala, do not modify */ /* abstractqueue.vala diff -Nru libgee-0.8-0.10.2/gee/abstractset.c libgee-0.8-0.10.5/gee/abstractset.c --- libgee-0.8-0.10.2/gee/abstractset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractset.vala, do not modify */ /* abstractset.vala diff -Nru libgee-0.8-0.10.2/gee/abstractsortedmap.c libgee-0.8-0.10.5/gee/abstractsortedmap.c --- libgee-0.8-0.10.2/gee/abstractsortedmap.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractsortedmap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractsortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractsortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractsortedmap.vala, do not modify */ /* readonlysortedmap.vala diff -Nru libgee-0.8-0.10.2/gee/abstractsortedset.c libgee-0.8-0.10.5/gee/abstractsortedset.c --- libgee-0.8-0.10.2/gee/abstractsortedset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/abstractsortedset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstractsortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* abstractsortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from abstractsortedset.vala, do not modify */ /* abstractsortedset.vala diff -Nru libgee-0.8-0.10.2/gee/arraylist.c libgee-0.8-0.10.5/gee/arraylist.c --- libgee-0.8-0.10.2/gee/arraylist.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/arraylist.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* arraylist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* arraylist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from arraylist.vala, do not modify */ /* arraylist.vala @@ -30,6 +30,8 @@ #include #include #include +#include +#include #define GEE_TYPE_TRAVERSABLE (gee_traversable_get_type ()) @@ -170,6 +172,7 @@ typedef struct _GeeArrayListIterator GeeArrayListIterator; typedef struct _GeeArrayListIteratorClass GeeArrayListIteratorClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +#define _g_destroy_func0(var) (((var == NULL) || (g_destroy_func == NULL)) ? NULL : (var = (g_destroy_func (var), NULL))) typedef struct _GeeArrayListIteratorPrivate GeeArrayListIteratorPrivate; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -456,7 +459,7 @@ static void gee_array_list_set_equal_func (GeeArrayList* self, GeeEqualDataFunc value, gpointer value_target); GeeArrayList* gee_array_list_new_wrap (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gpointer* items, int items_length1, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify); GeeArrayList* gee_array_list_construct_wrap (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gpointer* items, int items_length1, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify); -static gpointer* _vala_array_dup1 (gpointer* self, int length, GBoxedCopyFunc g_dup_func); +static gpointer* gee_array_list_do_wrap (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gpointer* data, int data_length1, int* result_length1); static gboolean gee_array_list_real_foreach (GeeAbstractCollection* base, GeeForallFunc f, void* f_target); static GeeIterator* gee_array_list_real_iterator (GeeAbstractCollection* base); static GeeArrayListIterator* gee_array_list_iterator_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, GeeArrayList* list); @@ -488,6 +491,17 @@ static gboolean __lambda28_ (GeeArrayList* self, gpointer item); static gboolean ___lambda28__gee_forall_func (gpointer g, gpointer self); static void gee_array_list_set_capacity (GeeArrayList* self, gint value); +static gpointer* gee_array_list_wrap_bool (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gboolean* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_char (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gchar* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_uchar (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guchar* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_int (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gint* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_uint (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_int64 (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gint64* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_uint64 (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint64* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_long (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, glong* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_ulong (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gulong* data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_float (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gfloat** data, int data_length1, int* result_length1); +static gpointer* gee_array_list_wrap_double (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gdouble** data, int data_length1, int* result_length1); #define GEE_ARRAY_LIST_ITERATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GEE_ARRAY_LIST_TYPE_ITERATOR, GeeArrayListIteratorPrivate)) enum { GEE_ARRAY_LIST_ITERATOR_DUMMY_PROPERTY, @@ -591,19 +605,6 @@ * @param items initial items to be put into array * @param equal_func an optional element equality testing function */ -static gpointer* _vala_array_dup1 (gpointer* self, int length, GBoxedCopyFunc g_dup_func) { - gpointer* result; - int i; - result = g_new0 (gpointer, length); - for (i = 0; i < length; i++) { - gpointer _tmp0_ = NULL; - _tmp0_ = ((self[i] != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) self[i]) : ((gpointer) self[i]); - result[i] = _tmp0_; - } - return result; -} - - GeeArrayList* gee_array_list_construct_wrap (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gpointer* items, int items_length1, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify) { GeeArrayList * self = NULL; GeeEqualDataFunc _tmp0_ = NULL; @@ -614,8 +615,8 @@ gint _tmp5__length1 = 0; gpointer* _tmp6_ = NULL; gint _tmp6__length1 = 0; - gpointer* _tmp7_ = NULL; - gint _tmp7__length1 = 0; + gint _tmp7_ = 0; + gpointer* _tmp8_ = NULL; self = (GeeArrayList*) gee_abstract_bidir_list_construct (object_type, g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func); self->priv->g_type = g_type; self->priv->g_dup_func = g_dup_func; @@ -640,15 +641,15 @@ gee_array_list_set_equal_func (self, _tmp4_, _tmp4__target); _tmp5_ = items; _tmp5__length1 = items_length1; - _tmp6_ = (_tmp5_ != NULL) ? _vala_array_dup1 (_tmp5_, _tmp5__length1, g_dup_func) : ((gpointer) _tmp5_); - _tmp6__length1 = _tmp5__length1; + self->_size = _tmp5__length1; + _tmp6_ = items; + _tmp6__length1 = items_length1; + items = NULL; + _tmp8_ = gee_array_list_do_wrap (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, _tmp6_, _tmp6__length1, &_tmp7_); self->_items = (_vala_array_free (self->_items, self->_items_length1, (GDestroyNotify) g_destroy_func), NULL); - self->_items = _tmp6_; - self->_items_length1 = _tmp6__length1; + self->_items = _tmp8_; + self->_items_length1 = _tmp7_; self->__items_size_ = self->_items_length1; - _tmp7_ = items; - _tmp7__length1 = items_length1; - self->_size = _tmp7__length1; items = (_vala_array_free (items, items_length1, (GDestroyNotify) g_destroy_func), NULL); (equal_func_target_destroy_notify == NULL) ? NULL : (equal_func_target_destroy_notify (equal_func_target), NULL); equal_func = NULL; @@ -1380,6 +1381,1074 @@ } +static gpointer* gee_array_list_do_wrap (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gpointer* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + GType t = 0UL; + GType _tmp0_ = 0UL; + t = g_type; + _tmp0_ = t; + if (_tmp0_ == G_TYPE_BOOLEAN) { + gpointer* _tmp1_ = NULL; + gint _tmp1__length1 = 0; + gint _tmp2_ = 0; + gpointer* _tmp3_ = NULL; + gpointer* _tmp4_ = NULL; + gint _tmp4__length1 = 0; + _tmp1_ = data; + _tmp1__length1 = data_length1; + _tmp3_ = gee_array_list_wrap_bool (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (gboolean*) _tmp1_, _tmp1__length1, &_tmp2_); + _tmp4_ = _tmp3_; + _tmp4__length1 = _tmp2_; + if (result_length1) { + *result_length1 = _tmp4__length1; + } + result = _tmp4_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp5_ = 0UL; + _tmp5_ = t; + if (_tmp5_ == G_TYPE_CHAR) { + gpointer* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gint _tmp7_ = 0; + gpointer* _tmp8_ = NULL; + gpointer* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + _tmp6_ = data; + _tmp6__length1 = data_length1; + _tmp8_ = gee_array_list_wrap_char (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (gchar*) _tmp6_, _tmp6__length1, &_tmp7_); + _tmp9_ = _tmp8_; + _tmp9__length1 = _tmp7_; + if (result_length1) { + *result_length1 = _tmp9__length1; + } + result = _tmp9_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp10_ = 0UL; + _tmp10_ = t; + if (_tmp10_ == G_TYPE_UCHAR) { + gpointer* _tmp11_ = NULL; + gint _tmp11__length1 = 0; + gint _tmp12_ = 0; + gpointer* _tmp13_ = NULL; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp11_ = data; + _tmp11__length1 = data_length1; + _tmp13_ = gee_array_list_wrap_uchar (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (guchar*) _tmp11_, _tmp11__length1, &_tmp12_); + _tmp14_ = _tmp13_; + _tmp14__length1 = _tmp12_; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp15_ = 0UL; + _tmp15_ = t; + if (_tmp15_ == G_TYPE_INT) { + gpointer* _tmp16_ = NULL; + gint _tmp16__length1 = 0; + gint _tmp17_ = 0; + gpointer* _tmp18_ = NULL; + gpointer* _tmp19_ = NULL; + gint _tmp19__length1 = 0; + _tmp16_ = data; + _tmp16__length1 = data_length1; + _tmp18_ = gee_array_list_wrap_int (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (gint*) _tmp16_, _tmp16__length1, &_tmp17_); + _tmp19_ = _tmp18_; + _tmp19__length1 = _tmp17_; + if (result_length1) { + *result_length1 = _tmp19__length1; + } + result = _tmp19_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp20_ = 0UL; + _tmp20_ = t; + if (_tmp20_ == G_TYPE_UINT) { + gpointer* _tmp21_ = NULL; + gint _tmp21__length1 = 0; + gint _tmp22_ = 0; + gpointer* _tmp23_ = NULL; + gpointer* _tmp24_ = NULL; + gint _tmp24__length1 = 0; + _tmp21_ = data; + _tmp21__length1 = data_length1; + _tmp23_ = gee_array_list_wrap_uint (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (guint*) _tmp21_, _tmp21__length1, &_tmp22_); + _tmp24_ = _tmp23_; + _tmp24__length1 = _tmp22_; + if (result_length1) { + *result_length1 = _tmp24__length1; + } + result = _tmp24_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp25_ = 0UL; + _tmp25_ = t; + if (_tmp25_ == G_TYPE_INT64) { + gpointer* _tmp26_ = NULL; + gint _tmp26__length1 = 0; + gint _tmp27_ = 0; + gpointer* _tmp28_ = NULL; + gpointer* _tmp29_ = NULL; + gint _tmp29__length1 = 0; + _tmp26_ = data; + _tmp26__length1 = data_length1; + _tmp28_ = gee_array_list_wrap_int64 (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (gint64*) _tmp26_, _tmp26__length1, &_tmp27_); + _tmp29_ = _tmp28_; + _tmp29__length1 = _tmp27_; + if (result_length1) { + *result_length1 = _tmp29__length1; + } + result = _tmp29_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp30_ = 0UL; + _tmp30_ = t; + if (_tmp30_ == G_TYPE_UINT64) { + gpointer* _tmp31_ = NULL; + gint _tmp31__length1 = 0; + gint _tmp32_ = 0; + gpointer* _tmp33_ = NULL; + gpointer* _tmp34_ = NULL; + gint _tmp34__length1 = 0; + _tmp31_ = data; + _tmp31__length1 = data_length1; + _tmp33_ = gee_array_list_wrap_uint64 (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (guint64*) _tmp31_, _tmp31__length1, &_tmp32_); + _tmp34_ = _tmp33_; + _tmp34__length1 = _tmp32_; + if (result_length1) { + *result_length1 = _tmp34__length1; + } + result = _tmp34_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp35_ = 0UL; + _tmp35_ = t; + if (_tmp35_ == G_TYPE_LONG) { + gpointer* _tmp36_ = NULL; + gint _tmp36__length1 = 0; + gint _tmp37_ = 0; + gpointer* _tmp38_ = NULL; + gpointer* _tmp39_ = NULL; + gint _tmp39__length1 = 0; + _tmp36_ = data; + _tmp36__length1 = data_length1; + _tmp38_ = gee_array_list_wrap_long (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (glong*) _tmp36_, _tmp36__length1, &_tmp37_); + _tmp39_ = _tmp38_; + _tmp39__length1 = _tmp37_; + if (result_length1) { + *result_length1 = _tmp39__length1; + } + result = _tmp39_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp40_ = 0UL; + _tmp40_ = t; + if (_tmp40_ == G_TYPE_ULONG) { + gpointer* _tmp41_ = NULL; + gint _tmp41__length1 = 0; + gint _tmp42_ = 0; + gpointer* _tmp43_ = NULL; + gpointer* _tmp44_ = NULL; + gint _tmp44__length1 = 0; + _tmp41_ = data; + _tmp41__length1 = data_length1; + _tmp43_ = gee_array_list_wrap_ulong (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (gulong*) _tmp41_, _tmp41__length1, &_tmp42_); + _tmp44_ = _tmp43_; + _tmp44__length1 = _tmp42_; + if (result_length1) { + *result_length1 = _tmp44__length1; + } + result = _tmp44_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp45_ = 0UL; + _tmp45_ = t; + if (_tmp45_ == G_TYPE_FLOAT) { + gpointer* _tmp46_ = NULL; + gint _tmp46__length1 = 0; + gint _tmp47_ = 0; + gpointer* _tmp48_ = NULL; + gpointer* _tmp49_ = NULL; + gint _tmp49__length1 = 0; + _tmp46_ = data; + _tmp46__length1 = data_length1; + _tmp48_ = gee_array_list_wrap_float (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (gfloat**) _tmp46_, _tmp46__length1, &_tmp47_); + _tmp49_ = _tmp48_; + _tmp49__length1 = _tmp47_; + if (result_length1) { + *result_length1 = _tmp49__length1; + } + result = _tmp49_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + GType _tmp50_ = 0UL; + _tmp50_ = t; + if (_tmp50_ == G_TYPE_DOUBLE) { + gpointer* _tmp51_ = NULL; + gint _tmp51__length1 = 0; + gint _tmp52_ = 0; + gpointer* _tmp53_ = NULL; + gpointer* _tmp54_ = NULL; + gint _tmp54__length1 = 0; + _tmp51_ = data; + _tmp51__length1 = data_length1; + _tmp53_ = gee_array_list_wrap_double (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, (gdouble**) _tmp51_, _tmp51__length1, &_tmp52_); + _tmp54_ = _tmp53_; + _tmp54__length1 = _tmp52_; + if (result_length1) { + *result_length1 = _tmp54__length1; + } + result = _tmp54_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } else { + gpointer* _tmp55_ = NULL; + gint _tmp55__length1 = 0; + gpointer* _tmp56_ = NULL; + gint _tmp56__length1 = 0; + _tmp55_ = data; + _tmp55__length1 = data_length1; + data = NULL; + _tmp56_ = _tmp55_; + _tmp56__length1 = _tmp55__length1; + if (result_length1) { + *result_length1 = _tmp56__length1; + } + result = _tmp56_; + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); + return result; + } + } + } + } + } + } + } + } + } + } + } + data = (_vala_array_free (data, data_length1, (GDestroyNotify) g_destroy_func), NULL); +} + + +static gpointer* gee_array_list_wrap_bool (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gboolean* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + gboolean* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + gboolean* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + gboolean* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + gboolean _tmp11_ = FALSE; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_char (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gchar* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + gchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + gchar* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + gchar* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + gchar _tmp11_ = '\0'; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_uchar (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guchar* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + guchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + guchar* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + guchar* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + guchar _tmp11_ = '\0'; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_int (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gint* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + gint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + gint* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + gint* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + gint _tmp11_ = 0; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_uint (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + guint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + guint* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + guint* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + guint _tmp11_ = 0U; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_int64 (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gint64* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + gint64* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + gint64* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + gint64* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + gint64 _tmp11_ = 0LL; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_uint64 (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, guint64* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + guint64* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + guint64* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + guint64* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + guint64 _tmp11_ = 0ULL; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_long (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, glong* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + glong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + glong* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + glong* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + glong _tmp11_ = 0L; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_ulong (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gulong* data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + gulong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + gulong* _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + gulong* _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + gulong _tmp11_ = 0UL; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_float (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gfloat** data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + gfloat** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + gfloat** _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + gfloat** _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + gfloat* _tmp11_ = NULL; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + +static gpointer* gee_array_list_wrap_double (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gdouble** data, int data_length1, int* result_length1) { + gpointer* result = NULL; + gpointer* arr = NULL; + gdouble** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + gpointer* _tmp1_ = NULL; + gint arr_length1 = 0; + gint _arr_size_ = 0; + gpointer* _tmp14_ = NULL; + gint _tmp14__length1 = 0; + _tmp0_ = data; + _tmp0__length1 = data_length1; + _tmp1_ = g_new0 (gpointer, _tmp0__length1); + arr = _tmp1_; + arr_length1 = _tmp0__length1; + _arr_size_ = arr_length1; + { + guint i = 0U; + i = (guint) 0; + { + gboolean _tmp2_ = FALSE; + _tmp2_ = TRUE; + while (TRUE) { + gboolean _tmp3_ = FALSE; + guint _tmp5_ = 0U; + gdouble** _tmp6_ = NULL; + gint _tmp6__length1 = 0; + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + guint _tmp8_ = 0U; + gdouble** _tmp9_ = NULL; + gint _tmp9__length1 = 0; + guint _tmp10_ = 0U; + gdouble* _tmp11_ = NULL; + gpointer _tmp12_ = NULL; + gpointer _tmp13_ = NULL; + _tmp3_ = _tmp2_; + if (!_tmp3_) { + guint _tmp4_ = 0U; + _tmp4_ = i; + i = _tmp4_ + 1; + } + _tmp2_ = FALSE; + _tmp5_ = i; + _tmp6_ = data; + _tmp6__length1 = data_length1; + if (!(_tmp5_ < ((guint) _tmp6__length1))) { + break; + } + _tmp7_ = arr; + _tmp7__length1 = arr_length1; + _tmp8_ = i; + _tmp9_ = data; + _tmp9__length1 = data_length1; + _tmp10_ = i; + _tmp11_ = _tmp9_[_tmp10_]; + _tmp12_ = ((_tmp11_ != NULL) && (g_dup_func != NULL)) ? g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _g_destroy_func0 (_tmp7_[_tmp8_]); + _tmp7_[_tmp8_] = _tmp12_; + _tmp13_ = _tmp7_[_tmp8_]; + } + } + } + _tmp14_ = arr; + _tmp14__length1 = arr_length1; + if (result_length1) { + *result_length1 = _tmp14__length1; + } + result = _tmp14_; + return result; +} + + static gint gee_array_list_real_get_size (GeeAbstractCollection* base) { gint result; GeeArrayList* self; diff -Nru libgee-0.8-0.10.2/gee/arraylist.vala libgee-0.8-0.10.5/gee/arraylist.vala --- libgee-0.8-0.10.2/gee/arraylist.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/arraylist.vala 2013-09-16 17:41:49.000000000 +0000 @@ -95,8 +95,8 @@ equal_func = Functions.get_equal_func_for (typeof (G)); } this.equal_func = equal_func; - _items = items; _size = items.length; + _items = do_wrap ((owned)items); } /** @@ -434,5 +434,122 @@ return true; } } + + private static G[] do_wrap (owned G[] data) { + var t = typeof (G); + if (t == typeof (bool)) { + return wrap_bool ((bool[])data); + } else if (t == typeof (char)) { + return wrap_char ((char[])data); + } else if (t == typeof (uchar)) { + return wrap_uchar ((uchar[])data); + } else if (t == typeof (int)) { + return wrap_int ((int[])data); + } else if (t == typeof (uint)) { + return wrap_uint ((uint[])data); + } else if (t == typeof (int64)) { + return wrap_int64 ((int64[])data); + } else if (t == typeof (uint64)) { + return wrap_uint64 ((uint64[])data); + } else if (t == typeof (long)) { + return wrap_long ((long[])data); + } else if (t == typeof (ulong)) { + return wrap_ulong ((ulong[])data); + } else if (t == typeof (float)) { + return wrap_float ((float?[])data); + } else if (t == typeof (double)) { + return wrap_double ((double?[])data); + } else { + return (owned)data; + } + } + + private static G[] wrap_bool (bool[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_char (char[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_uchar (uchar[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_int (int[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_uint (uint[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_int64 (int64[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_uint64 (uint64[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_long (long[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_ulong (ulong[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_float (float?[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } + + private static G[] wrap_double (double?[] data) { + G[] arr = new G[data.length]; + for (uint i = 0; i < data.length; i++) { + arr[i] = data[i]; + } + return arr; + } } diff -Nru libgee-0.8-0.10.2/gee/arrayqueue.c libgee-0.8-0.10.5/gee/arrayqueue.c --- libgee-0.8-0.10.2/gee/arrayqueue.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/arrayqueue.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* arrayqueue.c generated by valac 0.20.1.52-2186, the Vala compiler +/* arrayqueue.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from arrayqueue.vala, do not modify */ /* arrayqueue.vala @@ -1527,6 +1527,8 @@ gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; + GeeArrayQueue* _tmp25_ = NULL; + gint _tmp26_ = 0; self = (GeeArrayQueueIterator*) base; _tmp0_ = self->priv->_queue; _tmp1_ = _tmp0_->priv->_stamp; @@ -1604,6 +1606,9 @@ } } } + _tmp25_ = self->priv->_queue; + _tmp26_ = _tmp25_->priv->_length; + self->priv->_offset = _tmp26_ - 1; result = TRUE; return result; } diff -Nru libgee-0.8-0.10.2/gee/arrayqueue.vala libgee-0.8-0.10.5/gee/arrayqueue.vala --- libgee-0.8-0.10.2/gee/arrayqueue.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/arrayqueue.vala 2013-09-16 17:41:45.000000000 +0000 @@ -324,6 +324,7 @@ return false; } } + _offset = _queue._length - 1; return true; } diff -Nru libgee-0.8-0.10.2/gee/assemblyinfo.c libgee-0.8-0.10.5/gee/assemblyinfo.c --- libgee-0.8-0.10.2/gee/assemblyinfo.c 2013-07-12 18:56:23.000000000 +0000 +++ libgee-0.8-0.10.5/gee/assemblyinfo.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* assemblyinfo.c generated by valac 0.20.1.52-2186, the Vala compiler +/* assemblyinfo.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from assemblyinfo.vala, do not modify */ /* functions.vala diff -Nru libgee-0.8-0.10.2/gee/bidiriterator.c libgee-0.8-0.10.5/gee/bidiriterator.c --- libgee-0.8-0.10.2/gee/bidiriterator.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/bidiriterator.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* bidiriterator.c generated by valac 0.20.1.52-2186, the Vala compiler +/* bidiriterator.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from bidiriterator.vala, do not modify */ /* bidiriterator.vala diff -Nru libgee-0.8-0.10.2/gee/bidirlist.c libgee-0.8-0.10.5/gee/bidirlist.c --- libgee-0.8-0.10.2/gee/bidirlist.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/bidirlist.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* bidirlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* bidirlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from bidirlist.vala, do not modify */ /* bidirlist.vala diff -Nru libgee-0.8-0.10.2/gee/bidirlistiterator.c libgee-0.8-0.10.5/gee/bidirlistiterator.c --- libgee-0.8-0.10.2/gee/bidirlistiterator.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/bidirlistiterator.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* bidirlistiterator.c generated by valac 0.20.1.52-2186, the Vala compiler +/* bidirlistiterator.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from bidirlistiterator.vala, do not modify */ /* bidirlistiterator.vala diff -Nru libgee-0.8-0.10.2/gee/bidirmapiterator.c libgee-0.8-0.10.5/gee/bidirmapiterator.c --- libgee-0.8-0.10.2/gee/bidirmapiterator.c 2013-07-12 18:56:23.000000000 +0000 +++ libgee-0.8-0.10.5/gee/bidirmapiterator.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* bidirmapiterator.c generated by valac 0.20.1.52-2186, the Vala compiler +/* bidirmapiterator.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from bidirmapiterator.vala, do not modify */ /* bidiriterator.vala diff -Nru libgee-0.8-0.10.2/gee/bidirsortedmap.c libgee-0.8-0.10.5/gee/bidirsortedmap.c --- libgee-0.8-0.10.2/gee/bidirsortedmap.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/bidirsortedmap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* bidirsortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* bidirsortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from bidirsortedmap.vala, do not modify */ /* bidirsortedmap.vala diff -Nru libgee-0.8-0.10.2/gee/bidirsortedset.c libgee-0.8-0.10.5/gee/bidirsortedset.c --- libgee-0.8-0.10.2/gee/bidirsortedset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/bidirsortedset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* bidirsortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* bidirsortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from bidirsortedset.vala, do not modify */ /* bidirsortedset.vala diff -Nru libgee-0.8-0.10.2/gee/collection.c libgee-0.8-0.10.5/gee/collection.c --- libgee-0.8-0.10.2/gee/collection.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/collection.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* collection.c generated by valac 0.20.1.52-2186, the Vala compiler +/* collection.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from collection.vala, do not modify */ /* collection.vala @@ -27,7 +27,6 @@ #include #include #include -#include #define GEE_TYPE_TRAVERSABLE (gee_traversable_get_type ()) @@ -74,7 +73,6 @@ typedef struct _GeeCollection GeeCollection; typedef struct _GeeCollectionIface GeeCollectionIface; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) #define GEE_TYPE_ABSTRACT_COLLECTION (gee_abstract_collection_get_type ()) #define GEE_ABSTRACT_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)) @@ -113,6 +111,7 @@ typedef struct _GeeSet GeeSet; typedef struct _GeeSetIface GeeSetIface; +#define _g_free0(var) ((var == NULL) ? NULL : (var = (g_free (var), NULL))) typedef gboolean (*GeeForallFunc) (gpointer g, void* user_data); typedef enum { @@ -233,18 +232,49 @@ static guchar* gee_collection_to_uchar_array (GeeCollection* coll, int* result_length1); static gint* gee_collection_to_int_array (GeeCollection* coll, int* result_length1); static guint* gee_collection_to_uint_array (GeeCollection* coll, int* result_length1); -static gint64* gee_collection_to_int64_array (GeeCollection* coll, int* result_length1); -static guint64* gee_collection_to_uint64_array (GeeCollection* coll, int* result_length1); +static gint64** gee_collection_to_int64_array (GeeCollection* coll, int* result_length1); +static guint64** gee_collection_to_uint64_array (GeeCollection* coll, int* result_length1); static glong* gee_collection_to_long_array (GeeCollection* coll, int* result_length1); static gulong* gee_collection_to_ulong_array (GeeCollection* coll, int* result_length1); static gfloat** gee_collection_to_float_array (GeeCollection* coll, int* result_length1); static gdouble** gee_collection_to_double_array (GeeCollection* coll, int* result_length1); gint gee_collection_get_size (GeeCollection* self); gboolean gee_collection_add_all_array (GeeCollection* self, gpointer* array, int array_length1); +static gboolean gee_collection_add_all_bool_array (GeeCollection* coll, gboolean* arr, int arr_length1); +static gboolean gee_collection_add_all_char_array (GeeCollection* coll, gchar* arr, int arr_length1); +static gboolean gee_collection_add_all_uchar_array (GeeCollection* coll, guchar* arr, int arr_length1); +static gboolean gee_collection_add_all_int_array (GeeCollection* coll, gint* arr, int arr_length1); +static gboolean gee_collection_add_all_uint_array (GeeCollection* coll, guint* arr, int arr_length1); +static gboolean gee_collection_add_all_int64_array (GeeCollection* coll, gint64** arr, int arr_length1); +static gboolean gee_collection_add_all_uint64_array (GeeCollection* coll, guint64** arr, int arr_length1); +static gboolean gee_collection_add_all_long_array (GeeCollection* coll, glong* arr, int arr_length1); +static gboolean gee_collection_add_all_ulong_array (GeeCollection* coll, gulong* arr, int arr_length1); +static gboolean gee_collection_add_all_float_array (GeeCollection* coll, gfloat** arr, int arr_length1); +static gboolean gee_collection_add_all_double_array (GeeCollection* coll, gdouble** arr, int arr_length1); gboolean gee_collection_contains_all_array (GeeCollection* self, gpointer* array, int array_length1); +static gboolean gee_collection_contains_all_bool_array (GeeCollection* coll, gboolean* arr, int arr_length1); +static gboolean gee_collection_contains_all_char_array (GeeCollection* coll, gchar* arr, int arr_length1); +static gboolean gee_collection_contains_all_uchar_array (GeeCollection* coll, guchar* arr, int arr_length1); +static gboolean gee_collection_contains_all_int_array (GeeCollection* coll, gint* arr, int arr_length1); +static gboolean gee_collection_contains_all_uint_array (GeeCollection* coll, guint* arr, int arr_length1); +static gboolean gee_collection_contains_all_int64_array (GeeCollection* coll, gint64** arr, int arr_length1); +static gboolean gee_collection_contains_all_uint64_array (GeeCollection* coll, guint64** arr, int arr_length1); +static gboolean gee_collection_contains_all_long_array (GeeCollection* coll, glong* arr, int arr_length1); +static gboolean gee_collection_contains_all_ulong_array (GeeCollection* coll, gulong* arr, int arr_length1); +static gboolean gee_collection_contains_all_float_array (GeeCollection* coll, gfloat** arr, int arr_length1); +static gboolean gee_collection_contains_all_double_array (GeeCollection* coll, gdouble** arr, int arr_length1); gboolean gee_collection_remove_all_array (GeeCollection* self, gpointer* array, int array_length1); -static gfloat* _float_dup (gfloat* self); -static gdouble* _double_dup (gdouble* self); +static gboolean gee_collection_remove_all_bool_array (GeeCollection* coll, gboolean* arr, int arr_length1); +static gboolean gee_collection_remove_all_char_array (GeeCollection* coll, gchar* arr, int arr_length1); +static gboolean gee_collection_remove_all_uchar_array (GeeCollection* coll, guchar* arr, int arr_length1); +static gboolean gee_collection_remove_all_int_array (GeeCollection* coll, gint* arr, int arr_length1); +static gboolean gee_collection_remove_all_uint_array (GeeCollection* coll, guint* arr, int arr_length1); +static gboolean gee_collection_remove_all_int64_array (GeeCollection* coll, gint64** arr, int arr_length1); +static gboolean gee_collection_remove_all_uint64_array (GeeCollection* coll, guint64** arr, int arr_length1); +static gboolean gee_collection_remove_all_long_array (GeeCollection* coll, glong* arr, int arr_length1); +static gboolean gee_collection_remove_all_ulong_array (GeeCollection* coll, gulong* arr, int arr_length1); +static gboolean gee_collection_remove_all_float_array (GeeCollection* coll, gfloat** arr, int arr_length1); +static gboolean gee_collection_remove_all_double_array (GeeCollection* coll, gdouble** arr, int arr_length1); GeeCollection* gee_collection_empty (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func); GeeHashSet* gee_hash_set_new (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify); GeeHashSet* gee_hash_set_construct (GType object_type, GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, GeeHashDataFunc hash_func, void* hash_func_target, GDestroyNotify hash_func_target_destroy_notify, GeeEqualDataFunc equal_func, void* equal_func_target, GDestroyNotify equal_func_target_destroy_notify); @@ -617,7 +647,7 @@ _tmp20_ = t; if (_tmp20_ == G_TYPE_INT64) { gint _tmp21_ = 0; - gint64* _tmp22_ = NULL; + gint64** _tmp22_ = NULL; gpointer* _tmp23_ = NULL; gint _tmp23__length1 = 0; _tmp22_ = gee_collection_to_int64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), &_tmp21_); @@ -633,7 +663,7 @@ _tmp24_ = t; if (_tmp24_ == G_TYPE_UINT64) { gint _tmp25_ = 0; - guint64* _tmp26_ = NULL; + guint64** _tmp26_ = NULL; gpointer* _tmp27_ = NULL; gint _tmp27__length1 = 0; _tmp26_ = gee_collection_to_uint64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), &_tmp25_); @@ -716,8 +746,8 @@ gint array_length1 = 0; gint _array_size_ = 0; gint index = 0; - gpointer* _tmp57_ = NULL; - gint _tmp57__length1 = 0; + gpointer* _tmp56_ = NULL; + gint _tmp56__length1 = 0; _tmp44_ = gee_collection_get_size (self); _tmp45_ = _tmp44_; _tmp46_ = g_new0 (gpointer, _tmp45_); @@ -739,9 +769,8 @@ gpointer* _tmp52_ = NULL; gint _tmp52__length1 = 0; gint _tmp53_ = 0; - gconstpointer _tmp54_ = NULL; + gpointer _tmp54_ = NULL; gpointer _tmp55_ = NULL; - gpointer _tmp56_ = NULL; _tmp48_ = _element_it; _tmp49_ = gee_iterator_next (_tmp48_); if (!_tmp49_) { @@ -755,20 +784,20 @@ _tmp53_ = index; index = _tmp53_ + 1; _tmp54_ = element; - _tmp55_ = ((_tmp54_ != NULL) && (GEE_COLLECTION_GET_INTERFACE (self)->get_g_dup_func (self) != NULL)) ? GEE_COLLECTION_GET_INTERFACE (self)->get_g_dup_func (self) ((gpointer) _tmp54_) : ((gpointer) _tmp54_); + element = NULL; ((_tmp52_[_tmp53_] == NULL) || (GEE_COLLECTION_GET_INTERFACE (self)->get_g_destroy_func (self) == NULL)) ? NULL : (_tmp52_[_tmp53_] = (GEE_COLLECTION_GET_INTERFACE (self)->get_g_destroy_func (self) (_tmp52_[_tmp53_]), NULL)); - _tmp52_[_tmp53_] = _tmp55_; - _tmp56_ = _tmp52_[_tmp53_]; + _tmp52_[_tmp53_] = _tmp54_; + _tmp55_ = _tmp52_[_tmp53_]; ((element == NULL) || (GEE_COLLECTION_GET_INTERFACE (self)->get_g_destroy_func (self) == NULL)) ? NULL : (element = (GEE_COLLECTION_GET_INTERFACE (self)->get_g_destroy_func (self) (element), NULL)); } _g_object_unref0 (_element_it); } - _tmp57_ = array; - _tmp57__length1 = array_length1; + _tmp56_ = array; + _tmp56__length1 = array_length1; if (result_length1) { - *result_length1 = _tmp57__length1; + *result_length1 = _tmp56__length1; } - result = _tmp57_; + result = _tmp56_; return result; } } @@ -800,35 +829,180 @@ */ gboolean gee_collection_add_all_array (GeeCollection* self, gpointer* array, int array_length1) { gboolean result = FALSE; - gboolean changed = FALSE; - gpointer* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - changed = FALSE; - _tmp0_ = array; - _tmp0__length1 = array_length1; - { - gpointer* item_collection = NULL; - gint item_collection_length1 = 0; - gint _item_collection_size_ = 0; - gint item_it = 0; - item_collection = _tmp0_; - item_collection_length1 = _tmp0__length1; - for (item_it = 0; item_it < _tmp0__length1; item_it = item_it + 1) { - gconstpointer item = NULL; - item = item_collection[item_it]; - { - gboolean _tmp1_ = FALSE; - gconstpointer _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - _tmp1_ = changed; - _tmp2_ = item; - _tmp3_ = gee_collection_add (self, _tmp2_); - changed = _tmp1_ | _tmp3_; + GType t = 0UL; + GType _tmp0_ = 0UL; + t = GEE_COLLECTION_GET_INTERFACE (self)->get_g_type (self); + _tmp0_ = t; + if (_tmp0_ == G_TYPE_BOOLEAN) { + gpointer* _tmp1_ = NULL; + gint _tmp1__length1 = 0; + gboolean _tmp2_ = FALSE; + _tmp1_ = array; + _tmp1__length1 = array_length1; + _tmp2_ = gee_collection_add_all_bool_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gboolean*) _tmp1_, _tmp1__length1); + result = _tmp2_; + return result; + } else { + GType _tmp3_ = 0UL; + _tmp3_ = t; + if (_tmp3_ == G_TYPE_CHAR) { + gpointer* _tmp4_ = NULL; + gint _tmp4__length1 = 0; + gboolean _tmp5_ = FALSE; + _tmp4_ = array; + _tmp4__length1 = array_length1; + _tmp5_ = gee_collection_add_all_char_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gchar*) _tmp4_, _tmp4__length1); + result = _tmp5_; + return result; + } else { + GType _tmp6_ = 0UL; + _tmp6_ = t; + if (_tmp6_ == G_TYPE_UCHAR) { + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + gboolean _tmp8_ = FALSE; + _tmp7_ = array; + _tmp7__length1 = array_length1; + _tmp8_ = gee_collection_add_all_uchar_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guchar*) _tmp7_, _tmp7__length1); + result = _tmp8_; + return result; + } else { + GType _tmp9_ = 0UL; + _tmp9_ = t; + if (_tmp9_ == G_TYPE_INT) { + gpointer* _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gboolean _tmp11_ = FALSE; + _tmp10_ = array; + _tmp10__length1 = array_length1; + _tmp11_ = gee_collection_add_all_int_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gint*) _tmp10_, _tmp10__length1); + result = _tmp11_; + return result; + } else { + GType _tmp12_ = 0UL; + _tmp12_ = t; + if (_tmp12_ == G_TYPE_UINT) { + gpointer* _tmp13_ = NULL; + gint _tmp13__length1 = 0; + gboolean _tmp14_ = FALSE; + _tmp13_ = array; + _tmp13__length1 = array_length1; + _tmp14_ = gee_collection_add_all_uint_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guint*) _tmp13_, _tmp13__length1); + result = _tmp14_; + return result; + } else { + GType _tmp15_ = 0UL; + _tmp15_ = t; + if (_tmp15_ == G_TYPE_INT64) { + gpointer* _tmp16_ = NULL; + gint _tmp16__length1 = 0; + gboolean _tmp17_ = FALSE; + _tmp16_ = array; + _tmp16__length1 = array_length1; + _tmp17_ = gee_collection_add_all_int64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gint64**) _tmp16_, _tmp16__length1); + result = _tmp17_; + return result; + } else { + GType _tmp18_ = 0UL; + _tmp18_ = t; + if (_tmp18_ == G_TYPE_UINT64) { + gpointer* _tmp19_ = NULL; + gint _tmp19__length1 = 0; + gboolean _tmp20_ = FALSE; + _tmp19_ = array; + _tmp19__length1 = array_length1; + _tmp20_ = gee_collection_add_all_uint64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guint64**) _tmp19_, _tmp19__length1); + result = _tmp20_; + return result; + } else { + GType _tmp21_ = 0UL; + _tmp21_ = t; + if (_tmp21_ == G_TYPE_LONG) { + gpointer* _tmp22_ = NULL; + gint _tmp22__length1 = 0; + gboolean _tmp23_ = FALSE; + _tmp22_ = array; + _tmp22__length1 = array_length1; + _tmp23_ = gee_collection_add_all_long_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (glong*) _tmp22_, _tmp22__length1); + result = _tmp23_; + return result; + } else { + GType _tmp24_ = 0UL; + _tmp24_ = t; + if (_tmp24_ == G_TYPE_ULONG) { + gpointer* _tmp25_ = NULL; + gint _tmp25__length1 = 0; + gboolean _tmp26_ = FALSE; + _tmp25_ = array; + _tmp25__length1 = array_length1; + _tmp26_ = gee_collection_add_all_ulong_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gulong*) _tmp25_, _tmp25__length1); + result = _tmp26_; + return result; + } else { + GType _tmp27_ = 0UL; + _tmp27_ = t; + if (_tmp27_ == G_TYPE_FLOAT) { + gpointer* _tmp28_ = NULL; + gint _tmp28__length1 = 0; + gboolean _tmp29_ = FALSE; + _tmp28_ = array; + _tmp28__length1 = array_length1; + _tmp29_ = gee_collection_add_all_float_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gfloat**) _tmp28_, _tmp28__length1); + result = _tmp29_; + return result; + } else { + GType _tmp30_ = 0UL; + _tmp30_ = t; + if (_tmp30_ == G_TYPE_DOUBLE) { + gpointer* _tmp31_ = NULL; + gint _tmp31__length1 = 0; + gboolean _tmp32_ = FALSE; + _tmp31_ = array; + _tmp31__length1 = array_length1; + _tmp32_ = gee_collection_add_all_double_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gdouble**) _tmp31_, _tmp31__length1); + result = _tmp32_; + return result; + } else { + gboolean changed = FALSE; + gpointer* _tmp33_ = NULL; + gint _tmp33__length1 = 0; + changed = FALSE; + _tmp33_ = array; + _tmp33__length1 = array_length1; + { + gpointer* item_collection = NULL; + gint item_collection_length1 = 0; + gint _item_collection_size_ = 0; + gint item_it = 0; + item_collection = _tmp33_; + item_collection_length1 = _tmp33__length1; + for (item_it = 0; item_it < _tmp33__length1; item_it = item_it + 1) { + gconstpointer item = NULL; + item = item_collection[item_it]; + { + gboolean _tmp34_ = FALSE; + gconstpointer _tmp35_ = NULL; + gboolean _tmp36_ = FALSE; + _tmp34_ = changed; + _tmp35_ = item; + _tmp36_ = gee_collection_add (self, _tmp35_); + changed = _tmp34_ | _tmp36_; + } + } + } + result = changed; + return result; + } + } + } + } + } + } + } + } } } } - result = changed; - return result; } @@ -843,34 +1017,179 @@ */ gboolean gee_collection_contains_all_array (GeeCollection* self, gpointer* array, int array_length1) { gboolean result = FALSE; - gpointer* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - _tmp0_ = array; - _tmp0__length1 = array_length1; - { - gpointer* item_collection = NULL; - gint item_collection_length1 = 0; - gint _item_collection_size_ = 0; - gint item_it = 0; - item_collection = _tmp0_; - item_collection_length1 = _tmp0__length1; - for (item_it = 0; item_it < _tmp0__length1; item_it = item_it + 1) { - gconstpointer item = NULL; - item = item_collection[item_it]; - { - gconstpointer _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - _tmp1_ = item; - _tmp2_ = gee_collection_contains (self, _tmp1_); - if (!_tmp2_) { - result = FALSE; + GType t = 0UL; + GType _tmp0_ = 0UL; + t = GEE_COLLECTION_GET_INTERFACE (self)->get_g_type (self); + _tmp0_ = t; + if (_tmp0_ == G_TYPE_BOOLEAN) { + gpointer* _tmp1_ = NULL; + gint _tmp1__length1 = 0; + gboolean _tmp2_ = FALSE; + _tmp1_ = array; + _tmp1__length1 = array_length1; + _tmp2_ = gee_collection_contains_all_bool_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gboolean*) _tmp1_, _tmp1__length1); + result = _tmp2_; + return result; + } else { + GType _tmp3_ = 0UL; + _tmp3_ = t; + if (_tmp3_ == G_TYPE_CHAR) { + gpointer* _tmp4_ = NULL; + gint _tmp4__length1 = 0; + gboolean _tmp5_ = FALSE; + _tmp4_ = array; + _tmp4__length1 = array_length1; + _tmp5_ = gee_collection_contains_all_char_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gchar*) _tmp4_, _tmp4__length1); + result = _tmp5_; + return result; + } else { + GType _tmp6_ = 0UL; + _tmp6_ = t; + if (_tmp6_ == G_TYPE_UCHAR) { + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + gboolean _tmp8_ = FALSE; + _tmp7_ = array; + _tmp7__length1 = array_length1; + _tmp8_ = gee_collection_contains_all_uchar_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guchar*) _tmp7_, _tmp7__length1); + result = _tmp8_; + return result; + } else { + GType _tmp9_ = 0UL; + _tmp9_ = t; + if (_tmp9_ == G_TYPE_INT) { + gpointer* _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gboolean _tmp11_ = FALSE; + _tmp10_ = array; + _tmp10__length1 = array_length1; + _tmp11_ = gee_collection_contains_all_int_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gint*) _tmp10_, _tmp10__length1); + result = _tmp11_; return result; + } else { + GType _tmp12_ = 0UL; + _tmp12_ = t; + if (_tmp12_ == G_TYPE_UINT) { + gpointer* _tmp13_ = NULL; + gint _tmp13__length1 = 0; + gboolean _tmp14_ = FALSE; + _tmp13_ = array; + _tmp13__length1 = array_length1; + _tmp14_ = gee_collection_contains_all_uint_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guint*) _tmp13_, _tmp13__length1); + result = _tmp14_; + return result; + } else { + GType _tmp15_ = 0UL; + _tmp15_ = t; + if (_tmp15_ == G_TYPE_INT64) { + gpointer* _tmp16_ = NULL; + gint _tmp16__length1 = 0; + gboolean _tmp17_ = FALSE; + _tmp16_ = array; + _tmp16__length1 = array_length1; + _tmp17_ = gee_collection_contains_all_int64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gint64**) _tmp16_, _tmp16__length1); + result = _tmp17_; + return result; + } else { + GType _tmp18_ = 0UL; + _tmp18_ = t; + if (_tmp18_ == G_TYPE_UINT64) { + gpointer* _tmp19_ = NULL; + gint _tmp19__length1 = 0; + gboolean _tmp20_ = FALSE; + _tmp19_ = array; + _tmp19__length1 = array_length1; + _tmp20_ = gee_collection_contains_all_uint64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guint64**) _tmp19_, _tmp19__length1); + result = _tmp20_; + return result; + } else { + GType _tmp21_ = 0UL; + _tmp21_ = t; + if (_tmp21_ == G_TYPE_LONG) { + gpointer* _tmp22_ = NULL; + gint _tmp22__length1 = 0; + gboolean _tmp23_ = FALSE; + _tmp22_ = array; + _tmp22__length1 = array_length1; + _tmp23_ = gee_collection_contains_all_long_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (glong*) _tmp22_, _tmp22__length1); + result = _tmp23_; + return result; + } else { + GType _tmp24_ = 0UL; + _tmp24_ = t; + if (_tmp24_ == G_TYPE_ULONG) { + gpointer* _tmp25_ = NULL; + gint _tmp25__length1 = 0; + gboolean _tmp26_ = FALSE; + _tmp25_ = array; + _tmp25__length1 = array_length1; + _tmp26_ = gee_collection_contains_all_ulong_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gulong*) _tmp25_, _tmp25__length1); + result = _tmp26_; + return result; + } else { + GType _tmp27_ = 0UL; + _tmp27_ = t; + if (_tmp27_ == G_TYPE_FLOAT) { + gpointer* _tmp28_ = NULL; + gint _tmp28__length1 = 0; + gboolean _tmp29_ = FALSE; + _tmp28_ = array; + _tmp28__length1 = array_length1; + _tmp29_ = gee_collection_contains_all_float_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gfloat**) _tmp28_, _tmp28__length1); + result = _tmp29_; + return result; + } else { + GType _tmp30_ = 0UL; + _tmp30_ = t; + if (_tmp30_ == G_TYPE_DOUBLE) { + gpointer* _tmp31_ = NULL; + gint _tmp31__length1 = 0; + gboolean _tmp32_ = FALSE; + _tmp31_ = array; + _tmp31__length1 = array_length1; + _tmp32_ = gee_collection_contains_all_double_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gdouble**) _tmp31_, _tmp31__length1); + result = _tmp32_; + return result; + } else { + gpointer* _tmp33_ = NULL; + gint _tmp33__length1 = 0; + _tmp33_ = array; + _tmp33__length1 = array_length1; + { + gpointer* item_collection = NULL; + gint item_collection_length1 = 0; + gint _item_collection_size_ = 0; + gint item_it = 0; + item_collection = _tmp33_; + item_collection_length1 = _tmp33__length1; + for (item_it = 0; item_it < _tmp33__length1; item_it = item_it + 1) { + gconstpointer item = NULL; + item = item_collection[item_it]; + { + gconstpointer _tmp34_ = NULL; + gboolean _tmp35_ = FALSE; + _tmp34_ = item; + _tmp35_ = gee_collection_contains (self, _tmp34_); + if (!_tmp35_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; + } + } + } + } + } + } + } } } } } - result = TRUE; - return result; } @@ -887,34 +1206,202 @@ */ gboolean gee_collection_remove_all_array (GeeCollection* self, gpointer* array, int array_length1) { gboolean result = FALSE; - gboolean changed = FALSE; - gpointer* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - changed = FALSE; - _tmp0_ = array; - _tmp0__length1 = array_length1; - { - gpointer* item_collection = NULL; - gint item_collection_length1 = 0; - gint _item_collection_size_ = 0; - gint item_it = 0; - item_collection = _tmp0_; - item_collection_length1 = _tmp0__length1; - for (item_it = 0; item_it < _tmp0__length1; item_it = item_it + 1) { - gconstpointer item = NULL; - item = item_collection[item_it]; - { - gboolean _tmp1_ = FALSE; - gconstpointer _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - _tmp1_ = changed; - _tmp2_ = item; - _tmp3_ = gee_collection_remove (self, _tmp2_); - changed = _tmp1_ | _tmp3_; + GType t = 0UL; + GType _tmp0_ = 0UL; + t = GEE_COLLECTION_GET_INTERFACE (self)->get_g_type (self); + _tmp0_ = t; + if (_tmp0_ == G_TYPE_BOOLEAN) { + gpointer* _tmp1_ = NULL; + gint _tmp1__length1 = 0; + gboolean _tmp2_ = FALSE; + _tmp1_ = array; + _tmp1__length1 = array_length1; + _tmp2_ = gee_collection_remove_all_bool_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gboolean*) _tmp1_, _tmp1__length1); + result = _tmp2_; + return result; + } else { + GType _tmp3_ = 0UL; + _tmp3_ = t; + if (_tmp3_ == G_TYPE_CHAR) { + gpointer* _tmp4_ = NULL; + gint _tmp4__length1 = 0; + gboolean _tmp5_ = FALSE; + _tmp4_ = array; + _tmp4__length1 = array_length1; + _tmp5_ = gee_collection_remove_all_char_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gchar*) _tmp4_, _tmp4__length1); + result = _tmp5_; + return result; + } else { + GType _tmp6_ = 0UL; + _tmp6_ = t; + if (_tmp6_ == G_TYPE_UCHAR) { + gpointer* _tmp7_ = NULL; + gint _tmp7__length1 = 0; + gboolean _tmp8_ = FALSE; + _tmp7_ = array; + _tmp7__length1 = array_length1; + _tmp8_ = gee_collection_remove_all_uchar_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guchar*) _tmp7_, _tmp7__length1); + result = _tmp8_; + return result; + } else { + GType _tmp9_ = 0UL; + _tmp9_ = t; + if (_tmp9_ == G_TYPE_INT) { + gpointer* _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gboolean _tmp11_ = FALSE; + _tmp10_ = array; + _tmp10__length1 = array_length1; + _tmp11_ = gee_collection_remove_all_int_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gint*) _tmp10_, _tmp10__length1); + result = _tmp11_; + return result; + } else { + GType _tmp12_ = 0UL; + _tmp12_ = t; + if (_tmp12_ == G_TYPE_UINT) { + gpointer* _tmp13_ = NULL; + gint _tmp13__length1 = 0; + gboolean _tmp14_ = FALSE; + _tmp13_ = array; + _tmp13__length1 = array_length1; + _tmp14_ = gee_collection_remove_all_uint_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guint*) _tmp13_, _tmp13__length1); + result = _tmp14_; + return result; + } else { + GType _tmp15_ = 0UL; + _tmp15_ = t; + if (_tmp15_ == G_TYPE_INT64) { + gpointer* _tmp16_ = NULL; + gint _tmp16__length1 = 0; + gboolean _tmp17_ = FALSE; + _tmp16_ = array; + _tmp16__length1 = array_length1; + _tmp17_ = gee_collection_remove_all_int64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gint64**) _tmp16_, _tmp16__length1); + result = _tmp17_; + return result; + } else { + GType _tmp18_ = 0UL; + _tmp18_ = t; + if (_tmp18_ == G_TYPE_UINT64) { + gpointer* _tmp19_ = NULL; + gint _tmp19__length1 = 0; + gboolean _tmp20_ = FALSE; + _tmp19_ = array; + _tmp19__length1 = array_length1; + _tmp20_ = gee_collection_remove_all_uint64_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (guint64**) _tmp19_, _tmp19__length1); + result = _tmp20_; + return result; + } else { + GType _tmp21_ = 0UL; + _tmp21_ = t; + if (_tmp21_ == G_TYPE_LONG) { + gpointer* _tmp22_ = NULL; + gint _tmp22__length1 = 0; + gboolean _tmp23_ = FALSE; + _tmp22_ = array; + _tmp22__length1 = array_length1; + _tmp23_ = gee_collection_remove_all_long_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (glong*) _tmp22_, _tmp22__length1); + result = _tmp23_; + return result; + } else { + GType _tmp24_ = 0UL; + _tmp24_ = t; + if (_tmp24_ == G_TYPE_ULONG) { + gpointer* _tmp25_ = NULL; + gint _tmp25__length1 = 0; + gboolean _tmp26_ = FALSE; + _tmp25_ = array; + _tmp25__length1 = array_length1; + _tmp26_ = gee_collection_remove_all_ulong_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gulong*) _tmp25_, _tmp25__length1); + result = _tmp26_; + return result; + } else { + GType _tmp27_ = 0UL; + _tmp27_ = t; + if (_tmp27_ == G_TYPE_FLOAT) { + gpointer* _tmp28_ = NULL; + gint _tmp28__length1 = 0; + gboolean _tmp29_ = FALSE; + _tmp28_ = array; + _tmp28__length1 = array_length1; + _tmp29_ = gee_collection_remove_all_float_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gfloat**) _tmp28_, _tmp28__length1); + result = _tmp29_; + return result; + } else { + GType _tmp30_ = 0UL; + _tmp30_ = t; + if (_tmp30_ == G_TYPE_DOUBLE) { + gpointer* _tmp31_ = NULL; + gint _tmp31__length1 = 0; + gboolean _tmp32_ = FALSE; + _tmp31_ = array; + _tmp31__length1 = array_length1; + _tmp32_ = gee_collection_remove_all_double_array (G_TYPE_CHECK_INSTANCE_CAST (self, GEE_TYPE_COLLECTION, GeeCollection), (gdouble**) _tmp31_, _tmp31__length1); + result = _tmp32_; + return result; + } else { + gboolean changed = FALSE; + gpointer* _tmp33_ = NULL; + gint _tmp33__length1 = 0; + changed = FALSE; + _tmp33_ = array; + _tmp33__length1 = array_length1; + { + gpointer* item_collection = NULL; + gint item_collection_length1 = 0; + gint _item_collection_size_ = 0; + gint item_it = 0; + item_collection = _tmp33_; + item_collection_length1 = _tmp33__length1; + for (item_it = 0; item_it < _tmp33__length1; item_it = item_it + 1) { + gconstpointer item = NULL; + item = item_collection[item_it]; + { + gboolean _tmp34_ = FALSE; + gconstpointer _tmp35_ = NULL; + gboolean _tmp36_ = FALSE; + _tmp34_ = changed; + _tmp35_ = item; + _tmp36_ = gee_collection_remove (self, _tmp35_); + changed = _tmp34_ | _tmp36_; + } + } + } + result = changed; + return result; + } + } + } + } + } + } + } + } } } } - result = changed; +} + + +/** + * Returns an immutable empty collection. + * + * @return an immutable empty collection + */ +GeeCollection* gee_collection_empty (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func) { + GeeCollection* result = NULL; + GeeHashSet* _tmp0_ = NULL; + GeeHashSet* _tmp1_ = NULL; + GeeSet* _tmp2_ = NULL; + GeeSet* _tmp3_ = NULL; + GeeCollection* _tmp4_ = NULL; + _tmp0_ = gee_hash_set_new (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, NULL, NULL, NULL, NULL, NULL, NULL); + _tmp1_ = _tmp0_; + _tmp2_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp1_); + _tmp3_ = _tmp2_; + _tmp4_ = (GeeCollection*) _tmp3_; + _g_object_unref0 (_tmp1_); + result = _tmp4_; return result; } @@ -1254,23 +1741,23 @@ } -static gint64* gee_collection_to_int64_array (GeeCollection* coll, int* result_length1) { - gint64* result = NULL; - gint64* array = NULL; +static gint64** gee_collection_to_int64_array (GeeCollection* coll, int* result_length1) { + gint64** result = NULL; + gint64** array = NULL; GeeCollection* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; - gint64* _tmp3_ = NULL; + gint64** _tmp3_ = NULL; gint array_length1 = 0; gint _array_size_ = 0; gint index = 0; - gint64* _tmp16_ = NULL; - gint _tmp16__length1 = 0; + gint64** _tmp14_ = NULL; + gint _tmp14__length1 = 0; g_return_val_if_fail (coll != NULL, NULL); _tmp0_ = coll; _tmp1_ = gee_collection_get_size (_tmp0_); _tmp2_ = _tmp1_; - _tmp3_ = g_new0 (gint64, _tmp2_); + _tmp3_ = g_new0 (gint64*, _tmp2_); array = _tmp3_; array_length1 = _tmp2_; _array_size_ = array_length1; @@ -1285,16 +1772,14 @@ while (TRUE) { GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; - gint64 element = 0LL; + gint64* element = NULL; GeeIterator* _tmp8_ = NULL; gpointer _tmp9_ = NULL; - gint64* _tmp10_ = NULL; - gint64 _tmp11_ = 0LL; + gint64** _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gint _tmp11_ = 0; gint64* _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - gint64 _tmp14_ = 0LL; - gint64 _tmp15_ = 0LL; + gint64* _tmp13_ = NULL; _tmp6_ = _element_it; _tmp7_ = gee_iterator_next (_tmp6_); if (!_tmp7_) { @@ -1302,47 +1787,47 @@ } _tmp8_ = _element_it; _tmp9_ = gee_iterator_get (_tmp8_); - _tmp10_ = (gint64*) _tmp9_; - _tmp11_ = *_tmp10_; - _g_free0 (_tmp10_); - element = _tmp11_; - _tmp12_ = array; - _tmp12__length1 = array_length1; - _tmp13_ = index; - index = _tmp13_ + 1; - _tmp14_ = element; - _tmp12_[_tmp13_] = _tmp14_; - _tmp15_ = _tmp12_[_tmp13_]; + element = (gint64*) _tmp9_; + _tmp10_ = array; + _tmp10__length1 = array_length1; + _tmp11_ = index; + index = _tmp11_ + 1; + _tmp12_ = element; + element = NULL; + _g_free0 (_tmp10_[_tmp11_]); + _tmp10_[_tmp11_] = _tmp12_; + _tmp13_ = _tmp10_[_tmp11_]; + _g_free0 (element); } _g_object_unref0 (_element_it); } - _tmp16_ = array; - _tmp16__length1 = array_length1; + _tmp14_ = array; + _tmp14__length1 = array_length1; if (result_length1) { - *result_length1 = _tmp16__length1; + *result_length1 = _tmp14__length1; } - result = _tmp16_; + result = _tmp14_; return result; } -static guint64* gee_collection_to_uint64_array (GeeCollection* coll, int* result_length1) { - guint64* result = NULL; - guint64* array = NULL; +static guint64** gee_collection_to_uint64_array (GeeCollection* coll, int* result_length1) { + guint64** result = NULL; + guint64** array = NULL; GeeCollection* _tmp0_ = NULL; gint _tmp1_ = 0; gint _tmp2_ = 0; - guint64* _tmp3_ = NULL; + guint64** _tmp3_ = NULL; gint array_length1 = 0; gint _array_size_ = 0; gint index = 0; - guint64* _tmp16_ = NULL; - gint _tmp16__length1 = 0; + guint64** _tmp14_ = NULL; + gint _tmp14__length1 = 0; g_return_val_if_fail (coll != NULL, NULL); _tmp0_ = coll; _tmp1_ = gee_collection_get_size (_tmp0_); _tmp2_ = _tmp1_; - _tmp3_ = g_new0 (guint64, _tmp2_); + _tmp3_ = g_new0 (guint64*, _tmp2_); array = _tmp3_; array_length1 = _tmp2_; _array_size_ = array_length1; @@ -1357,16 +1842,14 @@ while (TRUE) { GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; - guint64 element = 0ULL; + guint64* element = NULL; GeeIterator* _tmp8_ = NULL; gpointer _tmp9_ = NULL; - guint64* _tmp10_ = NULL; - guint64 _tmp11_ = 0ULL; + guint64** _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gint _tmp11_ = 0; guint64* _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - guint64 _tmp14_ = 0ULL; - guint64 _tmp15_ = 0ULL; + guint64* _tmp13_ = NULL; _tmp6_ = _element_it; _tmp7_ = gee_iterator_next (_tmp6_); if (!_tmp7_) { @@ -1374,26 +1857,26 @@ } _tmp8_ = _element_it; _tmp9_ = gee_iterator_get (_tmp8_); - _tmp10_ = (guint64*) _tmp9_; - _tmp11_ = *_tmp10_; - _g_free0 (_tmp10_); - element = _tmp11_; - _tmp12_ = array; - _tmp12__length1 = array_length1; - _tmp13_ = index; - index = _tmp13_ + 1; - _tmp14_ = element; - _tmp12_[_tmp13_] = _tmp14_; - _tmp15_ = _tmp12_[_tmp13_]; + element = (guint64*) _tmp9_; + _tmp10_ = array; + _tmp10__length1 = array_length1; + _tmp11_ = index; + index = _tmp11_ + 1; + _tmp12_ = element; + element = NULL; + _g_free0 (_tmp10_[_tmp11_]); + _tmp10_[_tmp11_] = _tmp12_; + _tmp13_ = _tmp10_[_tmp11_]; + _g_free0 (element); } _g_object_unref0 (_element_it); } - _tmp16_ = array; - _tmp16__length1 = array_length1; + _tmp14_ = array; + _tmp14__length1 = array_length1; if (result_length1) { - *result_length1 = _tmp16__length1; + *result_length1 = _tmp14__length1; } - result = _tmp16_; + result = _tmp14_; return result; } @@ -1532,19 +2015,6 @@ } -static gfloat* _float_dup (gfloat* self) { - gfloat* dup; - dup = g_new0 (gfloat, 1); - memcpy (dup, self, sizeof (gfloat)); - return dup; -} - - -static gpointer __float_dup0 (gpointer self) { - return self ? _float_dup (self) : NULL; -} - - static gfloat** gee_collection_to_float_array (GeeCollection* coll, int* result_length1) { gfloat** result = NULL; gfloat** array = NULL; @@ -1555,8 +2025,8 @@ gint array_length1 = 0; gint _array_size_ = 0; gint index = 0; - gfloat** _tmp17_ = NULL; - gint _tmp17__length1 = 0; + gfloat** _tmp14_ = NULL; + gint _tmp14__length1 = 0; g_return_val_if_fail (coll != NULL, NULL); _tmp0_ = coll; _tmp1_ = gee_collection_get_size (_tmp0_); @@ -1576,17 +2046,14 @@ while (TRUE) { GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; - gfloat element = 0.0F; + gfloat* element = NULL; GeeIterator* _tmp8_ = NULL; gpointer _tmp9_ = NULL; - gfloat* _tmp10_ = NULL; - gfloat _tmp11_ = 0.0F; - gfloat** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - gfloat _tmp14_ = 0.0F; - gfloat* _tmp15_ = NULL; - gfloat* _tmp16_ = NULL; + gfloat** _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gint _tmp11_ = 0; + gfloat* _tmp12_ = NULL; + gfloat* _tmp13_ = NULL; _tmp6_ = _element_it; _tmp7_ = gee_iterator_next (_tmp6_); if (!_tmp7_) { @@ -1594,45 +2061,30 @@ } _tmp8_ = _element_it; _tmp9_ = gee_iterator_get (_tmp8_); - _tmp10_ = (gfloat*) _tmp9_; - _tmp11_ = *_tmp10_; - _g_free0 (_tmp10_); - element = _tmp11_; - _tmp12_ = array; - _tmp12__length1 = array_length1; - _tmp13_ = index; - index = _tmp13_ + 1; - _tmp14_ = element; - _tmp15_ = __float_dup0 (&_tmp14_); - _g_free0 (_tmp12_[_tmp13_]); - _tmp12_[_tmp13_] = _tmp15_; - _tmp16_ = _tmp12_[_tmp13_]; + element = (gfloat*) _tmp9_; + _tmp10_ = array; + _tmp10__length1 = array_length1; + _tmp11_ = index; + index = _tmp11_ + 1; + _tmp12_ = element; + element = NULL; + _g_free0 (_tmp10_[_tmp11_]); + _tmp10_[_tmp11_] = _tmp12_; + _tmp13_ = _tmp10_[_tmp11_]; + _g_free0 (element); } _g_object_unref0 (_element_it); } - _tmp17_ = array; - _tmp17__length1 = array_length1; + _tmp14_ = array; + _tmp14__length1 = array_length1; if (result_length1) { - *result_length1 = _tmp17__length1; + *result_length1 = _tmp14__length1; } - result = _tmp17_; + result = _tmp14_; return result; } -static gdouble* _double_dup (gdouble* self) { - gdouble* dup; - dup = g_new0 (gdouble, 1); - memcpy (dup, self, sizeof (gdouble)); - return dup; -} - - -static gpointer __double_dup0 (gpointer self) { - return self ? _double_dup (self) : NULL; -} - - static gdouble** gee_collection_to_double_array (GeeCollection* coll, int* result_length1) { gdouble** result = NULL; gdouble** array = NULL; @@ -1643,8 +2095,8 @@ gint array_length1 = 0; gint _array_size_ = 0; gint index = 0; - gdouble** _tmp17_ = NULL; - gint _tmp17__length1 = 0; + gdouble** _tmp14_ = NULL; + gint _tmp14__length1 = 0; g_return_val_if_fail (coll != NULL, NULL); _tmp0_ = coll; _tmp1_ = gee_collection_get_size (_tmp0_); @@ -1664,17 +2116,14 @@ while (TRUE) { GeeIterator* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; - gdouble element = 0.0; + gdouble* element = NULL; GeeIterator* _tmp8_ = NULL; gpointer _tmp9_ = NULL; - gdouble* _tmp10_ = NULL; - gdouble _tmp11_ = 0.0; - gdouble** _tmp12_ = NULL; - gint _tmp12__length1 = 0; - gint _tmp13_ = 0; - gdouble _tmp14_ = 0.0; - gdouble* _tmp15_ = NULL; - gdouble* _tmp16_ = NULL; + gdouble** _tmp10_ = NULL; + gint _tmp10__length1 = 0; + gint _tmp11_ = 0; + gdouble* _tmp12_ = NULL; + gdouble* _tmp13_ = NULL; _tmp6_ = _element_it; _tmp7_ = gee_iterator_next (_tmp6_); if (!_tmp7_) { @@ -1682,51 +2131,1236 @@ } _tmp8_ = _element_it; _tmp9_ = gee_iterator_get (_tmp8_); - _tmp10_ = (gdouble*) _tmp9_; - _tmp11_ = *_tmp10_; - _g_free0 (_tmp10_); - element = _tmp11_; - _tmp12_ = array; - _tmp12__length1 = array_length1; - _tmp13_ = index; - index = _tmp13_ + 1; - _tmp14_ = element; - _tmp15_ = __double_dup0 (&_tmp14_); - _g_free0 (_tmp12_[_tmp13_]); - _tmp12_[_tmp13_] = _tmp15_; - _tmp16_ = _tmp12_[_tmp13_]; + element = (gdouble*) _tmp9_; + _tmp10_ = array; + _tmp10__length1 = array_length1; + _tmp11_ = index; + index = _tmp11_ + 1; + _tmp12_ = element; + element = NULL; + _g_free0 (_tmp10_[_tmp11_]); + _tmp10_[_tmp11_] = _tmp12_; + _tmp13_ = _tmp10_[_tmp11_]; + _g_free0 (element); } _g_object_unref0 (_element_it); } - _tmp17_ = array; - _tmp17__length1 = array_length1; + _tmp14_ = array; + _tmp14__length1 = array_length1; if (result_length1) { - *result_length1 = _tmp17__length1; + *result_length1 = _tmp14__length1; } - result = _tmp17_; + result = _tmp14_; return result; } -/** - * Returns an immutable empty collection. - * - * @return an immutable empty collection - */ -GeeCollection* gee_collection_empty (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func) { - GeeCollection* result = NULL; - GeeHashSet* _tmp0_ = NULL; - GeeHashSet* _tmp1_ = NULL; - GeeSet* _tmp2_ = NULL; - GeeSet* _tmp3_ = NULL; - GeeCollection* _tmp4_ = NULL; - _tmp0_ = gee_hash_set_new (g_type, (GBoxedCopyFunc) g_dup_func, g_destroy_func, NULL, NULL, NULL, NULL, NULL, NULL); - _tmp1_ = _tmp0_; - _tmp2_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp1_); - _tmp3_ = _tmp2_; - _tmp4_ = (GeeCollection*) _tmp3_; - _g_object_unref0 (_tmp1_); - result = _tmp4_; +static gboolean gee_collection_add_all_bool_array (GeeCollection* coll, gboolean* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gboolean* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gboolean* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gboolean el = FALSE; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_char_array (GeeCollection* coll, gchar* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gchar* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gchar el = '\0'; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gchar _tmp3_ = '\0'; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_uchar_array (GeeCollection* coll, guchar* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + guchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guchar* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guchar el = '\0'; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + guchar _tmp3_ = '\0'; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, (gpointer) ((guintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_int_array (GeeCollection* coll, gint* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gint* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gint el = 0; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gint _tmp3_ = 0; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_uint_array (GeeCollection* coll, guint* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + guint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guint* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guint el = 0U; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + guint _tmp3_ = 0U; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, (gpointer) ((guintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_int64_array (GeeCollection* coll, gint64** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gint64** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gint64** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gint64* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gint64* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_uint64_array (GeeCollection* coll, guint64** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + guint64** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guint64** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guint64* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + guint64* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_long_array (GeeCollection* coll, glong* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + glong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + glong* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + glong el = 0L; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + glong _tmp3_ = 0L; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_ulong_array (GeeCollection* coll, gulong* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gulong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gulong* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gulong el = 0UL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gulong _tmp3_ = 0UL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, (gpointer) ((guintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_float_array (GeeCollection* coll, gfloat** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gfloat** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gfloat** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gfloat* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gfloat* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_add_all_double_array (GeeCollection* coll, gdouble** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gdouble** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gdouble** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gdouble* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gdouble* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_add (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_contains_all_bool_array (GeeCollection* coll, gboolean* arr, int arr_length1) { + gboolean result = FALSE; + gboolean* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gboolean* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gboolean el = FALSE; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, (gpointer) ((gintptr) _tmp2_)); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_char_array (GeeCollection* coll, gchar* arr, int arr_length1) { + gboolean result = FALSE; + gchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gchar* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gchar el = '\0'; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + gchar _tmp2_ = '\0'; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, (gpointer) ((gintptr) _tmp2_)); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_uchar_array (GeeCollection* coll, guchar* arr, int arr_length1) { + gboolean result = FALSE; + guchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guchar* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guchar el = '\0'; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + guchar _tmp2_ = '\0'; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, (gpointer) ((guintptr) _tmp2_)); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_int_array (GeeCollection* coll, gint* arr, int arr_length1) { + gboolean result = FALSE; + gint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gint* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gint el = 0; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + gint _tmp2_ = 0; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, (gpointer) ((gintptr) _tmp2_)); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_uint_array (GeeCollection* coll, guint* arr, int arr_length1) { + gboolean result = FALSE; + guint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guint* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guint el = 0U; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + guint _tmp2_ = 0U; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, (gpointer) ((guintptr) _tmp2_)); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_int64_array (GeeCollection* coll, gint64** arr, int arr_length1) { + gboolean result = FALSE; + gint64** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gint64** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gint64* el = NULL; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + gint64* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, _tmp2_); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_uint64_array (GeeCollection* coll, guint64** arr, int arr_length1) { + gboolean result = FALSE; + guint64** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guint64** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guint64* el = NULL; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + guint64* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, _tmp2_); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_long_array (GeeCollection* coll, glong* arr, int arr_length1) { + gboolean result = FALSE; + glong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + glong* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + glong el = 0L; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + glong _tmp2_ = 0L; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, (gpointer) ((gintptr) _tmp2_)); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_ulong_array (GeeCollection* coll, gulong* arr, int arr_length1) { + gboolean result = FALSE; + gulong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gulong* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gulong el = 0UL; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + gulong _tmp2_ = 0UL; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, (gpointer) ((guintptr) _tmp2_)); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_float_array (GeeCollection* coll, gfloat** arr, int arr_length1) { + gboolean result = FALSE; + gfloat** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gfloat** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gfloat* el = NULL; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + gfloat* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, _tmp2_); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_contains_all_double_array (GeeCollection* coll, gdouble** arr, int arr_length1) { + gboolean result = FALSE; + gdouble** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gdouble** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gdouble* el = NULL; + el = el_collection[el_it]; + { + GeeCollection* _tmp1_ = NULL; + gdouble* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + _tmp1_ = coll; + _tmp2_ = el; + _tmp3_ = gee_collection_contains (_tmp1_, _tmp2_); + if (!_tmp3_) { + result = FALSE; + return result; + } + } + } + } + result = TRUE; + return result; +} + + +static gboolean gee_collection_remove_all_bool_array (GeeCollection* coll, gboolean* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gboolean* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gboolean* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gboolean el = FALSE; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_char_array (GeeCollection* coll, gchar* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gchar* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gchar el = '\0'; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gchar _tmp3_ = '\0'; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_uchar_array (GeeCollection* coll, guchar* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + guchar* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guchar* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guchar el = '\0'; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + guchar _tmp3_ = '\0'; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, (gpointer) ((guintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_int_array (GeeCollection* coll, gint* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gint* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gint el = 0; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gint _tmp3_ = 0; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_uint_array (GeeCollection* coll, guint* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + guint* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guint* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guint el = 0U; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + guint _tmp3_ = 0U; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, (gpointer) ((guintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_int64_array (GeeCollection* coll, gint64** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gint64** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gint64** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gint64* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gint64* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_uint64_array (GeeCollection* coll, guint64** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + guint64** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + guint64** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + guint64* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + guint64* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_long_array (GeeCollection* coll, glong* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + glong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + glong* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + glong el = 0L; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + glong _tmp3_ = 0L; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, (gpointer) ((gintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_ulong_array (GeeCollection* coll, gulong* arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gulong* _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gulong* el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gulong el = 0UL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gulong _tmp3_ = 0UL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, (gpointer) ((guintptr) _tmp3_)); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_float_array (GeeCollection* coll, gfloat** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gfloat** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gfloat** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gfloat* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gfloat* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; + return result; +} + + +static gboolean gee_collection_remove_all_double_array (GeeCollection* coll, gdouble** arr, int arr_length1) { + gboolean result = FALSE; + gboolean changed = FALSE; + gdouble** _tmp0_ = NULL; + gint _tmp0__length1 = 0; + g_return_val_if_fail (coll != NULL, FALSE); + changed = FALSE; + _tmp0_ = arr; + _tmp0__length1 = arr_length1; + { + gdouble** el_collection = NULL; + gint el_collection_length1 = 0; + gint _el_collection_size_ = 0; + gint el_it = 0; + el_collection = _tmp0_; + el_collection_length1 = _tmp0__length1; + for (el_it = 0; el_it < _tmp0__length1; el_it = el_it + 1) { + gdouble* el = NULL; + el = el_collection[el_it]; + { + gboolean _tmp1_ = FALSE; + GeeCollection* _tmp2_ = NULL; + gdouble* _tmp3_ = NULL; + gboolean _tmp4_ = FALSE; + _tmp1_ = changed; + _tmp2_ = coll; + _tmp3_ = el; + _tmp4_ = gee_collection_remove (_tmp2_, _tmp3_); + changed = _tmp1_ | _tmp4_; + } + } + } + result = changed; return result; } diff -Nru libgee-0.8-0.10.2/gee/collection.vala libgee-0.8-0.10.5/gee/collection.vala --- libgee-0.8-0.10.2/gee/collection.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/collection.vala 2013-09-16 17:41:49.000000000 +0000 @@ -171,7 +171,7 @@ G[] array = new G[size]; int index = 0; foreach (G element in this) { - array[index++] = element; + array[index++] = (owned)element; } return array; } @@ -187,11 +187,36 @@ */ public bool add_all_array (G[] array) { // FIXME: Change to virtual after bug #693455 is fixed - bool changed = false; - foreach (unowned G item in array) { - changed |= add (item); + var t = typeof (G); + if (t == typeof (bool)) { + return add_all_bool_array ((Collection) this, (bool [])array); + } else if (t == typeof (char)) { + return add_all_char_array ((Collection) this, (char [])array); + } else if (t == typeof (uchar)) { + return add_all_uchar_array ((Collection) this, (uchar [])array); + } else if (t == typeof (int)) { + return add_all_int_array ((Collection) this, (int [])array); + } else if (t == typeof (uint)) { + return add_all_uint_array ((Collection) this, (uint [])array); + } else if (t == typeof (int64)) { + return add_all_int64_array ((Collection) this, (int64? [])array); + } else if (t == typeof (uint64)) { + return add_all_uint64_array ((Collection) this, (uint64? [])array); + } else if (t == typeof (long)) { + return add_all_long_array ((Collection) this, (long [])array); + } else if (t == typeof (ulong)) { + return add_all_ulong_array ((Collection) this, (ulong [])array); + } else if (t == typeof (float)) { + return add_all_float_array ((Collection) this, (float? [])array); + } else if (t == typeof (double)) { + return add_all_double_array ((Collection) this, (double? [])array); + } else { + bool changed = false; + foreach (unowned G item in array) { + changed |= add (item); + } + return changed; } - return changed; } /** @@ -205,12 +230,37 @@ */ public bool contains_all_array (G[] array) { // FIXME: Change to virtual after bug #693455 is fixed - foreach (unowned G item in array) { - if (!contains (item)) { - return false; + var t = typeof (G); + if (t == typeof (bool)) { + return contains_all_bool_array ((Collection) this, (bool [])array); + } else if (t == typeof (char)) { + return contains_all_char_array ((Collection) this, (char [])array); + } else if (t == typeof (uchar)) { + return contains_all_uchar_array ((Collection) this, (uchar [])array); + } else if (t == typeof (int)) { + return contains_all_int_array ((Collection) this, (int [])array); + } else if (t == typeof (uint)) { + return contains_all_uint_array ((Collection) this, (uint [])array); + } else if (t == typeof (int64)) { + return contains_all_int64_array ((Collection) this, (int64? [])array); + } else if (t == typeof (uint64)) { + return contains_all_uint64_array ((Collection) this, (uint64? [])array); + } else if (t == typeof (long)) { + return contains_all_long_array ((Collection) this, (long [])array); + } else if (t == typeof (ulong)) { + return contains_all_ulong_array ((Collection) this, (ulong [])array); + } else if (t == typeof (float)) { + return contains_all_float_array ((Collection) this, (float? [])array); + } else if (t == typeof (double)) { + return contains_all_double_array ((Collection) this, (double? [])array); + } else { + foreach (unowned G item in array) { + if (!contains (item)) { + return false; + } } + return true; } - return true; } /** @@ -226,11 +276,50 @@ */ public bool remove_all_array (G[] array) { // FIXME: Change to virtual after bug #693455 is fixed - bool changed = false; - foreach (unowned G item in array) { - changed |= remove (item); + var t = typeof (G); + if (t == typeof (bool)) { + return remove_all_bool_array ((Collection) this, (bool [])array); + } else if (t == typeof (char)) { + return remove_all_char_array ((Collection) this, (char [])array); + } else if (t == typeof (uchar)) { + return remove_all_uchar_array ((Collection) this, (uchar [])array); + } else if (t == typeof (int)) { + return remove_all_int_array ((Collection) this, (int [])array); + } else if (t == typeof (uint)) { + return remove_all_uint_array ((Collection) this, (uint [])array); + } else if (t == typeof (int64)) { + return remove_all_int64_array ((Collection) this, (int64? [])array); + } else if (t == typeof (uint64)) { + return remove_all_uint64_array ((Collection) this, (uint64? [])array); + } else if (t == typeof (long)) { + return remove_all_long_array ((Collection) this, (long [])array); + } else if (t == typeof (ulong)) { + return remove_all_ulong_array ((Collection) this, (ulong [])array); + } else if (t == typeof (float)) { + return remove_all_float_array ((Collection) this, (float? [])array); + } else if (t == typeof (double)) { + return remove_all_double_array ((Collection) this, (double? [])array); + } else { + bool changed = false; + foreach (unowned G item in array) { + changed |= remove (item); + } + return changed; } - return changed; + } + + /** + * The read-only view of this collection. + */ + public abstract Collection read_only_view { owned get; } + + /** + * Returns an immutable empty collection. + * + * @return an immutable empty collection + */ + public static Collection empty () { + return new HashSet ().read_only_view; } private static bool[] to_bool_array (Collection coll) { @@ -278,20 +367,20 @@ return array; } - private static int64[] to_int64_array (Collection coll) { - int64[] array = new int64[coll.size]; + private static int64?[] to_int64_array (Collection coll) { + int64?[] array = new int64?[coll.size]; int index = 0; - foreach (int64 element in coll) { - array[index++] = element; + foreach (int64? element in coll) { + array[index++] = (owned)element; } return array; } - private static uint64[] to_uint64_array (Collection coll) { - uint64[] array = new uint64[coll.size]; + private static uint64?[] to_uint64_array (Collection coll) { + uint64?[] array = new uint64?[coll.size]; int index = 0; - foreach (uint64 element in coll) { - array[index++] = element; + foreach (uint64? element in coll) { + array[index++] = (owned)element; } return array; } @@ -317,8 +406,8 @@ private static float?[] to_float_array (Collection coll) { float?[] array = new float?[coll.size]; int index = 0; - foreach (float element in coll) { - array[index++] = element; + foreach (float? element in coll) { + array[index++] = (owned)element; } return array; } @@ -326,24 +415,285 @@ private static double?[] to_double_array (Collection coll) { double?[] array = new double?[coll.size]; int index = 0; - foreach (double element in coll) { - array[index++] = element; + foreach (double? element in coll) { + array[index++] = (owned)element; } return array; } - /** - * The read-only view of this collection. - */ - public abstract Collection read_only_view { owned get; } + private static bool add_all_bool_array (Collection coll, bool[] arr) { + bool changed = false; + foreach (bool el in arr) { + changed |= coll.add (el); + } + return changed; + } - /** - * Returns an immutable empty collection. - * - * @return an immutable empty collection - */ - public static Collection empty () { - return new HashSet ().read_only_view; + private static bool add_all_char_array (Collection coll, char[] arr) { + bool changed = false; + foreach (char el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_uchar_array (Collection coll, uchar[] arr) { + bool changed = false; + foreach (uchar el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_int_array (Collection coll, int[] arr) { + bool changed = false; + foreach (int el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_uint_array (Collection coll, uint[] arr) { + bool changed = false; + foreach (uint el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_int64_array (Collection coll, int64?[] arr) { + bool changed = false; + foreach (unowned int64? el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_uint64_array (Collection coll, uint64?[] arr) { + bool changed = false; + foreach (unowned uint64? el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_long_array (Collection coll, long[] arr) { + bool changed = false; + foreach (long el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_ulong_array (Collection coll, ulong[] arr) { + bool changed = false; + foreach (ulong el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_float_array (Collection coll, float?[] arr) { + bool changed = false; + foreach (unowned float? el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool add_all_double_array (Collection coll, double?[] arr) { + bool changed = false; + foreach (unowned double? el in arr) { + changed |= coll.add (el); + } + return changed; + } + + private static bool contains_all_bool_array (Collection coll, bool[] arr) { + foreach (bool el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_char_array (Collection coll, char[] arr) { + foreach (char el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_uchar_array (Collection coll, uchar[] arr) { + foreach (uchar el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_int_array (Collection coll, int[] arr) { + foreach (int el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_uint_array (Collection coll, uint[] arr) { + foreach (uint el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_int64_array (Collection coll, int64?[] arr) { + foreach (unowned int64? el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_uint64_array (Collection coll, uint64?[] arr) { + foreach (unowned uint64? el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_long_array (Collection coll, long[] arr) { + foreach (long el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_ulong_array (Collection coll, ulong[] arr) { + foreach (ulong el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_float_array (Collection coll, float?[] arr) { + foreach (unowned float? el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool contains_all_double_array (Collection coll, double?[] arr) { + foreach (unowned double? el in arr) { + if (!coll.contains (el)) { + return false; + } + } + return true; + } + + private static bool remove_all_bool_array (Collection coll, bool[] arr) { + bool changed = false; + foreach (bool el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_char_array (Collection coll, char[] arr) { + bool changed = false; + foreach (char el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_uchar_array (Collection coll, uchar[] arr) { + bool changed = false; + foreach (uchar el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_int_array (Collection coll, int[] arr) { + bool changed = false; + foreach (int el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_uint_array (Collection coll, uint[] arr) { + bool changed = false; + foreach (uint el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_int64_array (Collection coll, int64?[] arr) { + bool changed = false; + foreach (unowned int64? el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_uint64_array (Collection coll, uint64?[] arr) { + bool changed = false; + foreach (unowned uint64? el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_long_array (Collection coll, long[] arr) { + bool changed = false; + foreach (long el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_ulong_array (Collection coll, ulong[] arr) { + bool changed = false; + foreach (ulong el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_float_array (Collection coll, float?[] arr) { + bool changed = false; + foreach (unowned float? el in arr) { + changed |= coll.remove (el); + } + return changed; + } + + private static bool remove_all_double_array (Collection coll, double?[] arr) { + bool changed = false; + foreach (unowned double? el in arr) { + changed |= coll.remove (el); + } + return changed; } } diff -Nru libgee-0.8-0.10.2/gee/comparable.c libgee-0.8-0.10.5/gee/comparable.c --- libgee-0.8-0.10.2/gee/comparable.c 2013-07-12 18:56:23.000000000 +0000 +++ libgee-0.8-0.10.5/gee/comparable.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* comparable.c generated by valac 0.20.1.52-2186, the Vala compiler +/* comparable.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from comparable.vala, do not modify */ /* comparable.vala diff -Nru libgee-0.8-0.10.2/gee/concurrentlist.c libgee-0.8-0.10.5/gee/concurrentlist.c --- libgee-0.8-0.10.2/gee/concurrentlist.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/concurrentlist.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* concurrentlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* concurrentlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from concurrentlist.vala, do not modify */ /* concurrentlist.vala diff -Nru libgee-0.8-0.10.2/gee/concurrentset.c libgee-0.8-0.10.5/gee/concurrentset.c --- libgee-0.8-0.10.2/gee/concurrentset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/concurrentset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* concurrentset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* concurrentset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from concurrentset.vala, do not modify */ /* concurrentset.vala @@ -779,7 +779,7 @@ static inline GeeConcurrentSetTower* gee_concurrent_set_tower_get_backlink (GeeConcurrentSetTower* self, guint8 level); void gee_hazard_pointer_set_pointer (GType g_type, GBoxedCopyFunc g_dup_func, GDestroyNotify g_destroy_func, gconstpointer** aptr, gpointer new_ptr, gsize mask, gsize new_mask); static void gee_concurrent_set_tower_finalize (GeeConcurrentSetTower* obj); -static void _vala_array_copy2 (GeeConcurrentSetTower** self, GeeConcurrentSetTower** dest); +static void _vala_array_copy1 (GeeConcurrentSetTower** self, GeeConcurrentSetTower** dest); static void gee_concurrent_set_finalize (GObject* obj); static void _vala_gee_concurrent_set_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gee_concurrent_set_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -7876,7 +7876,7 @@ } -static void _vala_array_copy2 (GeeConcurrentSetTower** self, GeeConcurrentSetTower** dest) { +static void _vala_array_copy1 (GeeConcurrentSetTower** self, GeeConcurrentSetTower** dest) { int i; for (i = 0; i < 31; i++) { GeeConcurrentSetTower* _tmp0_ = NULL; @@ -7889,7 +7889,7 @@ static void gee_concurrent_set_tower_iter_copy (const GeeConcurrentSetTowerIter* self, GeeConcurrentSetTowerIter* dest) { GeeConcurrentSetTower* _tmp0_[31] = {0}; gint _tmp0__length1 = 0; - _vala_array_copy2 ((*self)._iter, _tmp0_); + _vala_array_copy1 ((*self)._iter, _tmp0_); _vala_array_destroy ((*dest)._iter, 31, (GDestroyNotify) gee_concurrent_set_tower_unref); memcpy ((*dest)._iter, _tmp0_, 31 * sizeof (GeeConcurrentSetTower*)); } diff -Nru libgee-0.8-0.10.2/gee/deque.c libgee-0.8-0.10.5/gee/deque.c --- libgee-0.8-0.10.2/gee/deque.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/deque.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* deque.c generated by valac 0.20.1.52-2186, the Vala compiler +/* deque.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from deque.vala, do not modify */ /* deque.vala diff -Nru libgee-0.8-0.10.2/gee/functions.c libgee-0.8-0.10.5/gee/functions.c --- libgee-0.8-0.10.2/gee/functions.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/functions.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* functions.c generated by valac 0.20.1.52-2186, the Vala compiler +/* functions.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from functions.vala, do not modify */ /* functions.vala diff -Nru libgee-0.8-0.10.2/gee/gee-0.8.vapi libgee-0.8-0.10.5/gee/gee-0.8.vapi --- libgee-0.8-0.10.2/gee/gee-0.8.vapi 2013-07-12 20:03:22.000000000 +0000 +++ libgee-0.8-0.10.5/gee/gee-0.8.vapi 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* gee-0.8.vapi generated by valac 0.20.1.52-2186, do not modify. */ +/* gee-0.8.vapi generated by valac 0.21.2.4-6740f, do not modify. */ [CCode (gir_namespace = "Gee", gir_version = "0.8")] namespace Gee { diff -Nru libgee-0.8-0.10.2/gee/gee-internals-0.8.vapi libgee-0.8-0.10.5/gee/gee-internals-0.8.vapi --- libgee-0.8-0.10.2/gee/gee-internals-0.8.vapi 2013-07-12 20:03:22.000000000 +0000 +++ libgee-0.8-0.10.5/gee/gee-internals-0.8.vapi 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* gee-internals-0.8.vapi generated by valac 0.20.1.52-2186, do not modify. */ +/* gee-internals-0.8.vapi generated by valac 0.21.2.4-6740f, do not modify. */ [CCode (gir_namespace = "Gee", gir_version = "0.8")] namespace Gee { diff -Nru libgee-0.8-0.10.2/gee/gee-internals.h libgee-0.8-0.10.5/gee/gee-internals.h --- libgee-0.8-0.10.2/gee/gee-internals.h 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/gee-internals.h 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* gee-internals.h generated by valac 0.20.1.52-2186, the Vala compiler, do not modify */ +/* gee-internals.h generated by valac 0.21.2.4-6740f, the Vala compiler, do not modify */ #ifndef __GEE_INTERNALS_H__ diff -Nru libgee-0.8-0.10.2/gee/gee.h libgee-0.8-0.10.5/gee/gee.h --- libgee-0.8-0.10.2/gee/gee.h 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/gee.h 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* gee.h generated by valac 0.20.1.52-2186, the Vala compiler, do not modify */ +/* gee.h generated by valac 0.21.2.4-6740f, the Vala compiler, do not modify */ #ifndef __GEE_H__ diff -Nru libgee-0.8-0.10.2/gee/hashable.c libgee-0.8-0.10.5/gee/hashable.c --- libgee-0.8-0.10.2/gee/hashable.c 2013-07-12 18:56:23.000000000 +0000 +++ libgee-0.8-0.10.5/gee/hashable.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* hashable.c generated by valac 0.20.1.52-2186, the Vala compiler +/* hashable.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from hashable.vala, do not modify */ /* hashable.vala diff -Nru libgee-0.8-0.10.2/gee/hashmap.c libgee-0.8-0.10.5/gee/hashmap.c --- libgee-0.8-0.10.2/gee/hashmap.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/hashmap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* hashmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* hashmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from hashmap.vala, do not modify */ /* hashmap.vala diff -Nru libgee-0.8-0.10.2/gee/hashmultimap.c libgee-0.8-0.10.5/gee/hashmultimap.c --- libgee-0.8-0.10.2/gee/hashmultimap.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/hashmultimap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* hashmultimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* hashmultimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from hashmultimap.vala, do not modify */ /* hashmultimap.vala diff -Nru libgee-0.8-0.10.2/gee/hashmultiset.c libgee-0.8-0.10.5/gee/hashmultiset.c --- libgee-0.8-0.10.2/gee/hashmultiset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/hashmultiset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* hashmultiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* hashmultiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from hashmultiset.vala, do not modify */ /* hashmultiset.vala diff -Nru libgee-0.8-0.10.2/gee/hashset.c libgee-0.8-0.10.5/gee/hashset.c --- libgee-0.8-0.10.2/gee/hashset.c 2013-07-12 19:10:09.000000000 +0000 +++ libgee-0.8-0.10.5/gee/hashset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* hashset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* hashset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from hashset.vala, do not modify */ /* hashset.vala @@ -1274,95 +1274,173 @@ gint _tmp0_ = 0; GeeHashSet* _tmp1_ = NULL; gint _tmp2_ = 0; + GeeHashSetNode* node = NULL; GeeHashSetNode* _tmp3_ = NULL; + GeeHashSetNode* next = NULL; + GeeHashSetNode* _tmp4_ = NULL; + GeeHashSetNode* current = NULL; + GeeHashSetNode* prev = NULL; + GeeHashSetNode* _tmp5_ = NULL; + GeeHashSetNode* _tmp14_ = NULL; + GeeHashSetNode* _tmp48_ = NULL; self = (GeeHashSetIterator*) base; _tmp0_ = self->priv->_stamp; _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->_stamp; _vala_assert (_tmp0_ == _tmp2_, "_stamp == _set._stamp"); _tmp3_ = self->priv->_node; - if (_tmp3_ != NULL) { - GeeForallFunc _tmp4_ = NULL; - void* _tmp4__target = NULL; - GeeHashSetNode* _tmp5_ = NULL; - gconstpointer _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - _tmp4_ = f; - _tmp4__target = f_target; - _tmp5_ = self->priv->_node; - _tmp6_ = _tmp5_->key; - _tmp7_ = ((_tmp6_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp6_) : ((gpointer) _tmp6_); - _tmp8_ = _tmp4_ (_tmp7_, _tmp4__target); - if (!_tmp8_) { + node = _tmp3_; + _tmp4_ = self->priv->_next; + next = _tmp4_; + current = NULL; + prev = NULL; + _tmp5_ = node; + if (_tmp5_ != NULL) { + GeeForallFunc _tmp6_ = NULL; + void* _tmp6__target = NULL; + GeeHashSetNode* _tmp7_ = NULL; + gconstpointer _tmp8_ = NULL; + gpointer _tmp9_ = NULL; + gboolean _tmp10_ = FALSE; + GeeHashSetNode* _tmp11_ = NULL; + GeeHashSetNode* _tmp12_ = NULL; + GeeHashSetNode* _tmp13_ = NULL; + _tmp6_ = f; + _tmp6__target = f_target; + _tmp7_ = node; + _tmp8_ = _tmp7_->key; + _tmp9_ = ((_tmp8_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp8_) : ((gpointer) _tmp8_); + _tmp10_ = _tmp6_ (_tmp9_, _tmp6__target); + if (!_tmp10_) { result = FALSE; return result; } - } - while (TRUE) { - gboolean _tmp9_ = FALSE; - gint _tmp10_ = 0; - GeeHashSet* _tmp11_ = NULL; - gint _tmp12_ = 0; - gboolean _tmp14_ = FALSE; - GeeHashSetNode* _tmp15_ = NULL; - _tmp10_ = self->priv->_index; - _tmp11_ = self->priv->_set; - _tmp12_ = _tmp11_->priv->_array_size; - if ((_tmp10_ + 1) < _tmp12_) { - _tmp9_ = TRUE; - } else { - GeeHashSetNode* _tmp13_ = NULL; - _tmp13_ = self->priv->_next; - _tmp9_ = _tmp13_ != NULL; - } - _tmp14_ = _tmp9_; - if (!_tmp14_) { - break; + _tmp11_ = node; + prev = _tmp11_; + _tmp12_ = node; + _tmp13_ = _tmp12_->next; + current = _tmp13_; + } + _tmp14_ = next; + if (_tmp14_ != NULL) { + GeeForallFunc _tmp15_ = NULL; + void* _tmp15__target = NULL; + GeeHashSetNode* _tmp16_ = NULL; + gconstpointer _tmp17_ = NULL; + gpointer _tmp18_ = NULL; + gboolean _tmp19_ = FALSE; + GeeHashSetNode* _tmp21_ = NULL; + GeeHashSetNode* _tmp22_ = NULL; + GeeHashSetNode* _tmp23_ = NULL; + _tmp15_ = f; + _tmp15__target = f_target; + _tmp16_ = next; + _tmp17_ = _tmp16_->key; + _tmp18_ = ((_tmp17_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp17_) : ((gpointer) _tmp17_); + _tmp19_ = _tmp15_ (_tmp18_, _tmp15__target); + if (!_tmp19_) { + GeeHashSetNode* _tmp20_ = NULL; + _tmp20_ = next; + self->priv->_node = _tmp20_; + self->priv->_next = NULL; + result = FALSE; + return result; } - _tmp15_ = self->priv->_next; - if (_tmp15_ != NULL) { - GeeHashSetNode* _tmp16_ = NULL; - GeeForallFunc _tmp17_ = NULL; - void* _tmp17__target = NULL; - GeeHashSetNode* _tmp18_ = NULL; - gconstpointer _tmp19_ = NULL; - gpointer _tmp20_ = NULL; - gboolean _tmp21_ = FALSE; - GeeHashSetNode* _tmp22_ = NULL; - GeeHashSetNode* _tmp23_ = NULL; - _tmp16_ = self->priv->_next; - self->priv->_node = _tmp16_; - _tmp17_ = f; - _tmp17__target = f_target; - _tmp18_ = self->priv->_node; - _tmp19_ = _tmp18_->key; - _tmp20_ = ((_tmp19_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp19_) : ((gpointer) _tmp19_); - _tmp21_ = _tmp17_ (_tmp20_, _tmp17__target); - if (!_tmp21_) { - result = FALSE; - return result; + _tmp21_ = next; + prev = _tmp21_; + _tmp22_ = next; + _tmp23_ = _tmp22_->next; + current = _tmp23_; + } + { + gboolean _tmp24_ = FALSE; + _tmp24_ = TRUE; + while (TRUE) { + gboolean _tmp25_ = FALSE; + _tmp25_ = _tmp24_; + if (!_tmp25_) { + GeeHashSetNode* _tmp26_ = NULL; + _tmp26_ = current; + if (!(_tmp26_ != NULL)) { + break; + } + } + _tmp24_ = FALSE; + while (TRUE) { + GeeHashSetNode* _tmp27_ = NULL; + GeeForallFunc _tmp28_ = NULL; + void* _tmp28__target = NULL; + GeeHashSetNode* _tmp29_ = NULL; + gconstpointer _tmp30_ = NULL; + gpointer _tmp31_ = NULL; + gboolean _tmp32_ = FALSE; + GeeHashSetNode* _tmp34_ = NULL; + GeeHashSetNode* _tmp35_ = NULL; + GeeHashSetNode* _tmp36_ = NULL; + _tmp27_ = current; + if (!(_tmp27_ != NULL)) { + break; + } + _tmp28_ = f; + _tmp28__target = f_target; + _tmp29_ = current; + _tmp30_ = _tmp29_->key; + _tmp31_ = ((_tmp30_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp30_) : ((gpointer) _tmp30_); + _tmp32_ = _tmp28_ (_tmp31_, _tmp28__target); + if (!_tmp32_) { + GeeHashSetNode* _tmp33_ = NULL; + _tmp33_ = current; + self->priv->_node = _tmp33_; + self->priv->_next = NULL; + result = FALSE; + return result; + } + _tmp34_ = current; + prev = _tmp34_; + _tmp35_ = current; + _tmp36_ = _tmp35_->next; + current = _tmp36_; + } + while (TRUE) { + gboolean _tmp37_ = FALSE; + GeeHashSetNode* _tmp38_ = NULL; + gboolean _tmp42_ = FALSE; + gint _tmp43_ = 0; + GeeHashSet* _tmp44_ = NULL; + GeeHashSetNode** _tmp45_ = NULL; + gint _tmp45__length1 = 0; + gint _tmp46_ = 0; + GeeHashSetNode* _tmp47_ = NULL; + _tmp38_ = current; + if (_tmp38_ == NULL) { + gint _tmp39_ = 0; + GeeHashSet* _tmp40_ = NULL; + gint _tmp41_ = 0; + _tmp39_ = self->priv->_index; + _tmp40_ = self->priv->_set; + _tmp41_ = _tmp40_->priv->_array_size; + _tmp37_ = (_tmp39_ + 1) < _tmp41_; + } else { + _tmp37_ = FALSE; + } + _tmp42_ = _tmp37_; + if (!_tmp42_) { + break; + } + _tmp43_ = self->priv->_index; + self->priv->_index = _tmp43_ + 1; + _tmp44_ = self->priv->_set; + _tmp45_ = _tmp44_->priv->_nodes; + _tmp45__length1 = _tmp44_->priv->_nodes_length1; + _tmp46_ = self->priv->_index; + _tmp47_ = _tmp45_[_tmp46_]; + current = _tmp47_; } - _tmp22_ = self->priv->_node; - _tmp23_ = _tmp22_->next; - self->priv->_next = _tmp23_; - } else { - gint _tmp24_ = 0; - GeeHashSet* _tmp25_ = NULL; - GeeHashSetNode** _tmp26_ = NULL; - gint _tmp26__length1 = 0; - gint _tmp27_ = 0; - GeeHashSetNode* _tmp28_ = NULL; - _tmp24_ = self->priv->_index; - self->priv->_index = _tmp24_ + 1; - _tmp25_ = self->priv->_set; - _tmp26_ = _tmp25_->priv->_nodes; - _tmp26__length1 = _tmp25_->priv->_nodes_length1; - _tmp27_ = self->priv->_index; - _tmp28_ = _tmp26_[_tmp27_]; - self->priv->_next = _tmp28_; } } + _tmp48_ = prev; + self->priv->_node = _tmp48_; + self->priv->_next = NULL; result = TRUE; return result; } diff -Nru libgee-0.8-0.10.2/gee/hashset.vala libgee-0.8-0.10.5/gee/hashset.vala --- libgee-0.8-0.10.2/gee/hashset.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/hashset.vala 2013-09-16 17:41:45.000000000 +0000 @@ -45,7 +45,7 @@ public override int size { get { return _nnodes; } } - + /** * {@inheritDoc} */ @@ -275,13 +275,13 @@ _node = null; _stamp = _set._stamp; } - + public bool read_only { get { return false; } } - + public bool valid { get { return _node != null; @@ -290,23 +290,40 @@ public bool foreach (ForallFunc f) { assert (_stamp == _set._stamp); - if (_node != null) { - if (!f (_node.key)) { + unowned Node? node = _node, next = _next, current = null, prev = null; + if (node != null) { + if (!f (node.key)) { return false; } + prev = node; + current = node.next; } - while (_index + 1 < _set._array_size || _next != null) { - if (_next != null) { - _node = _next; - if (!f (_node.key)) { + if (next != null) { + if (!f (next.key)) { + _node = next; + _next = null; + return false; + } + prev = next; + current = next.next; + } + do { + while (current != null) { + if (!f (current.key)) { + _node = current; + _next = null; return false; } - _next = _node.next; - } else { + prev = current; + current = current.next; + } + while (current == null && _index + 1 < _set._array_size) { _index++; - _next = _set._nodes[_index]; + current = _set._nodes[_index]; } - } + } while (current != null); + _node = prev; + _next = null; return true; } } diff -Nru libgee-0.8-0.10.2/gee/hazardpointer.c libgee-0.8-0.10.5/gee/hazardpointer.c --- libgee-0.8-0.10.2/gee/hazardpointer.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/hazardpointer.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* hazardpointer.c generated by valac 0.20.1.52-2186, the Vala compiler +/* hazardpointer.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from hazardpointer.vala, do not modify */ /* hazardpointer.vala diff -Nru libgee-0.8-0.10.2/gee/iterable.c libgee-0.8-0.10.5/gee/iterable.c --- libgee-0.8-0.10.2/gee/iterable.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/iterable.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* iterable.c generated by valac 0.20.1.52-2186, the Vala compiler +/* iterable.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from iterable.vala, do not modify */ /* iterable.vala diff -Nru libgee-0.8-0.10.2/gee/iterator.c libgee-0.8-0.10.5/gee/iterator.c --- libgee-0.8-0.10.2/gee/iterator.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/iterator.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* iterator.c generated by valac 0.20.1.52-2186, the Vala compiler +/* iterator.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from iterator.vala, do not modify */ /* iterator.vala diff -Nru libgee-0.8-0.10.2/gee/lazy.c libgee-0.8-0.10.5/gee/lazy.c --- libgee-0.8-0.10.2/gee/lazy.c 2013-07-12 18:56:23.000000000 +0000 +++ libgee-0.8-0.10.5/gee/lazy.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* lazy.c generated by valac 0.20.1.52-2186, the Vala compiler +/* lazy.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from lazy.vala, do not modify */ /* lazy.vala diff -Nru libgee-0.8-0.10.2/gee/linkedlist.c libgee-0.8-0.10.5/gee/linkedlist.c --- libgee-0.8-0.10.2/gee/linkedlist.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/linkedlist.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* linkedlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* linkedlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from linkedlist.vala, do not modify */ /* linkedlist.vala diff -Nru libgee-0.8-0.10.2/gee/list.c libgee-0.8-0.10.5/gee/list.c --- libgee-0.8-0.10.2/gee/list.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/list.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* list.c generated by valac 0.20.1.52-2186, the Vala compiler +/* list.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from list.vala, do not modify */ /* list.vala diff -Nru libgee-0.8-0.10.2/gee/listiterator.c libgee-0.8-0.10.5/gee/listiterator.c --- libgee-0.8-0.10.2/gee/listiterator.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/listiterator.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* listiterator.c generated by valac 0.20.1.52-2186, the Vala compiler +/* listiterator.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from listiterator.vala, do not modify */ /* listiterator.vala diff -Nru libgee-0.8-0.10.2/gee/map.c libgee-0.8-0.10.5/gee/map.c --- libgee-0.8-0.10.2/gee/map.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/map.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* map.c generated by valac 0.20.1.52-2186, the Vala compiler +/* map.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from map.vala, do not modify */ /* map.vala diff -Nru libgee-0.8-0.10.2/gee/mapiterator.c libgee-0.8-0.10.5/gee/mapiterator.c --- libgee-0.8-0.10.2/gee/mapiterator.c 2013-07-12 18:56:23.000000000 +0000 +++ libgee-0.8-0.10.5/gee/mapiterator.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* mapiterator.c generated by valac 0.20.1.52-2186, the Vala compiler +/* mapiterator.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from mapiterator.vala, do not modify */ /* mapiterator.vala diff -Nru libgee-0.8-0.10.2/gee/multimap.c libgee-0.8-0.10.5/gee/multimap.c --- libgee-0.8-0.10.2/gee/multimap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/multimap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* multimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* multimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from multimap.vala, do not modify */ /* multimap.vala diff -Nru libgee-0.8-0.10.2/gee/multiset.c libgee-0.8-0.10.5/gee/multiset.c --- libgee-0.8-0.10.2/gee/multiset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/multiset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* multiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* multiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from multiset.vala, do not modify */ /* multiset.vala diff -Nru libgee-0.8-0.10.2/gee/priorityqueue.c libgee-0.8-0.10.5/gee/priorityqueue.c --- libgee-0.8-0.10.2/gee/priorityqueue.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/priorityqueue.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* priorityqueue.c generated by valac 0.20.1.52-2186, the Vala compiler +/* priorityqueue.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from priorityqueue.vala, do not modify */ /* priorityqueue.vala @@ -3703,12 +3703,13 @@ GeePriorityQueueIterator * self; gboolean result = FALSE; GeePriorityQueueNode* _tmp0_ = NULL; - GeeForallFunc _tmp8_ = NULL; - void* _tmp8__target = NULL; - GeePriorityQueueNode* _tmp9_ = NULL; - gconstpointer _tmp10_ = NULL; - gpointer _tmp11_ = NULL; - gboolean _tmp12_ = FALSE; + GeePriorityQueueNode* _tmp8_ = NULL; + GeeForallFunc _tmp9_ = NULL; + void* _tmp9__target = NULL; + GeePriorityQueueNode* _tmp10_ = NULL; + gconstpointer _tmp11_ = NULL; + gpointer _tmp12_ = NULL; + gboolean _tmp13_ = FALSE; self = (GeePriorityQueueIterator*) base; _tmp0_ = self->priv->position; if (_tmp0_ == NULL) { @@ -3732,45 +3733,50 @@ _tmp7_ = _tmp1_; self->priv->position = _tmp7_; } - _tmp8_ = f; - _tmp8__target = f_target; - _tmp9_ = self->priv->position; - _tmp10_ = _tmp9_->data; - _tmp11_ = ((_tmp10_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp10_) : ((gpointer) _tmp10_); - _tmp12_ = _tmp8_ (_tmp11_, _tmp8__target); - if (!_tmp12_) { + _tmp8_ = self->priv->position; + if (_tmp8_ == NULL) { + result = TRUE; + return result; + } + _tmp9_ = f; + _tmp9__target = f_target; + _tmp10_ = self->priv->position; + _tmp11_ = _tmp10_->data; + _tmp12_ = ((_tmp11_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp11_) : ((gpointer) _tmp11_); + _tmp13_ = _tmp9_ (_tmp12_, _tmp9__target); + if (!_tmp13_) { result = FALSE; return result; } while (TRUE) { - GeePriorityQueueNode* _tmp13_ = NULL; GeePriorityQueueNode* _tmp14_ = NULL; GeePriorityQueueNode* _tmp15_ = NULL; GeePriorityQueueNode* _tmp16_ = NULL; GeePriorityQueueNode* _tmp17_ = NULL; - GeeForallFunc _tmp18_ = NULL; - void* _tmp18__target = NULL; - GeePriorityQueueNode* _tmp19_ = NULL; - gconstpointer _tmp20_ = NULL; - gpointer _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - _tmp13_ = self->priv->position; - _tmp14_ = _tmp13_->iter_next; - if (!(_tmp14_ != NULL)) { + GeePriorityQueueNode* _tmp18_ = NULL; + GeeForallFunc _tmp19_ = NULL; + void* _tmp19__target = NULL; + GeePriorityQueueNode* _tmp20_ = NULL; + gconstpointer _tmp21_ = NULL; + gpointer _tmp22_ = NULL; + gboolean _tmp23_ = FALSE; + _tmp14_ = self->priv->position; + _tmp15_ = _tmp14_->iter_next; + if (!(_tmp15_ != NULL)) { break; } - _tmp15_ = self->priv->position; - self->priv->previous = _tmp15_; _tmp16_ = self->priv->position; - _tmp17_ = _tmp16_->iter_next; - self->priv->position = _tmp17_; - _tmp18_ = f; - _tmp18__target = f_target; - _tmp19_ = self->priv->position; - _tmp20_ = _tmp19_->data; - _tmp21_ = ((_tmp20_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp20_) : ((gpointer) _tmp20_); - _tmp22_ = _tmp18_ (_tmp21_, _tmp18__target); - if (!_tmp22_) { + self->priv->previous = _tmp16_; + _tmp17_ = self->priv->position; + _tmp18_ = _tmp17_->iter_next; + self->priv->position = _tmp18_; + _tmp19_ = f; + _tmp19__target = f_target; + _tmp20_ = self->priv->position; + _tmp21_ = _tmp20_->data; + _tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_); + _tmp23_ = _tmp19_ (_tmp22_, _tmp19__target); + if (!_tmp23_) { result = FALSE; return result; } diff -Nru libgee-0.8-0.10.2/gee/priorityqueue.vala libgee-0.8-0.10.5/gee/priorityqueue.vala --- libgee-0.8-0.10.2/gee/priorityqueue.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/priorityqueue.vala 2013-09-16 17:41:49.000000000 +0000 @@ -1188,15 +1188,18 @@ stamp++; assert (stamp == queue._stamp); } - + public bool read_only { get { return false; } } - + public bool valid { get { return position != null; } } public bool foreach (ForallFunc f) { if (position == null) { position = (previous != null) ? previous.iter_next : queue._iter_head; } + if (position == null) { + return true; + } if (!f (position.data)) { return false; } diff -Nru libgee-0.8-0.10.2/gee/queue.c libgee-0.8-0.10.5/gee/queue.c --- libgee-0.8-0.10.2/gee/queue.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/queue.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* queue.c generated by valac 0.20.1.52-2186, the Vala compiler +/* queue.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from queue.vala, do not modify */ /* queue.vala diff -Nru libgee-0.8-0.10.2/gee/readonlybidirlist.c libgee-0.8-0.10.5/gee/readonlybidirlist.c --- libgee-0.8-0.10.2/gee/readonlybidirlist.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlybidirlist.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlybidirlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlybidirlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlybidirlist.vala, do not modify */ /* readonlybidirlist.vala diff -Nru libgee-0.8-0.10.2/gee/readonlybidirsortedmap.c libgee-0.8-0.10.5/gee/readonlybidirsortedmap.c --- libgee-0.8-0.10.2/gee/readonlybidirsortedmap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlybidirsortedmap.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlybidirsortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlybidirsortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlybidirsortedmap.vala, do not modify */ /* readonlybidirsortedmap.vala @@ -472,7 +472,8 @@ GEE_READ_ONLY_BIDIR_SORTED_MAP_K_DESTROY_FUNC, GEE_READ_ONLY_BIDIR_SORTED_MAP_V_TYPE, GEE_READ_ONLY_BIDIR_SORTED_MAP_V_DUP_FUNC, - GEE_READ_ONLY_BIDIR_SORTED_MAP_V_DESTROY_FUNC + GEE_READ_ONLY_BIDIR_SORTED_MAP_V_DESTROY_FUNC, + GEE_READ_ONLY_BIDIR_SORTED_MAP_READ_ONLY_VIEW }; GeeReadOnlyBidirSortedMap* gee_read_only_bidir_sorted_map_new (GType k_type, GBoxedCopyFunc k_dup_func, GDestroyNotify k_destroy_func, GType v_type, GBoxedCopyFunc v_dup_func, GDestroyNotify v_destroy_func, GeeBidirSortedMap* map); GeeReadOnlyBidirSortedMap* gee_read_only_bidir_sorted_map_construct (GType object_type, GType k_type, GBoxedCopyFunc k_dup_func, GDestroyNotify k_destroy_func, GType v_type, GBoxedCopyFunc v_dup_func, GDestroyNotify v_destroy_func, GeeBidirSortedMap* map); @@ -506,7 +507,7 @@ gboolean gee_bidir_map_iterator_last (GeeBidirMapIterator* self); static void _vala_gee_read_only_bidir_sorted_map_bidir_map_iterator_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gee_read_only_bidir_sorted_map_bidir_map_iterator_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); -GeeMap* gee_read_only_map_get_read_only_view (GeeReadOnlyMap* self); +GeeBidirSortedMap* gee_bidir_sorted_map_get_read_only_view (GeeBidirSortedMap* self); static void _vala_gee_read_only_bidir_sorted_map_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gee_read_only_bidir_sorted_map_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -560,6 +561,22 @@ } +static gpointer _g_object_ref0 (gpointer self) { + return self ? g_object_ref (self) : NULL; +} + + +static GeeBidirSortedMap* gee_read_only_bidir_sorted_map_real_get_read_only_view (GeeBidirSortedMap* base) { + GeeBidirSortedMap* result; + GeeReadOnlyBidirSortedMap* self; + GeeBidirSortedMap* _tmp0_ = NULL; + self = (GeeReadOnlyBidirSortedMap*) base; + _tmp0_ = _g_object_ref0 ((GeeBidirSortedMap*) self); + result = _tmp0_; + return result; +} + + GeeReadOnlyBidirSortedMapBidirMapIterator* gee_read_only_bidir_sorted_map_bidir_map_iterator_construct (GType object_type, GType k_type, GBoxedCopyFunc k_dup_func, GDestroyNotify k_destroy_func, GType v_type, GBoxedCopyFunc v_dup_func, GDestroyNotify v_destroy_func, GeeBidirMapIterator* iterator) { GeeReadOnlyBidirSortedMapBidirMapIterator * self = NULL; GeeBidirMapIterator* _tmp0_ = NULL; @@ -762,6 +779,10 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), GEE_READ_ONLY_BIDIR_SORTED_MAP_V_TYPE, g_param_spec_gtype ("v-type", "type", "type", G_TYPE_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (G_OBJECT_CLASS (klass), GEE_READ_ONLY_BIDIR_SORTED_MAP_V_DUP_FUNC, g_param_spec_pointer ("v-dup-func", "dup func", "dup func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); g_object_class_install_property (G_OBJECT_CLASS (klass), GEE_READ_ONLY_BIDIR_SORTED_MAP_V_DESTROY_FUNC, g_param_spec_pointer ("v-destroy-func", "destroy func", "destroy func", G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + /** + * {@inheritDoc} + */ + g_object_class_install_property (G_OBJECT_CLASS (klass), GEE_READ_ONLY_BIDIR_SORTED_MAP_READ_ONLY_VIEW, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_BIDIR_SORTED_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } @@ -804,7 +825,7 @@ iface->get_v_type = (GType(*)(GeeBidirSortedMap*)) gee_read_only_bidir_sorted_map_gee_bidir_sorted_map_get_v_type; iface->get_v_dup_func = (GBoxedCopyFunc(*)(GeeBidirSortedMap*)) gee_read_only_bidir_sorted_map_gee_bidir_sorted_map_get_v_dup_func; iface->get_v_destroy_func = (GDestroyNotify(*)(GeeBidirSortedMap*)) gee_read_only_bidir_sorted_map_gee_bidir_sorted_map_get_v_destroy_func; - iface->get_read_only_view = (GeeBidirSortedMap* (*) (GeeBidirSortedMap *)) gee_read_only_map_get_read_only_view; + iface->get_read_only_view = gee_read_only_bidir_sorted_map_real_get_read_only_view; } @@ -840,6 +861,9 @@ GeeReadOnlyBidirSortedMap * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, GEE_TYPE_READ_ONLY_BIDIR_SORTED_MAP, GeeReadOnlyBidirSortedMap); switch (property_id) { + case GEE_READ_ONLY_BIDIR_SORTED_MAP_READ_ONLY_VIEW: + g_value_take_object (value, gee_bidir_sorted_map_get_read_only_view ((GeeBidirSortedMap*) self)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; diff -Nru libgee-0.8-0.10.2/gee/readonlybidirsortedmap.vala libgee-0.8-0.10.5/gee/readonlybidirsortedmap.vala --- libgee-0.8-0.10.2/gee/readonlybidirsortedmap.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlybidirsortedmap.vala 2013-09-14 11:11:09.000000000 +0000 @@ -46,6 +46,15 @@ return new BidirMapIterator ((_map as BidirSortedMap).bidir_map_iterator ()); } + /** + * {@inheritDoc} + */ + public BidirSortedMap read_only_view { + owned get { + return this; + } + } + protected class BidirMapIterator : Gee.ReadOnlyMap.MapIterator, Gee.BidirMapIterator { public BidirMapIterator (Gee.BidirMapIterator iterator) { base (iterator); diff -Nru libgee-0.8-0.10.2/gee/readonlybidirsortedset.c libgee-0.8-0.10.5/gee/readonlybidirsortedset.c --- libgee-0.8-0.10.2/gee/readonlybidirsortedset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlybidirsortedset.c 2013-09-16 17:43:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlybidirsortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlybidirsortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlybidirsortedset.vala, do not modify */ /* readonlybidirsortedset.vala diff -Nru libgee-0.8-0.10.2/gee/readonlycollection.c libgee-0.8-0.10.5/gee/readonlycollection.c --- libgee-0.8-0.10.2/gee/readonlycollection.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlycollection.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlycollection.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlycollection.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlycollection.vala, do not modify */ /* readonlycollection.vala diff -Nru libgee-0.8-0.10.2/gee/readonlylist.c libgee-0.8-0.10.5/gee/readonlylist.c --- libgee-0.8-0.10.2/gee/readonlylist.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlylist.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlylist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlylist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlylist.vala, do not modify */ /* readonlylist.vala diff -Nru libgee-0.8-0.10.2/gee/readonlymap.c libgee-0.8-0.10.5/gee/readonlymap.c --- libgee-0.8-0.10.2/gee/readonlymap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlymap.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlymap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlymap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlymap.vala, do not modify */ /* readonlymap.vala diff -Nru libgee-0.8-0.10.2/gee/readonlymultimap.c libgee-0.8-0.10.5/gee/readonlymultimap.c --- libgee-0.8-0.10.2/gee/readonlymultimap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlymultimap.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlymultimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlymultimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlymultimap.vala, do not modify */ /* readonlymultimap.vala diff -Nru libgee-0.8-0.10.2/gee/readonlymultiset.c libgee-0.8-0.10.5/gee/readonlymultiset.c --- libgee-0.8-0.10.2/gee/readonlymultiset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlymultiset.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlymultiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlymultiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlymultiset.vala, do not modify */ /* readonlymultiset.vala diff -Nru libgee-0.8-0.10.2/gee/readonlyset.c libgee-0.8-0.10.5/gee/readonlyset.c --- libgee-0.8-0.10.2/gee/readonlyset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlyset.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlyset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlyset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlyset.vala, do not modify */ /* readonlyset.vala diff -Nru libgee-0.8-0.10.2/gee/readonlysortedmap.c libgee-0.8-0.10.5/gee/readonlysortedmap.c --- libgee-0.8-0.10.2/gee/readonlysortedmap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlysortedmap.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlysortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlysortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlysortedmap.vala, do not modify */ /* readonlysortedmap.vala @@ -357,7 +357,8 @@ GEE_READ_ONLY_SORTED_MAP_V_DUP_FUNC, GEE_READ_ONLY_SORTED_MAP_V_DESTROY_FUNC, GEE_READ_ONLY_SORTED_MAP_ASCENDING_KEYS, - GEE_READ_ONLY_SORTED_MAP_ASCENDING_ENTRIES + GEE_READ_ONLY_SORTED_MAP_ASCENDING_ENTRIES, + GEE_READ_ONLY_SORTED_MAP_READ_ONLY_VIEW }; GeeReadOnlySortedMap* gee_read_only_sorted_map_new (GType k_type, GBoxedCopyFunc k_dup_func, GDestroyNotify k_destroy_func, GType v_type, GBoxedCopyFunc v_dup_func, GDestroyNotify v_destroy_func, GeeMap* map); GeeReadOnlySortedMap* gee_read_only_sorted_map_construct (GType object_type, GType k_type, GBoxedCopyFunc k_dup_func, GDestroyNotify k_destroy_func, GType v_type, GBoxedCopyFunc v_dup_func, GDestroyNotify v_destroy_func, GeeMap* map); @@ -373,7 +374,6 @@ GeeSortedSet* gee_sorted_map_get_ascending_keys (GeeSortedMap* self); GeeSortedSet* gee_sorted_set_get_read_only_view (GeeSortedSet* self); GeeSortedSet* gee_sorted_map_get_ascending_entries (GeeSortedMap* self); -GeeMap* gee_read_only_map_get_read_only_view (GeeReadOnlyMap* self); static void _vala_gee_read_only_sorted_map_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_gee_read_only_sorted_map_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -535,6 +535,22 @@ } +static gpointer _g_object_ref0 (gpointer self) { + return self ? g_object_ref (self) : NULL; +} + + +static GeeSortedMap* gee_read_only_sorted_map_real_get_read_only_view (GeeSortedMap* base) { + GeeSortedMap* result; + GeeReadOnlySortedMap* self; + GeeSortedMap* _tmp0_ = NULL; + self = (GeeReadOnlySortedMap*) base; + _tmp0_ = _g_object_ref0 ((GeeSortedMap*) self); + result = _tmp0_; + return result; +} + + static void gee_read_only_sorted_map_class_init (GeeReadOnlySortedMapClass * klass) { gee_read_only_sorted_map_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GeeReadOnlySortedMapPrivate)); @@ -554,6 +570,10 @@ * {@inheritDoc} */ g_object_class_install_property (G_OBJECT_CLASS (klass), GEE_READ_ONLY_SORTED_MAP_ASCENDING_ENTRIES, g_param_spec_object ("ascending-entries", "ascending-entries", "ascending-entries", GEE_TYPE_SORTED_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + /** + * {@inheritDoc} + */ + g_object_class_install_property (G_OBJECT_CLASS (klass), GEE_READ_ONLY_SORTED_MAP_READ_ONLY_VIEW, g_param_spec_object ("read-only-view", "read-only-view", "read-only-view", GEE_TYPE_SORTED_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } @@ -564,7 +584,7 @@ iface->sub_map = (GeeSortedMap* (*)(GeeSortedMap*, gconstpointer, gconstpointer)) gee_read_only_sorted_map_real_sub_map; iface->get_ascending_keys = gee_read_only_sorted_map_real_get_ascending_keys; iface->get_ascending_entries = gee_read_only_sorted_map_real_get_ascending_entries; - iface->get_read_only_view = (GeeSortedMap* (*) (GeeSortedMap *)) gee_read_only_map_get_read_only_view; + iface->get_read_only_view = gee_read_only_sorted_map_real_get_read_only_view; } @@ -606,6 +626,9 @@ case GEE_READ_ONLY_SORTED_MAP_ASCENDING_ENTRIES: g_value_take_object (value, gee_sorted_map_get_ascending_entries ((GeeSortedMap*) self)); break; + case GEE_READ_ONLY_SORTED_MAP_READ_ONLY_VIEW: + g_value_take_object (value, gee_sorted_map_get_read_only_view ((GeeSortedMap*) self)); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; diff -Nru libgee-0.8-0.10.2/gee/readonlysortedmap.vala libgee-0.8-0.10.5/gee/readonlysortedmap.vala --- libgee-0.8-0.10.2/gee/readonlysortedmap.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlysortedmap.vala 2013-09-14 11:11:09.000000000 +0000 @@ -77,5 +77,14 @@ return (_map as SortedMap).ascending_entries.read_only_view; } } + + /** + * {@inheritDoc} + */ + public SortedMap read_only_view { + owned get { + return this; + } + } } diff -Nru libgee-0.8-0.10.2/gee/readonlysortedset.c libgee-0.8-0.10.5/gee/readonlysortedset.c --- libgee-0.8-0.10.2/gee/readonlysortedset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/readonlysortedset.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* readonlysortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* readonlysortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from readonlysortedset.vala, do not modify */ /* readonlysortedset.vala diff -Nru libgee-0.8-0.10.2/gee/set.c libgee-0.8-0.10.5/gee/set.c --- libgee-0.8-0.10.2/gee/set.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/set.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* set.c generated by valac 0.20.1.52-2186, the Vala compiler +/* set.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from set.vala, do not modify */ /* set.vala diff -Nru libgee-0.8-0.10.2/gee/sortedmap.c libgee-0.8-0.10.5/gee/sortedmap.c --- libgee-0.8-0.10.2/gee/sortedmap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/sortedmap.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* sortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* sortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from sortedmap.vala, do not modify */ /* sortedset.vala diff -Nru libgee-0.8-0.10.2/gee/sortedset.c libgee-0.8-0.10.5/gee/sortedset.c --- libgee-0.8-0.10.2/gee/sortedset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/sortedset.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* sortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* sortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from sortedset.vala, do not modify */ /* sortedset.vala diff -Nru libgee-0.8-0.10.2/gee/timsort.c libgee-0.8-0.10.5/gee/timsort.c --- libgee-0.8-0.10.2/gee/timsort.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/timsort.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* timsort.c generated by valac 0.20.1.52-2186, the Vala compiler +/* timsort.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from timsort.vala, do not modify */ /* timsort.vala diff -Nru libgee-0.8-0.10.2/gee/traversable.c libgee-0.8-0.10.5/gee/traversable.c --- libgee-0.8-0.10.2/gee/traversable.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/traversable.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* traversable.c generated by valac 0.20.1.52-2186, the Vala compiler +/* traversable.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from traversable.vala, do not modify */ /* traversable.vala diff -Nru libgee-0.8-0.10.2/gee/treemap.c libgee-0.8-0.10.5/gee/treemap.c --- libgee-0.8-0.10.2/gee/treemap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/treemap.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* treemap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* treemap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from treemap.vala, do not modify */ /* treemap.vala @@ -10851,7 +10851,7 @@ _tmp1_ = f; _tmp1__target = f_target; _tmp2_ = ((GeeTreeMapNodeIterator*) self)->current; - _tmp3_ = _tmp2_->key; + _tmp3_ = _tmp2_->value; _tmp4_ = ((_tmp3_ != NULL) && (self->priv->v_dup_func != NULL)) ? self->priv->v_dup_func ((gpointer) _tmp3_) : ((gpointer) _tmp3_); _tmp5_ = _tmp1_ (_tmp4_, _tmp1__target); if (!_tmp5_) { @@ -10911,7 +10911,7 @@ _tmp18_ = f; _tmp18__target = f_target; _tmp19_ = ((GeeTreeMapNodeIterator*) self)->current; - _tmp20_ = _tmp19_->key; + _tmp20_ = _tmp19_->value; _tmp21_ = ((_tmp20_ != NULL) && (self->priv->v_dup_func != NULL)) ? self->priv->v_dup_func ((gpointer) _tmp20_) : ((gpointer) _tmp20_); _tmp22_ = _tmp18_ (_tmp21_, _tmp18__target); if (!_tmp22_) { diff -Nru libgee-0.8-0.10.2/gee/treemap.vala libgee-0.8-0.10.5/gee/treemap.vala --- libgee-0.8-0.10.2/gee/treemap.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/treemap.vala 2013-09-14 11:00:34.000000000 +0000 @@ -1714,7 +1714,7 @@ public bool foreach (ForallFunc f) { if (current != null) { - if (!f (current.key)) { + if (!f (current.value)) { return false; } current = current.next; @@ -1729,7 +1729,7 @@ } } for (; current != null; current = current.next) { - if (!f (current.key)) { + if (!f (current.value)) { return false; } } diff -Nru libgee-0.8-0.10.2/gee/treemultimap.c libgee-0.8-0.10.5/gee/treemultimap.c --- libgee-0.8-0.10.2/gee/treemultimap.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/treemultimap.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* treemultimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* treemultimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from treemultimap.vala, do not modify */ /* treemultimap.vala diff -Nru libgee-0.8-0.10.2/gee/treemultiset.c libgee-0.8-0.10.5/gee/treemultiset.c --- libgee-0.8-0.10.2/gee/treemultiset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/treemultiset.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* treemultiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* treemultiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from treemultiset.vala, do not modify */ /* treemultiset.vala diff -Nru libgee-0.8-0.10.2/gee/treeset.c libgee-0.8-0.10.5/gee/treeset.c --- libgee-0.8-0.10.2/gee/treeset.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/treeset.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* treeset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* treeset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from treeset.vala, do not modify */ /* treeset.vala @@ -482,7 +482,7 @@ GDestroyNotify g_destroy_func; GeeTreeSet* _set; gint stamp; - GeeTreeSetNode* current; + GeeTreeSetNode* _current; GeeTreeSetNode* _next; GeeTreeSetNode* _prev; gboolean started; @@ -2659,7 +2659,7 @@ _g_object_unref0 (self->priv->_set); self->priv->_set = _tmp1_; _tmp2_ = current; - self->priv->current = _tmp2_; + self->priv->_current = _tmp2_; _tmp3_ = set; _tmp4_ = _tmp3_->priv->stamp; self->priv->stamp = _tmp4_; @@ -2685,18 +2685,18 @@ _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->stamp; _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); - _tmp3_ = self->priv->current; + _tmp3_ = self->priv->_current; if (_tmp3_ != NULL) { GeeTreeSetNode* _tmp4_ = NULL; GeeTreeSetNode* _tmp5_ = NULL; - _tmp4_ = self->priv->current; + _tmp4_ = self->priv->_current; _tmp5_ = _tmp4_->next; if (_tmp5_ != NULL) { GeeTreeSetNode* _tmp6_ = NULL; GeeTreeSetNode* _tmp7_ = NULL; - _tmp6_ = self->priv->current; + _tmp6_ = self->priv->_current; _tmp7_ = _tmp6_->next; - self->priv->current = _tmp7_; + self->priv->_current = _tmp7_; result = TRUE; return result; } else { @@ -2712,9 +2712,9 @@ GeeTreeSetNode* _tmp11_ = NULL; _tmp9_ = self->priv->_set; _tmp10_ = _tmp9_->priv->_first; - self->priv->current = _tmp10_; + self->priv->_current = _tmp10_; self->priv->started = TRUE; - _tmp11_ = self->priv->current; + _tmp11_ = self->priv->_current; result = _tmp11_ != NULL; return result; } else { @@ -2722,13 +2722,13 @@ GeeTreeSetNode* _tmp13_ = NULL; GeeTreeSetNode* _tmp14_ = NULL; _tmp12_ = self->priv->_next; - self->priv->current = _tmp12_; - _tmp13_ = self->priv->current; + self->priv->_current = _tmp12_; + _tmp13_ = self->priv->_current; if (_tmp13_ != NULL) { self->priv->_next = NULL; self->priv->_prev = NULL; } - _tmp14_ = self->priv->current; + _tmp14_ = self->priv->_current; result = _tmp14_ != NULL; return result; } @@ -2771,7 +2771,7 @@ gboolean _tmp10_ = FALSE; GeeTreeSetNode* _tmp11_ = NULL; gboolean _tmp13_ = FALSE; - _tmp11_ = self->priv->current; + _tmp11_ = self->priv->_current; if (_tmp11_ == NULL) { GeeTreeSetNode* _tmp12_ = NULL; _tmp12_ = self->priv->_next; @@ -2789,11 +2789,11 @@ gboolean _tmp15_ = FALSE; GeeTreeSetNode* _tmp16_ = NULL; gboolean _tmp19_ = FALSE; - _tmp16_ = self->priv->current; + _tmp16_ = self->priv->_current; if (_tmp16_ != NULL) { GeeTreeSetNode* _tmp17_ = NULL; GeeTreeSetNode* _tmp18_ = NULL; - _tmp17_ = self->priv->current; + _tmp17_ = self->priv->_current; _tmp18_ = _tmp17_->next; _tmp15_ = _tmp18_ != NULL; } else { @@ -2824,11 +2824,11 @@ _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); _tmp3_ = self->priv->_set; _tmp4_ = _tmp3_->priv->_first; - self->priv->current = _tmp4_; + self->priv->_current = _tmp4_; self->priv->_next = NULL; self->priv->_prev = NULL; self->priv->started = TRUE; - _tmp5_ = self->priv->current; + _tmp5_ = self->priv->_current; result = _tmp5_ != NULL; return result; } @@ -2846,18 +2846,18 @@ _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->stamp; _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); - _tmp3_ = self->priv->current; + _tmp3_ = self->priv->_current; if (_tmp3_ != NULL) { GeeTreeSetNode* _tmp4_ = NULL; GeeTreeSetNode* _tmp5_ = NULL; - _tmp4_ = self->priv->current; + _tmp4_ = self->priv->_current; _tmp5_ = _tmp4_->prev; if (_tmp5_ != NULL) { GeeTreeSetNode* _tmp6_ = NULL; GeeTreeSetNode* _tmp7_ = NULL; - _tmp6_ = self->priv->current; + _tmp6_ = self->priv->_current; _tmp7_ = _tmp6_->prev; - self->priv->current = _tmp7_; + self->priv->_current = _tmp7_; result = TRUE; return result; } else { @@ -2870,7 +2870,7 @@ if (_tmp8_ != NULL) { GeeTreeSetNode* _tmp9_ = NULL; _tmp9_ = self->priv->_prev; - self->priv->current = _tmp9_; + self->priv->_current = _tmp9_; self->priv->_next = NULL; self->priv->_prev = NULL; result = TRUE; @@ -2899,7 +2899,7 @@ _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->stamp; _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); - _tmp5_ = self->priv->current; + _tmp5_ = self->priv->_current; if (_tmp5_ == NULL) { GeeTreeSetNode* _tmp6_ = NULL; _tmp6_ = self->priv->_prev; @@ -2914,11 +2914,11 @@ gboolean _tmp8_ = FALSE; GeeTreeSetNode* _tmp9_ = NULL; gboolean _tmp12_ = FALSE; - _tmp9_ = self->priv->current; + _tmp9_ = self->priv->_current; if (_tmp9_ != NULL) { GeeTreeSetNode* _tmp10_ = NULL; GeeTreeSetNode* _tmp11_ = NULL; - _tmp10_ = self->priv->current; + _tmp10_ = self->priv->_current; _tmp11_ = _tmp10_->prev; _tmp8_ = _tmp11_ != NULL; } else { @@ -2949,11 +2949,11 @@ _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); _tmp3_ = self->priv->_set; _tmp4_ = _tmp3_->priv->_last; - self->priv->current = _tmp4_; + self->priv->_current = _tmp4_; self->priv->_next = NULL; self->priv->_prev = NULL; self->priv->started = TRUE; - _tmp5_ = self->priv->current; + _tmp5_ = self->priv->_current; result = _tmp5_ != NULL; return result; } @@ -2974,9 +2974,9 @@ _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->stamp; _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); - _tmp3_ = self->priv->current; - _vala_assert (_tmp3_ != NULL, "current != null"); - _tmp4_ = self->priv->current; + _tmp3_ = self->priv->_current; + _vala_assert (_tmp3_ != NULL, "_current != null"); + _tmp4_ = self->priv->_current; _tmp5_ = _tmp4_->key; _tmp6_ = ((_tmp5_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp5_) : ((gpointer) _tmp5_); result = _tmp6_; @@ -3009,11 +3009,11 @@ _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->stamp; _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); - _tmp3_ = self->priv->current; - _vala_assert (_tmp3_ != NULL, "current != null"); + _tmp3_ = self->priv->_current; + _vala_assert (_tmp3_ != NULL, "_current != null"); _tmp4_ = self->priv->_set; _tmp5_ = self->priv->_set; - _tmp6_ = self->priv->current; + _tmp6_ = self->priv->_current; _tmp7_ = _tmp6_->key; _tmp10_ = gee_tree_set_remove_from_node (_tmp4_, &_tmp5_->priv->root, _tmp7_, &_tmp8_, &_tmp9_); self->priv->_prev = _tmp8_; @@ -3030,7 +3030,7 @@ _tmp15_ = _tmp14_->priv->root; _tmp15_->color = GEE_TREE_SET_NODE_COLOR_BLACK; } - self->priv->current = NULL; + self->priv->_current = NULL; _tmp16_ = self->priv->stamp; self->priv->stamp = _tmp16_ + 1; _tmp17_ = self->priv->_set; @@ -3045,7 +3045,7 @@ gboolean result = FALSE; GeeTreeSetNode* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, FALSE); - _tmp0_ = self->priv->current; + _tmp0_ = self->priv->_current; if (_tmp0_ != NULL) { GeeTreeSet* _tmp1_ = NULL; GeeTreeSetNode* _tmp2_ = NULL; @@ -3054,12 +3054,12 @@ GeeTreeSetNode* _tmp5_ = NULL; GeeTreeSetNode* _tmp6_ = NULL; _tmp1_ = self->priv->_set; - _tmp2_ = self->priv->current; + _tmp2_ = self->priv->_current; _tmp3_ = _tmp2_->next; _tmp4_ = gee_tree_set_lift_null_get (_tmp1_, _tmp3_); ((_vala_val == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_vala_val = (self->priv->g_destroy_func (_vala_val), NULL)); _vala_val = _tmp4_; - _tmp5_ = self->priv->current; + _tmp5_ = self->priv->_current; _tmp6_ = _tmp5_->next; result = _tmp6_ != NULL; if (val) { @@ -3100,7 +3100,7 @@ gboolean result = FALSE; GeeTreeSetNode* _tmp0_ = NULL; g_return_val_if_fail (self != NULL, FALSE); - _tmp0_ = self->priv->current; + _tmp0_ = self->priv->_current; if (_tmp0_ != NULL) { GeeTreeSet* _tmp1_ = NULL; GeeTreeSetNode* _tmp2_ = NULL; @@ -3109,12 +3109,12 @@ GeeTreeSetNode* _tmp5_ = NULL; GeeTreeSetNode* _tmp6_ = NULL; _tmp1_ = self->priv->_set; - _tmp2_ = self->priv->current; + _tmp2_ = self->priv->_current; _tmp3_ = _tmp2_->prev; _tmp4_ = gee_tree_set_lift_null_get (_tmp1_, _tmp3_); ((_vala_val == NULL) || (self->priv->g_destroy_func == NULL)) ? NULL : (_vala_val = (self->priv->g_destroy_func (_vala_val), NULL)); _vala_val = _tmp4_; - _tmp5_ = self->priv->current; + _tmp5_ = self->priv->_current; _tmp6_ = _tmp5_->prev; result = _tmp6_ != NULL; if (val) { @@ -3156,77 +3156,103 @@ gint _tmp0_ = 0; GeeTreeSet* _tmp1_ = NULL; gint _tmp2_ = 0; + GeeTreeSetNode* current = NULL; GeeTreeSetNode* _tmp3_ = NULL; + GeeTreeSetNode* next = NULL; + GeeTreeSetNode* _tmp4_ = NULL; + GeeTreeSetNode* _tmp28_ = NULL; self = (GeeTreeSetIterator*) base; _tmp0_ = self->priv->stamp; _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->stamp; _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); - _tmp3_ = self->priv->current; - if (_tmp3_ != NULL) { - GeeForallFunc _tmp4_ = NULL; - void* _tmp4__target = NULL; - GeeTreeSetNode* _tmp5_ = NULL; - gconstpointer _tmp6_ = NULL; - gpointer _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - GeeTreeSetNode* _tmp9_ = NULL; + _tmp3_ = self->priv->_current; + current = _tmp3_; + _tmp4_ = current; + if (_tmp4_ != NULL) { + GeeForallFunc _tmp5_ = NULL; + void* _tmp5__target = NULL; + GeeTreeSetNode* _tmp6_ = NULL; + gconstpointer _tmp7_ = NULL; + gpointer _tmp8_ = NULL; + gboolean _tmp9_ = FALSE; GeeTreeSetNode* _tmp10_ = NULL; - _tmp4_ = f; - _tmp4__target = f_target; - _tmp5_ = self->priv->current; - _tmp6_ = _tmp5_->key; - _tmp7_ = ((_tmp6_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp6_) : ((gpointer) _tmp6_); - _tmp8_ = _tmp4_ (_tmp7_, _tmp4__target); - if (!_tmp8_) { + GeeTreeSetNode* _tmp11_ = NULL; + _tmp5_ = f; + _tmp5__target = f_target; + _tmp6_ = current; + _tmp7_ = _tmp6_->key; + _tmp8_ = ((_tmp7_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp7_) : ((gpointer) _tmp7_); + _tmp9_ = _tmp5_ (_tmp8_, _tmp5__target); + if (!_tmp9_) { result = FALSE; return result; } - _tmp9_ = self->priv->current; - _tmp10_ = _tmp9_->next; - self->priv->_next = _tmp10_; + _tmp10_ = current; + _tmp11_ = _tmp10_->next; + next = _tmp11_; } else { - gboolean _tmp11_ = FALSE; - _tmp11_ = self->priv->started; - if (!_tmp11_) { - GeeTreeSet* _tmp12_ = NULL; - GeeTreeSetNode* _tmp13_ = NULL; - _tmp12_ = self->priv->_set; - _tmp13_ = _tmp12_->priv->_first; - self->priv->_next = _tmp13_; + gboolean _tmp12_ = FALSE; + _tmp12_ = self->priv->started; + if (!_tmp12_) { + GeeTreeSet* _tmp13_ = NULL; + GeeTreeSetNode* _tmp14_ = NULL; + GeeTreeSetNode* _tmp15_ = NULL; + _tmp13_ = self->priv->_set; + _tmp14_ = _tmp13_->priv->_first; + next = _tmp14_; + _tmp15_ = next; + if (_tmp15_ != NULL) { + self->priv->started = TRUE; + } + } else { + GeeTreeSetNode* _tmp16_ = NULL; + GeeTreeSetNode* _tmp17_ = NULL; + _tmp16_ = self->priv->_next; + next = _tmp16_; + _tmp17_ = next; + if (_tmp17_ != NULL) { + self->priv->_next = NULL; + self->priv->_prev = NULL; + } } } while (TRUE) { - GeeTreeSetNode* _tmp14_ = NULL; - GeeTreeSetNode* _tmp15_ = NULL; - GeeForallFunc _tmp16_ = NULL; - void* _tmp16__target = NULL; - GeeTreeSetNode* _tmp17_ = NULL; - gconstpointer _tmp18_ = NULL; - gpointer _tmp19_ = NULL; - gboolean _tmp20_ = FALSE; - GeeTreeSetNode* _tmp21_ = NULL; - GeeTreeSetNode* _tmp22_ = NULL; - _tmp14_ = self->priv->_next; - if (!(_tmp14_ != NULL)) { + GeeTreeSetNode* _tmp18_ = NULL; + GeeForallFunc _tmp19_ = NULL; + void* _tmp19__target = NULL; + GeeTreeSetNode* _tmp20_ = NULL; + gconstpointer _tmp21_ = NULL; + gpointer _tmp22_ = NULL; + gboolean _tmp23_ = FALSE; + GeeTreeSetNode* _tmp25_ = NULL; + GeeTreeSetNode* _tmp26_ = NULL; + GeeTreeSetNode* _tmp27_ = NULL; + _tmp18_ = next; + if (!(_tmp18_ != NULL)) { break; } - _tmp15_ = self->priv->_next; - self->priv->current = _tmp15_; - _tmp16_ = f; - _tmp16__target = f_target; - _tmp17_ = self->priv->current; - _tmp18_ = _tmp17_->key; - _tmp19_ = ((_tmp18_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp18_) : ((gpointer) _tmp18_); - _tmp20_ = _tmp16_ (_tmp19_, _tmp16__target); - if (!_tmp20_) { + _tmp19_ = f; + _tmp19__target = f_target; + _tmp20_ = next; + _tmp21_ = _tmp20_->key; + _tmp22_ = ((_tmp21_ != NULL) && (self->priv->g_dup_func != NULL)) ? self->priv->g_dup_func ((gpointer) _tmp21_) : ((gpointer) _tmp21_); + _tmp23_ = _tmp19_ (_tmp22_, _tmp19__target); + if (!_tmp23_) { + GeeTreeSetNode* _tmp24_ = NULL; + _tmp24_ = next; + self->priv->_current = _tmp24_; result = FALSE; return result; } - _tmp21_ = self->priv->current; - _tmp22_ = _tmp21_->next; - self->priv->_next = _tmp22_; + _tmp25_ = next; + current = _tmp25_; + _tmp26_ = current; + _tmp27_ = _tmp26_->next; + next = _tmp27_; } + _tmp28_ = current; + self->priv->_current = _tmp28_; result = TRUE; return result; } @@ -3244,7 +3270,7 @@ _tmp1_ = self->priv->_set; _tmp2_ = _tmp1_->priv->stamp; _vala_assert (_tmp0_ == _tmp2_, "stamp == _set.stamp"); - _tmp3_ = self->priv->current; + _tmp3_ = self->priv->_current; result = _tmp3_ != NULL; return result; } @@ -3337,7 +3363,7 @@ static void gee_tree_set_iterator_instance_init (GeeTreeSetIterator * self) { self->priv = GEE_TREE_SET_ITERATOR_GET_PRIVATE (self); - self->priv->current = NULL; + self->priv->_current = NULL; self->priv->_next = NULL; self->priv->_prev = NULL; self->priv->started = FALSE; diff -Nru libgee-0.8-0.10.2/gee/treeset.vala libgee-0.8-0.10.5/gee/treeset.vala --- libgee-0.8-0.10.2/gee/treeset.vala 2013-07-12 18:56:15.000000000 +0000 +++ libgee-0.8-0.10.5/gee/treeset.vala 2013-09-16 17:41:45.000000000 +0000 @@ -590,62 +590,62 @@ public Iterator.pointing (TreeSet set, Node current) { this._set = set; - this.current = current; + this._current = current; this.stamp = set.stamp; this.started = true; } public bool next () { assert (stamp == _set.stamp); - if (current != null) { - if (current.next != null) { - current = current.next; + if (_current != null) { + if (_current.next != null) { + _current = _current.next; return true; } else { return false; } } else if (!started) { - current = _set._first; + _current = _set._first; started = true; - return current != null; + return _current != null; } else { - current = _next; - if (current != null) { + _current = _next; + if (_current != null) { _next = null; _prev = null; } - return current != null; + return _current != null; } } public bool has_next () { assert (stamp == _set.stamp); return (!started && _set._first != null) || - (current == null && _next != null) || - (current != null && current.next != null); + (_current == null && _next != null) || + (_current != null && _current.next != null); } public bool first () { assert (stamp == _set.stamp); - current = _set._first; + _current = _set._first; _next = null; _prev = null; started = true; - return current != null; // on false it is null anyway + return _current != null; // on false it is null anyway } public bool previous () { assert (stamp == _set.stamp); - if (current != null) { - if (current.prev != null) { - current = current.prev; + if (_current != null) { + if (_current.prev != null) { + _current = _current.prev; return true; } else { return false; } } else { if (_prev != null) { - current = _prev; + _current = _prev; _next = null; _prev = null; return true; @@ -657,40 +657,40 @@ public bool has_previous () { assert (stamp == _set.stamp); - return (current == null && _prev != null) || - (current != null && current.prev != null); + return (_current == null && _prev != null) || + (_current != null && _current.prev != null); } public bool last () { assert (stamp == _set.stamp); - current = _set._last; + _current = _set._last; _next = null; _prev = null; started = true; - return current != null; // on false it is null anyway + return _current != null; // on false it is null anyway } public new G get () { assert (stamp == _set.stamp); - assert (current != null); - return current.key; + assert (_current != null); + return _current.key; } public void remove () { assert (stamp == _set.stamp); - assert (current != null); - bool success = _set.remove_from_node (ref _set.root, current.key, out _prev, out _next); + assert (_current != null); + bool success = _set.remove_from_node (ref _set.root, _current.key, out _prev, out _next); assert (success); if (_set.root != null) _set.root.color = Node.Color.BLACK; - current = null; + _current = null; assert (stamp++ == _set.stamp++); } internal bool safe_next_get (out G val) { - if (current != null) { - val = _set.lift_null_get (current.next); - return current.next != null; + if (_current != null) { + val = _set.lift_null_get (_current.next); + return _current.next != null; } else { val = _set.lift_null_get (_next); return _next != null; @@ -698,22 +698,22 @@ } internal bool safe_previous_get (out G val) { - if (current != null) { - val = _set.lift_null_get (current.prev); - return current.prev != null; + if (_current != null) { + val = _set.lift_null_get (_current.prev); + return _current.prev != null; } else { val = _set.lift_null_get (_prev); return _next != null; } } - + public bool valid { get { assert (stamp == _set.stamp); - return current != null; + return _current != null; } } - + public bool read_only { get { return false; @@ -722,25 +722,37 @@ public bool foreach (ForallFunc f) { assert (stamp == _set.stamp); + unowned Node? current = _current, next; if (current != null) { if (!f (current.key)) { return false; } - _next = current.next; + next = current.next; } else if (!started) { - _next = _set._first; + next = _set._first; + if (next != null) { + started = true; + } + } else { + next = _next; + if (next != null) { + _next = null; + _prev = null; + } } - while (_next != null) { - current = _next; - if (!f (current.key)) { + while (next != null) { + if (!f (next.key)) { + _current = next; return false; } - _next = current.next; + current = next; + next = current.next; } + _current = current; return true; } - private weak Node? current = null; + private weak Node? _current = null; private weak Node? _next = null; private weak Node? _prev = null; private bool started = false; @@ -1111,13 +1123,13 @@ assert (iterator != null); iterator.remove (); } - + public bool read_only { get { return false; } } - + public bool valid { get { return iterator.valid; diff -Nru libgee-0.8-0.10.2/gee/unfolditerator.c libgee-0.8-0.10.5/gee/unfolditerator.c --- libgee-0.8-0.10.2/gee/unfolditerator.c 2013-07-12 19:10:10.000000000 +0000 +++ libgee-0.8-0.10.5/gee/unfolditerator.c 2013-09-16 17:43:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* unfolditerator.c generated by valac 0.20.1.52-2186, the Vala compiler +/* unfolditerator.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from unfolditerator.vala, do not modify */ /* unfolditerator.vala diff -Nru libgee-0.8-0.10.2/tests/Makefile.in libgee-0.8-0.10.5/tests/Makefile.in --- libgee-0.8-0.10.2/tests/Makefile.in 2013-07-12 20:03:05.000000000 +0000 +++ libgee-0.8-0.10.5/tests/Makefile.in 2013-09-16 17:43:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 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, @@ -17,23 +17,51 @@ # GLIB - Library of useful C routines VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + 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; \ - test $$am__dry = yes; \ - } + 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@ @@ -52,10 +80,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/tests_vala.stamp $(top_srcdir)/Makefile.decl \ - $(top_srcdir)/depcomp testarraylist.c testarrayqueue.c \ - testbidirlist.c testbidirsortedmap.c testbidirsortedset.c \ +DIST_COMMON = $(top_srcdir)/Makefile.decl $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am testarraylist.c testarrayqueue.c \ + testbidirlist.c testbidirsortedset.c testbidirsortedmap.c \ testcase.c testcollection.c testconcurrentlist.c \ testconcurrentset.c testdata.c testdeque.c testfunctions.c \ testhashmap.c testhashmultimap.c testhashmultiset.c \ @@ -63,9 +90,9 @@ testlist.c testmain.c testmap.c testmultimap.c testmultiset.c \ testpriorityqueue.c testqueue.c testreadonlybidirlist.c \ testreadonlycollection.c testreadonlylist.c testreadonlymap.c \ - testreadonlyset.c testset.c testsortedmap.c testsortedset.c \ + testreadonlyset.c testset.c testsortedset.c testsortedmap.c \ testtreemap.c testtreemultimap.c testtreemultiset.c \ - testtreeset.c + testtreeset.c $(top_srcdir)/depcomp $(srcdir)/tests_vala.stamp noinst_PROGRAMS = $(am__EXEEXT_1) subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -161,6 +188,23 @@ 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) @@ -412,6 +456,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + tests$(EXEEXT): $(tests_OBJECTS) $(tests_DEPENDENCIES) $(EXTRA_tests_DEPENDENCIES) @rm -f tests$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tests_OBJECTS) $(tests_LDADD) $(LIBS) @@ -465,14 +510,14 @@ @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 $< +@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 `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1194,26 +1239,15 @@ clean-libtool: -rm -rf .libs _libs -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 +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +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 \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1225,15 +1259,11 @@ $$unique; \ 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) \ $$unique @@ -1242,9 +1272,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1473,19 +1504,19 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ - cscopelist ctags distclean distclean-compile distclean-generic \ - distclean-libtool 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 \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool 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 mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am ### testing rules diff -Nru libgee-0.8-0.10.2/tests/testarraylist.c libgee-0.8-0.10.5/tests/testarraylist.c --- libgee-0.8-0.10.2/tests/testarraylist.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testarraylist.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testarraylist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testarraylist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testarraylist.vala, do not modify */ /* testarraylist.vala diff -Nru libgee-0.8-0.10.2/tests/testarrayqueue.c libgee-0.8-0.10.5/tests/testarrayqueue.c --- libgee-0.8-0.10.2/tests/testarrayqueue.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testarrayqueue.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testarrayqueue.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testarrayqueue.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testarrayqueue.vala, do not modify */ /* arrayqueue.vala diff -Nru libgee-0.8-0.10.2/tests/testbidirlist.c libgee-0.8-0.10.5/tests/testbidirlist.c --- libgee-0.8-0.10.2/tests/testbidirlist.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testbidirlist.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testbidirlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testbidirlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testbidirlist.vala, do not modify */ /* testbidirlist.vala diff -Nru libgee-0.8-0.10.2/tests/testbidirsortedmap.c libgee-0.8-0.10.5/tests/testbidirsortedmap.c --- libgee-0.8-0.10.2/tests/testbidirsortedmap.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testbidirsortedmap.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testbidirsortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testbidirsortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testbidirsortedmap.vala, do not modify */ /* testbidirsortedmap.vala diff -Nru libgee-0.8-0.10.2/tests/testbidirsortedset.c libgee-0.8-0.10.5/tests/testbidirsortedset.c --- libgee-0.8-0.10.2/tests/testbidirsortedset.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testbidirsortedset.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testbidirsortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testbidirsortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testbidirsortedset.vala, do not modify */ /* testbidirsortedset.vala diff -Nru libgee-0.8-0.10.2/tests/testcase.c libgee-0.8-0.10.5/tests/testcase.c --- libgee-0.8-0.10.2/tests/testcase.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testcase.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testcase.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testcase.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testcase.vala, do not modify */ /* testcase.vala diff -Nru libgee-0.8-0.10.2/tests/testcollection.c libgee-0.8-0.10.5/tests/testcollection.c --- libgee-0.8-0.10.2/tests/testcollection.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testcollection.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testcollection.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testcollection.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testcollection.vala, do not modify */ /* testcollection.vala diff -Nru libgee-0.8-0.10.2/tests/testconcurrentlist.c libgee-0.8-0.10.5/tests/testconcurrentlist.c --- libgee-0.8-0.10.2/tests/testconcurrentlist.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testconcurrentlist.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testconcurrentlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testconcurrentlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testconcurrentlist.vala, do not modify */ /* testconcurrentlist.vala diff -Nru libgee-0.8-0.10.2/tests/testconcurrentset.c libgee-0.8-0.10.5/tests/testconcurrentset.c --- libgee-0.8-0.10.2/tests/testconcurrentset.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testconcurrentset.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testconcurrentset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testconcurrentset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testconcurrentset.vala, do not modify */ /* testconcurrentset.vala diff -Nru libgee-0.8-0.10.2/tests/testdata.c libgee-0.8-0.10.5/tests/testdata.c --- libgee-0.8-0.10.2/tests/testdata.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testdata.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testdata.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testdata.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testdata.vala, do not modify */ /* testcollection.vala diff -Nru libgee-0.8-0.10.2/tests/testdeque.c libgee-0.8-0.10.5/tests/testdeque.c --- libgee-0.8-0.10.2/tests/testdeque.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testdeque.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testdeque.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testdeque.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testdeque.vala, do not modify */ /* testdeque.vala diff -Nru libgee-0.8-0.10.2/tests/testfunctions.c libgee-0.8-0.10.5/tests/testfunctions.c --- libgee-0.8-0.10.2/tests/testfunctions.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testfunctions.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testfunctions.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testfunctions.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testfunctions.vala, do not modify */ /* testfunctions.vala diff -Nru libgee-0.8-0.10.2/tests/testhashmap.c libgee-0.8-0.10.5/tests/testhashmap.c --- libgee-0.8-0.10.2/tests/testhashmap.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testhashmap.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testhashmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testhashmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testhashmap.vala, do not modify */ /* testhashmap.vala diff -Nru libgee-0.8-0.10.2/tests/testhashmultimap.c libgee-0.8-0.10.5/tests/testhashmultimap.c --- libgee-0.8-0.10.2/tests/testhashmultimap.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testhashmultimap.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testhashmultimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testhashmultimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testhashmultimap.vala, do not modify */ /* testhashmultimap.vala diff -Nru libgee-0.8-0.10.2/tests/testhashmultiset.c libgee-0.8-0.10.5/tests/testhashmultiset.c --- libgee-0.8-0.10.2/tests/testhashmultiset.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testhashmultiset.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testhashmultiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testhashmultiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testhashmultiset.vala, do not modify */ /* testhashmultiset.vala diff -Nru libgee-0.8-0.10.2/tests/testhashset.c libgee-0.8-0.10.5/tests/testhashset.c --- libgee-0.8-0.10.2/tests/testhashset.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testhashset.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testhashset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testhashset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testhashset.vala, do not modify */ /* testhashset.vala diff -Nru libgee-0.8-0.10.2/tests/testlinkedlist.c libgee-0.8-0.10.5/tests/testlinkedlist.c --- libgee-0.8-0.10.2/tests/testlinkedlist.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testlinkedlist.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testlinkedlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testlinkedlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testlinkedlist.vala, do not modify */ /* testlinkedlist.vala diff -Nru libgee-0.8-0.10.2/tests/testlinkedlistasdeque.c libgee-0.8-0.10.5/tests/testlinkedlistasdeque.c --- libgee-0.8-0.10.2/tests/testlinkedlistasdeque.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testlinkedlistasdeque.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testlinkedlistasdeque.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testlinkedlistasdeque.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testlinkedlistasdeque.vala, do not modify */ /* testlinkedlistasdeque.vala diff -Nru libgee-0.8-0.10.2/tests/testlist.c libgee-0.8-0.10.5/tests/testlist.c --- libgee-0.8-0.10.2/tests/testlist.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testlist.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testlist.vala, do not modify */ /* testlist.vala diff -Nru libgee-0.8-0.10.2/tests/testmain.c libgee-0.8-0.10.5/tests/testmain.c --- libgee-0.8-0.10.2/tests/testmain.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testmain.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testmain.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testmain.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testmain.vala, do not modify */ /* testmain.vala diff -Nru libgee-0.8-0.10.2/tests/testmap.c libgee-0.8-0.10.5/tests/testmap.c --- libgee-0.8-0.10.2/tests/testmap.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testmap.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testmap.vala, do not modify */ /* testmap.vala diff -Nru libgee-0.8-0.10.2/tests/testmultimap.c libgee-0.8-0.10.5/tests/testmultimap.c --- libgee-0.8-0.10.2/tests/testmultimap.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testmultimap.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testmultimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testmultimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testmultimap.vala, do not modify */ /* testmultimap.vala diff -Nru libgee-0.8-0.10.2/tests/testmultiset.c libgee-0.8-0.10.5/tests/testmultiset.c --- libgee-0.8-0.10.2/tests/testmultiset.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testmultiset.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testmultiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testmultiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testmultiset.vala, do not modify */ /* testmultiset.vala diff -Nru libgee-0.8-0.10.2/tests/testpriorityqueue.c libgee-0.8-0.10.5/tests/testpriorityqueue.c --- libgee-0.8-0.10.2/tests/testpriorityqueue.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testpriorityqueue.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testpriorityqueue.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testpriorityqueue.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testpriorityqueue.vala, do not modify */ /* testpriorityqueue.vala diff -Nru libgee-0.8-0.10.2/tests/testqueue.c libgee-0.8-0.10.5/tests/testqueue.c --- libgee-0.8-0.10.2/tests/testqueue.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testqueue.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testqueue.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testqueue.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testqueue.vala, do not modify */ /* testqueue.vala diff -Nru libgee-0.8-0.10.2/tests/testreadonlybidirlist.c libgee-0.8-0.10.5/tests/testreadonlybidirlist.c --- libgee-0.8-0.10.2/tests/testreadonlybidirlist.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testreadonlybidirlist.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testreadonlybidirlist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testreadonlybidirlist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testreadonlybidirlist.vala, do not modify */ /* testreadonlybidirlist.vala diff -Nru libgee-0.8-0.10.2/tests/testreadonlycollection.c libgee-0.8-0.10.5/tests/testreadonlycollection.c --- libgee-0.8-0.10.2/tests/testreadonlycollection.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testreadonlycollection.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testreadonlycollection.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testreadonlycollection.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testreadonlycollection.vala, do not modify */ /* testreadonlycollection.vala diff -Nru libgee-0.8-0.10.2/tests/testreadonlylist.c libgee-0.8-0.10.5/tests/testreadonlylist.c --- libgee-0.8-0.10.2/tests/testreadonlylist.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testreadonlylist.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testreadonlylist.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testreadonlylist.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testreadonlylist.vala, do not modify */ /* testreadonlylist.vala diff -Nru libgee-0.8-0.10.2/tests/testreadonlymap.c libgee-0.8-0.10.5/tests/testreadonlymap.c --- libgee-0.8-0.10.2/tests/testreadonlymap.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testreadonlymap.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testreadonlymap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testreadonlymap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testreadonlymap.vala, do not modify */ /* testreadonlymap.vala diff -Nru libgee-0.8-0.10.2/tests/testreadonlyset.c libgee-0.8-0.10.5/tests/testreadonlyset.c --- libgee-0.8-0.10.2/tests/testreadonlyset.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testreadonlyset.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testreadonlyset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testreadonlyset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testreadonlyset.vala, do not modify */ /* testreadonlyset.vala diff -Nru libgee-0.8-0.10.2/tests/testset.c libgee-0.8-0.10.5/tests/testset.c --- libgee-0.8-0.10.2/tests/testset.c 2013-07-06 14:27:09.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testset.c 2013-09-16 17:43:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* testset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testset.vala, do not modify */ /* testset.vala diff -Nru libgee-0.8-0.10.2/tests/testsortedmap.c libgee-0.8-0.10.5/tests/testsortedmap.c --- libgee-0.8-0.10.2/tests/testsortedmap.c 2013-07-06 14:27:10.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testsortedmap.c 2013-09-16 17:43:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* testsortedmap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testsortedmap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testsortedmap.vala, do not modify */ /* sortedset.vala diff -Nru libgee-0.8-0.10.2/tests/testsortedset.c libgee-0.8-0.10.5/tests/testsortedset.c --- libgee-0.8-0.10.2/tests/testsortedset.c 2013-07-06 14:27:10.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testsortedset.c 2013-09-16 17:43:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* testsortedset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testsortedset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testsortedset.vala, do not modify */ /* testsortedset.vala diff -Nru libgee-0.8-0.10.2/tests/testtreemap.c libgee-0.8-0.10.5/tests/testtreemap.c --- libgee-0.8-0.10.2/tests/testtreemap.c 2013-07-06 14:27:10.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testtreemap.c 2013-09-16 17:43:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* testtreemap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testtreemap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testtreemap.vala, do not modify */ /* testtreemap.vala diff -Nru libgee-0.8-0.10.2/tests/testtreemultimap.c libgee-0.8-0.10.5/tests/testtreemultimap.c --- libgee-0.8-0.10.2/tests/testtreemultimap.c 2013-07-06 14:27:10.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testtreemultimap.c 2013-09-16 17:43:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* testtreemultimap.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testtreemultimap.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testtreemultimap.vala, do not modify */ /* testtreemultimap.vala diff -Nru libgee-0.8-0.10.2/tests/testtreemultiset.c libgee-0.8-0.10.5/tests/testtreemultiset.c --- libgee-0.8-0.10.2/tests/testtreemultiset.c 2013-07-06 14:27:10.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testtreemultiset.c 2013-09-16 17:43:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* testtreemultiset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testtreemultiset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testtreemultiset.vala, do not modify */ /* testtreemultiset.vala diff -Nru libgee-0.8-0.10.2/tests/testtreeset.c libgee-0.8-0.10.5/tests/testtreeset.c --- libgee-0.8-0.10.2/tests/testtreeset.c 2013-07-06 14:27:10.000000000 +0000 +++ libgee-0.8-0.10.5/tests/testtreeset.c 2013-09-16 17:43:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* testtreeset.c generated by valac 0.20.1.52-2186, the Vala compiler +/* testtreeset.c generated by valac 0.21.2.4-6740f, the Vala compiler * generated from testtreeset.vala, do not modify */ /* testtreeset.vala