diff -Nru vala-0.16-0.15.1/aclocal.m4 vala-0.16-0.15.2/aclocal.m4 --- vala-0.16-0.15.1/aclocal.m4 2012-01-26 21:07:35.000000000 +0000 +++ vala-0.16-0.15.2/aclocal.m4 2012-02-25 16:17:41.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.2 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -198,7 +198,7 @@ [am__api_version='1.11' 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.11.2], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,7 +214,7 @@ # 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.11.2])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1058,13 +1058,13 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2011 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. -# serial 1 +# serial 2 # AM_SILENT_RULES([DEFAULT]) # -------------------------- @@ -1079,6 +1079,36 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac +dnl +dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [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]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using `$V' instead of `$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl AC_SUBST([AM_DEFAULT_VERBOSITY])dnl AM_BACKSLASH='\' AC_SUBST([AM_BACKSLASH])dnl @@ -1136,7 +1166,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1158,10 +1188,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [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='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [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]) diff -Nru vala-0.16-0.15.1/build-aux/compile vala-0.16-0.15.2/build-aux/compile --- vala-0.16-0.15.1/build-aux/compile 2012-01-26 21:07:36.000000000 +0000 +++ vala-0.16-0.15.2/build-aux/compile 2012-02-25 16:17:42.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2010-11-15.09; # UTC +scriptversion=2012-01-04.17; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free +# Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -40,7 +40,7 @@ # func_file_conv build_file lazy # Convert a $build file to $host form and store it in $file -# Currently only supports Win32 hosts. If the determined conversion +# Currently only supports Windows hosts. If the determined conversion # type is listed in (the comma separated) LAZY, no conversion will # take place. func_file_conv () @@ -94,7 +94,7 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. + # configure might choose to run compile as 'compile cc -o foo foo.c'. eat=1 case $2 in *.o | *.[oO][bB][jJ]) @@ -196,19 +196,19 @@ case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to . EOF @@ -233,8 +233,8 @@ else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -261,10 +261,10 @@ done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -273,7 +273,7 @@ cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff -Nru vala-0.16-0.15.1/build-aux/config.guess vala-0.16-0.15.2/build-aux/config.guess --- vala-0.16-0.15.1/build-aux/config.guess 2012-01-26 21:07:36.000000000 +0000 +++ vala-0.16-0.15.2/build-aux/config.guess 2012-02-25 16:17:42.000000000 +0000 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-11-11' +timestamp='2012-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,8 +57,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +145,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -897,16 +897,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo hexagon-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -948,7 +948,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -989,7 +989,7 @@ echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu diff -Nru vala-0.16-0.15.1/build-aux/config.sub vala-0.16-0.15.2/build-aux/config.sub --- vala-0.16-0.15.1/build-aux/config.sub 2012-01-26 21:07:36.000000000 +0000 +++ vala-0.16-0.15.2/build-aux/config.sub 2012-02-25 16:17:42.000000000 +0000 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-11-11' +timestamp='2012-01-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,8 +76,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -320,7 +320,6 @@ basic_machine=tic6x-unknown ;; m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none ;; @@ -719,7 +718,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -1559,9 +1557,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -Nru vala-0.16-0.15.1/build-aux/missing vala-0.16-0.15.2/build-aux/missing --- vala-0.16-0.15.1/build-aux/missing 2012-01-26 21:07:36.000000000 +0000 +++ vala-0.16-0.15.2/build-aux/missing 2012-02-25 16:17:42.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-01-06.13; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. +# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -84,7 +84,6 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -122,15 +121,6 @@ # Not GNU programs, they don't have --version. ;; - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -226,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -256,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -318,41 +308,6 @@ touch $file ;; - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. diff -Nru vala-0.16-0.15.1/ccode/Makefile.in vala-0.16-0.15.2/ccode/Makefile.in --- vala-0.16-0.15.1/ccode/Makefile.in 2012-01-26 21:07:36.000000000 +0000 +++ vala-0.16-0.15.2/ccode/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -80,8 +80,8 @@ valaccodewriter.lo valaccodeelementaccess.lo $(am__objects_1) am_libvalaccode_la_OBJECTS = $(am__objects_2) $(am__objects_1) libvalaccode_la_OBJECTS = $(am_libvalaccode_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -93,21 +93,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libvalaccode_la_SOURCES) DIST_SOURCES = $(libvalaccode_la_SOURCES) @@ -416,7 +416,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libvalaccode.la: $(libvalaccode_la_OBJECTS) $(libvalaccode_la_DEPENDENCIES) +libvalaccode.la: $(libvalaccode_la_OBJECTS) $(libvalaccode_la_DEPENDENCIES) $(EXTRA_libvalaccode_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvalaccode_la_OBJECTS) $(libvalaccode_la_LIBADD) $(LIBS) mostlyclean-compile: diff -Nru vala-0.16-0.15.1/ChangeLog vala-0.16-0.15.2/ChangeLog --- vala-0.16-0.15.1/ChangeLog 2012-01-26 21:11:29.000000000 +0000 +++ vala-0.16-0.15.2/ChangeLog 2012-02-25 16:30:24.000000000 +0000 @@ -1,3 +1,191 @@ +2012-02-25 Jürg Billeter + + Release 0.15.2 + + gtk+-3.0: Add Widget.get_preferred_width_for_height_internal + +2012-02-24 Jens Georg + + libsoup2.4: Fix arguments for MessageHeaders.get_range + https://bugzilla.gnome.org/show_bug.cgi?id=670602 + +2012-02-23 Jürg Billeter + + gdk-3.0: Fix gdk_window_destroy binding again + +2012-02-21 Stefano Debenedetti + + posix: Add SockAddrIn6, In6Addr and inet_pton + Fixes bug 670492. + +2012-02-17 Luca Bruno + + glib-2.0: Make SourceFuncs a struct + Thanks to Paula Jakma for the patch. + + Fixes bug 669756. + +2012-02-13 Evan Nemerson + + glib-2.0: add g_thread_new and g_thread_try_new bindings + +2012-02-12 Evan Nemerson + + gtk+-3.0: update to 3.3.15 + +2012-02-11 Luca Bruno + + gio-2.0: Include gunixfdlist.h for UnixFDList + +2012-02-11 Jens Georg + + gstreamer-0.10: Add returns_floatin_reference to Element.make_from_uri + https://bugzilla.gnome.org/show_bug.cgi?id=669166 + +2012-02-10 Luca Bruno + + codegen: Allow usage of gtype structs inheriting non-gtype struct + The behavior of type_id is different, but get/set/take/marshaller aren't + as specific as type_id. Therefore this patch enhances without breaking. + + Fixes bug 669604. + +2012-02-10 Evan Nemerson + + glib-2.0: add some missing deprecation information + +2012-02-09 Luca Bruno + + gio-2.0: send_message_with_reply.out_serial is not out in vala + Fixes a regression introduced by the switch to GIR. + + Support initializer list for structs that have a base type + Fixes bug 669580. + +2012-02-08 Jesse van den Kieboom + + Added bindings for Object.new_valist + https://bugzilla.gnome.org/show_bug.cgi?id=669654 + + Added bindings for HashTable.foreach_remove + https://bugzilla.gnome.org/show_bug.cgi?id=669653 + + Added error when not exporting any namespaces for GIR + https://bugzilla.gnome.org/show_bug.cgi?id=669551 + +2012-02-07 Luca Bruno + + gdk-pixbuf-2.0: Fix regression against PixbufSaveFunc + The regression was introduced by the switch to gir. + + Fixes bug 669518. + +2012-02-06 Luca Bruno + + codegen: Fix C warning when passing lambda free functions + Fixes bug 663651. + +2012-02-06 Alexander Kurtz + + sdl: Make AudioSpec a struct, then fix Audio.open(), load() and mix() + Fixes bug 669279. + +2012-02-06 Luca Bruno + + codegen: Add support for delegate_target_cname in CCode + +2012-02-05 Philip Withnall + + vapi: Add glib-unix.h functions to glib-2.0.vapi + To bind the things in glib-unix.h. Creating a separate glib-unix-2.0.vapi is + unneccessary because these functions are present in libglib-2.0.so itself, + rather than a separate library. They just require the glib-unix.h header to + be included. + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=667894 + +2012-02-05 Ryan Lortie + + glib: add .data to StringBuilder + To do the same thing as string.data, but without the strlen() (since we + already know this from the GString's length field). + + https://bugzilla.gnome.org/show_bug.cgi?id=669313 + +2012-02-03 Ryan Lortie + + gtk+-3.0: some updates + - complete the move of the app-menu and menubar properties into + GtkApplication + + - add GtkActionable interface and its implementations + + - add gtk_menu_(bar_)new_from_model() APIs + + - drop a premature add of gtk_window_setup_persistent_state() + +2012-02-02 Alexander Kurtz + + glib-2.0: Mark OptionEntry.arg_description as nullable + Fixes bug 669241. + + glib-2.0: AsyncQueue.try_pop() and timed_pop() may return null + Fixes bug 669242. + +2012-02-01 Luca Bruno + + clutter-1.0: Add Box.layout_manager to not break code using old clutter + The Box.layout_manager property has been removed in commit 81cade2a + and broke code using old clutter versions. + +2012-02-01 Nathan Phillip Brink + + tests: Honor CFLAGS, LDFLAGS, and CPPFLAGS + Fixes bug 664606. + +2012-02-01 Jens Georg + + gstreamer-0.10: Add returns_floating_reference to gst_parse_bin_* + https://bugzilla.gnome.org/show_bug.cgi?id=669060 + +2012-02-01 Evan Nemerson + + libsoup-2.4: add type arguments for datalist arguments to form funcs + + x11: add GIR name for XID + + Add gir-bindings and gidl-bindings Makefile targets in vapi/ + + poppler-glib: switch to GIR + + clutter-1.0: update bindings + + girparser: support changing names of virtual methods without wrappers + Fixes bug 668991. + + codegen: support virtual functions with vfunc_name but no invokers + Partially fixes 668991. + +2012-01-31 Luca Bruno + + gtk+-2.0, gtk+-3.0: Mark Button.set_label parameter as nullable + Fixes bug 669058. + +2012-01-29 Luca Bruno + + cogl-1.0: Use a static method instead of a constructor for Cogl.Path + The Cogl.Path constructor never worked, use a static method instead. + + codegen: Fix getting NoAccessorMethod properties of real struct type + + libpeas-1.0: Fix ExtensionSetForeachFunc binding + Fixes bug 660362. + +2012-01-28 Luca Bruno + + gtk+-3.0: Mark WidgetPath.iter_has_region.flags as out + Fixes bug 668854. + 2012-01-26 Jürg Billeter Release 0.15.1 diff -Nru vala-0.16-0.15.1/codegen/codegen.vapi vala-0.16-0.15.2/codegen/codegen.vapi --- vala-0.16-0.15.1/codegen/codegen.vapi 2012-01-26 21:08:08.000000000 +0000 +++ vala-0.16-0.15.2/codegen/codegen.vapi 2012-02-25 16:22:01.000000000 +0000 @@ -43,6 +43,7 @@ public string copy_function { get; } public string default_value { get; } public bool delegate_target { get; private set; } + public string delegate_target_name { get; } public string destroy_function { get; } public string finish_name { get; } public string finish_real_name { get; } @@ -231,6 +232,7 @@ public static string get_ccode_declarator_suffix (Vala.DataType type); public static string get_ccode_default_value (Vala.TypeSymbol sym); public static bool get_ccode_delegate_target (Vala.CodeNode node); + public static string get_ccode_delegate_target_name (Vala.Variable variable); public static double get_ccode_delegate_target_pos (Vala.CodeNode node); public static string get_ccode_destroy_function (Vala.TypeSymbol sym); public static double get_ccode_destroy_notify_pos (Vala.CodeNode node); diff -Nru vala-0.16-0.15.1/codegen/Makefile.in vala-0.16-0.15.2/codegen/Makefile.in --- vala-0.16-0.15.1/codegen/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/codegen/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -106,8 +106,8 @@ $(am__objects_1) libvala@PACKAGE_SUFFIX@_la_OBJECTS = \ $(am_libvala@PACKAGE_SUFFIX@_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent libvala@PACKAGE_SUFFIX@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -123,21 +123,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libvala@PACKAGE_SUFFIX@_la_SOURCES) DIST_SOURCES = $(libvala@PACKAGE_SUFFIX@_la_SOURCES) @@ -433,7 +433,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libvala@PACKAGE_SUFFIX@.la: $(libvala@PACKAGE_SUFFIX@_la_OBJECTS) $(libvala@PACKAGE_SUFFIX@_la_DEPENDENCIES) +libvala@PACKAGE_SUFFIX@.la: $(libvala@PACKAGE_SUFFIX@_la_OBJECTS) $(libvala@PACKAGE_SUFFIX@_la_DEPENDENCIES) $(EXTRA_libvala@PACKAGE_SUFFIX@_la_DEPENDENCIES) $(AM_V_CCLD)$(libvala@PACKAGE_SUFFIX@_la_LINK) -rpath $(libdir) $(libvala@PACKAGE_SUFFIX@_la_OBJECTS) $(libvala@PACKAGE_SUFFIX@_la_LIBADD) $(LIBS) mostlyclean-compile: diff -Nru vala-0.16-0.15.1/codegen/valaccodeattribute.c vala-0.16-0.15.2/codegen/valaccodeattribute.c --- vala-0.16-0.15.1/codegen/valaccodeattribute.c 2012-01-26 21:08:05.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodeattribute.c 2012-02-25 16:21:57.000000000 +0000 @@ -112,6 +112,7 @@ gchar* _finish_vfunc_name; gchar* _finish_real_name; gchar* _real_name; + gchar* _delegate_target_name; }; @@ -210,6 +211,7 @@ const gchar* vala_ccode_attribute_get_finish_name (ValaCCodeAttribute* self); const gchar* vala_ccode_attribute_get_finish_vfunc_name (ValaCCodeAttribute* self); const gchar* vala_ccode_attribute_get_finish_real_name (ValaCCodeAttribute* self); +const gchar* vala_ccode_attribute_get_delegate_target_name (ValaCCodeAttribute* self); gboolean vala_ccode_attribute_get_array_length (ValaCCodeAttribute* self); const gchar* vala_ccode_attribute_get_array_length_type (ValaCCodeAttribute* self); gboolean vala_ccode_attribute_get_array_null_terminated (ValaCCodeAttribute* self); @@ -2743,7 +2745,7 @@ static gchar* vala_ccode_attribute_get_default_marshaller_type_name (ValaCCodeAttribute* self) { gchar* result = NULL; ValaSymbol* _tmp0_; - gchar* _tmp115_; + gchar* _tmp121_; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->sym; if (_tmp0_ != NULL) { @@ -2945,9 +2947,8 @@ ValaStruct* _tmp58_; ValaStruct* _tmp59_; ValaStruct* base_st; - ValaStruct* _tmp60_; - ValaStruct* _tmp63_; - gboolean _tmp64_ = FALSE; + ValaStruct* _tmp69_; + gboolean _tmp70_ = FALSE; _tmp54_ = self->priv->sym; _tmp55_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp54_)); st = _tmp55_; @@ -2956,55 +2957,76 @@ _tmp58_ = _tmp57_; _tmp59_ = _vala_code_node_ref0 (_tmp58_); base_st = _tmp59_; - _tmp60_ = base_st; - if (_tmp60_ != NULL) { + while (TRUE) { + ValaStruct* _tmp60_; ValaStruct* _tmp61_; - gchar* _tmp62_ = NULL; + gboolean _tmp62_ = FALSE; + _tmp60_ = base_st; + if (!(_tmp60_ != NULL)) { + break; + } _tmp61_ = base_st; - _tmp62_ = vala_ccode_base_module_get_ccode_marshaller_type_name ((ValaCodeNode*) _tmp61_); - result = _tmp62_; - _vala_code_node_unref0 (base_st); - _vala_code_node_unref0 (st); - return result; + _tmp62_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp61_); + if (_tmp62_) { + ValaStruct* _tmp63_; + gchar* _tmp64_ = NULL; + _tmp63_ = base_st; + _tmp64_ = vala_ccode_base_module_get_ccode_marshaller_type_name ((ValaCodeNode*) _tmp63_); + result = _tmp64_; + _vala_code_node_unref0 (base_st); + _vala_code_node_unref0 (st); + return result; + } else { + ValaStruct* _tmp65_; + ValaStruct* _tmp66_; + ValaStruct* _tmp67_; + ValaStruct* _tmp68_; + _tmp65_ = base_st; + _tmp66_ = vala_struct_get_base_struct (_tmp65_); + _tmp67_ = _tmp66_; + _tmp68_ = _vala_code_node_ref0 (_tmp67_); + _vala_code_node_unref0 (base_st); + base_st = _tmp68_; + } } - _tmp63_ = st; - _tmp64_ = vala_struct_is_simple_type (_tmp63_); - if (_tmp64_) { - ValaStruct* _tmp65_; - ValaSourceReference* _tmp66_; - ValaSourceReference* _tmp67_; - ValaStruct* _tmp68_; - gchar* _tmp69_ = NULL; - gchar* _tmp70_; - gchar* _tmp71_ = NULL; - gchar* _tmp72_; - _tmp65_ = st; - _tmp66_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp65_); - _tmp67_ = _tmp66_; - _tmp68_ = st; - _tmp69_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp68_); - _tmp70_ = _tmp69_; - _tmp71_ = g_strdup_printf ("The type `%s` doesn't declare a marshaller type name", _tmp70_); - _tmp72_ = _tmp71_; - vala_report_error (_tmp67_, _tmp72_); - _g_free0 (_tmp72_); - _g_free0 (_tmp70_); + _tmp69_ = st; + _tmp70_ = vala_struct_is_simple_type (_tmp69_); + if (_tmp70_) { + ValaStruct* _tmp71_; + ValaSourceReference* _tmp72_; + ValaSourceReference* _tmp73_; + ValaStruct* _tmp74_; + gchar* _tmp75_ = NULL; + gchar* _tmp76_; + gchar* _tmp77_ = NULL; + gchar* _tmp78_; + _tmp71_ = st; + _tmp72_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp71_); + _tmp73_ = _tmp72_; + _tmp74_ = st; + _tmp75_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp74_); + _tmp76_ = _tmp75_; + _tmp77_ = g_strdup_printf ("The type `%s` doesn't declare a marshaller type name", _tmp76_); + _tmp78_ = _tmp77_; + vala_report_error (_tmp73_, _tmp78_); + _g_free0 (_tmp78_); + _g_free0 (_tmp76_); } else { - ValaStruct* _tmp73_; - gboolean _tmp74_ = FALSE; - _tmp73_ = st; - _tmp74_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp73_); - if (_tmp74_) { - gchar* _tmp75_; - _tmp75_ = g_strdup ("BOXED"); - result = _tmp75_; + ValaStruct* _tmp79_; + gboolean _tmp80_ = FALSE; + _tmp79_ = st; + _tmp80_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp79_); + if (_tmp80_) { + gchar* _tmp81_; + _tmp81_ = g_strdup ("BOXED"); + result = _tmp81_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; } else { - gchar* _tmp76_; - _tmp76_ = g_strdup ("POINTER"); - result = _tmp76_; + gchar* _tmp82_; + _tmp82_ = g_strdup ("POINTER"); + result = _tmp82_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; @@ -3013,45 +3035,45 @@ _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); } else { - ValaSymbol* _tmp77_; - _tmp77_ = self->priv->sym; - if (VALA_IS_PARAMETER (_tmp77_)) { - ValaSymbol* _tmp78_; - ValaParameter* _tmp79_; + ValaSymbol* _tmp83_; + _tmp83_ = self->priv->sym; + if (VALA_IS_PARAMETER (_tmp83_)) { + ValaSymbol* _tmp84_; + ValaParameter* _tmp85_; ValaParameter* param; - ValaParameter* _tmp80_; - ValaParameterDirection _tmp81_; - ValaParameterDirection _tmp82_; - _tmp78_ = self->priv->sym; - _tmp79_ = _vala_code_node_ref0 (VALA_PARAMETER (_tmp78_)); - param = _tmp79_; - _tmp80_ = param; - _tmp81_ = vala_parameter_get_direction (_tmp80_); - _tmp82_ = _tmp81_; - if (_tmp82_ != VALA_PARAMETER_DIRECTION_IN) { - gchar* _tmp83_; - _tmp83_ = g_strdup ("POINTER"); - result = _tmp83_; + ValaParameter* _tmp86_; + ValaParameterDirection _tmp87_; + ValaParameterDirection _tmp88_; + _tmp84_ = self->priv->sym; + _tmp85_ = _vala_code_node_ref0 (VALA_PARAMETER (_tmp84_)); + param = _tmp85_; + _tmp86_ = param; + _tmp87_ = vala_parameter_get_direction (_tmp86_); + _tmp88_ = _tmp87_; + if (_tmp88_ != VALA_PARAMETER_DIRECTION_IN) { + gchar* _tmp89_; + _tmp89_ = g_strdup ("POINTER"); + result = _tmp89_; _vala_code_node_unref0 (param); return result; } else { - ValaParameter* _tmp84_; - ValaDataType* _tmp85_; - ValaDataType* _tmp86_; - gchar* _tmp87_ = NULL; - _tmp84_ = param; - _tmp85_ = vala_variable_get_variable_type ((ValaVariable*) _tmp84_); - _tmp86_ = _tmp85_; - _tmp87_ = vala_ccode_base_module_get_ccode_marshaller_type_name ((ValaCodeNode*) _tmp86_); - result = _tmp87_; + ValaParameter* _tmp90_; + ValaDataType* _tmp91_; + ValaDataType* _tmp92_; + gchar* _tmp93_ = NULL; + _tmp90_ = param; + _tmp91_ = vala_variable_get_variable_type ((ValaVariable*) _tmp90_); + _tmp92_ = _tmp91_; + _tmp93_ = vala_ccode_base_module_get_ccode_marshaller_type_name ((ValaCodeNode*) _tmp92_); + result = _tmp93_; _vala_code_node_unref0 (param); return result; } _vala_code_node_unref0 (param); } else { - gchar* _tmp88_; - _tmp88_ = g_strdup ("POINTER"); - result = _tmp88_; + gchar* _tmp94_; + _tmp94_ = g_strdup ("POINTER"); + result = _tmp94_; return result; } } @@ -3059,93 +3081,93 @@ } } } else { - gboolean _tmp89_ = FALSE; - ValaCodeNode* _tmp90_; - gboolean _tmp94_; - _tmp90_ = self->priv->node; - if (VALA_IS_POINTER_TYPE (_tmp90_)) { - _tmp89_ = TRUE; - } else { - ValaCodeNode* _tmp91_; - ValaTypeParameter* _tmp92_; - ValaTypeParameter* _tmp93_; - _tmp91_ = self->priv->node; - _tmp92_ = vala_data_type_get_type_parameter (VALA_DATA_TYPE (_tmp91_)); - _tmp93_ = _tmp92_; - _tmp89_ = _tmp93_ != NULL; - } - _tmp94_ = _tmp89_; - if (_tmp94_) { - gchar* _tmp95_; - _tmp95_ = g_strdup ("POINTER"); - result = _tmp95_; + gboolean _tmp95_ = FALSE; + ValaCodeNode* _tmp96_; + gboolean _tmp100_; + _tmp96_ = self->priv->node; + if (VALA_IS_POINTER_TYPE (_tmp96_)) { + _tmp95_ = TRUE; + } else { + ValaCodeNode* _tmp97_; + ValaTypeParameter* _tmp98_; + ValaTypeParameter* _tmp99_; + _tmp97_ = self->priv->node; + _tmp98_ = vala_data_type_get_type_parameter (VALA_DATA_TYPE (_tmp97_)); + _tmp99_ = _tmp98_; + _tmp95_ = _tmp99_ != NULL; + } + _tmp100_ = _tmp95_; + if (_tmp100_) { + gchar* _tmp101_; + _tmp101_ = g_strdup ("POINTER"); + result = _tmp101_; return result; } else { - ValaCodeNode* _tmp96_; - _tmp96_ = self->priv->node; - if (VALA_IS_ERROR_TYPE (_tmp96_)) { - gchar* _tmp97_; - _tmp97_ = g_strdup ("POINTER"); - result = _tmp97_; + ValaCodeNode* _tmp102_; + _tmp102_ = self->priv->node; + if (VALA_IS_ERROR_TYPE (_tmp102_)) { + gchar* _tmp103_; + _tmp103_ = g_strdup ("POINTER"); + result = _tmp103_; return result; } else { - ValaCodeNode* _tmp98_; - _tmp98_ = self->priv->node; - if (VALA_IS_ARRAY_TYPE (_tmp98_)) { - ValaCodeNode* _tmp99_; - ValaDataType* _tmp100_; - ValaDataType* _tmp101_; - ValaTypeSymbol* _tmp102_; - ValaTypeSymbol* _tmp103_; - gchar* _tmp104_ = NULL; - gchar* _tmp105_; - gboolean _tmp106_; - _tmp99_ = self->priv->node; - _tmp100_ = vala_array_type_get_element_type (VALA_ARRAY_TYPE (_tmp99_)); - _tmp101_ = _tmp100_; - _tmp102_ = vala_data_type_get_data_type (_tmp101_); - _tmp103_ = _tmp102_; - _tmp104_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp103_); - _tmp105_ = _tmp104_; - _tmp106_ = g_strcmp0 (_tmp105_, "string") == 0; - _g_free0 (_tmp105_); - if (_tmp106_) { - gchar* _tmp107_; - _tmp107_ = g_strdup ("BOXED,INT"); - result = _tmp107_; + ValaCodeNode* _tmp104_; + _tmp104_ = self->priv->node; + if (VALA_IS_ARRAY_TYPE (_tmp104_)) { + ValaCodeNode* _tmp105_; + ValaDataType* _tmp106_; + ValaDataType* _tmp107_; + ValaTypeSymbol* _tmp108_; + ValaTypeSymbol* _tmp109_; + gchar* _tmp110_ = NULL; + gchar* _tmp111_; + gboolean _tmp112_; + _tmp105_ = self->priv->node; + _tmp106_ = vala_array_type_get_element_type (VALA_ARRAY_TYPE (_tmp105_)); + _tmp107_ = _tmp106_; + _tmp108_ = vala_data_type_get_data_type (_tmp107_); + _tmp109_ = _tmp108_; + _tmp110_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp109_); + _tmp111_ = _tmp110_; + _tmp112_ = g_strcmp0 (_tmp111_, "string") == 0; + _g_free0 (_tmp111_); + if (_tmp112_) { + gchar* _tmp113_; + _tmp113_ = g_strdup ("BOXED,INT"); + result = _tmp113_; return result; } else { - gchar* _tmp108_; - _tmp108_ = g_strdup ("POINTER,INT"); - result = _tmp108_; + gchar* _tmp114_; + _tmp114_ = g_strdup ("POINTER,INT"); + result = _tmp114_; return result; } } else { - ValaCodeNode* _tmp109_; - _tmp109_ = self->priv->node; - if (VALA_IS_VOID_TYPE (_tmp109_)) { - gchar* _tmp110_; - _tmp110_ = g_strdup ("VOID"); - result = _tmp110_; + ValaCodeNode* _tmp115_; + _tmp115_ = self->priv->node; + if (VALA_IS_VOID_TYPE (_tmp115_)) { + gchar* _tmp116_; + _tmp116_ = g_strdup ("VOID"); + result = _tmp116_; return result; } else { - ValaCodeNode* _tmp111_; - ValaTypeSymbol* _tmp112_; - ValaTypeSymbol* _tmp113_; - gchar* _tmp114_ = NULL; - _tmp111_ = self->priv->node; - _tmp112_ = vala_data_type_get_data_type (VALA_DATA_TYPE (_tmp111_)); - _tmp113_ = _tmp112_; - _tmp114_ = vala_ccode_base_module_get_ccode_marshaller_type_name ((ValaCodeNode*) _tmp113_); - result = _tmp114_; + ValaCodeNode* _tmp117_; + ValaTypeSymbol* _tmp118_; + ValaTypeSymbol* _tmp119_; + gchar* _tmp120_ = NULL; + _tmp117_ = self->priv->node; + _tmp118_ = vala_data_type_get_data_type (VALA_DATA_TYPE (_tmp117_)); + _tmp119_ = _tmp118_; + _tmp120_ = vala_ccode_base_module_get_ccode_marshaller_type_name ((ValaCodeNode*) _tmp119_); + result = _tmp120_; return result; } } } } } - _tmp115_ = g_strdup (""); - result = _tmp115_; + _tmp121_ = g_strdup (""); + result = _tmp121_; return result; } @@ -3153,7 +3175,7 @@ static gchar* vala_ccode_attribute_get_default_get_value_function (ValaCCodeAttribute* self) { gchar* result = NULL; ValaSymbol* _tmp0_; - gchar* _tmp76_; + gchar* _tmp82_; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->sym; if (VALA_IS_CLASS (_tmp0_)) { @@ -3350,9 +3372,8 @@ ValaStruct* _tmp56_; ValaStruct* _tmp57_; ValaStruct* base_st; - ValaStruct* _tmp58_; - ValaStruct* _tmp61_; - gboolean _tmp62_ = FALSE; + ValaStruct* _tmp67_; + gboolean _tmp68_ = FALSE; _tmp52_ = self->priv->sym; _tmp53_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp52_)); st = _tmp53_; @@ -3361,55 +3382,76 @@ _tmp56_ = _tmp55_; _tmp57_ = _vala_code_node_ref0 (_tmp56_); base_st = _tmp57_; - _tmp58_ = base_st; - if (_tmp58_ != NULL) { + while (TRUE) { + ValaStruct* _tmp58_; ValaStruct* _tmp59_; - gchar* _tmp60_ = NULL; + gboolean _tmp60_ = FALSE; + _tmp58_ = base_st; + if (!(_tmp58_ != NULL)) { + break; + } _tmp59_ = base_st; - _tmp60_ = vala_ccode_base_module_get_ccode_get_value_function ((ValaCodeNode*) _tmp59_); - result = _tmp60_; - _vala_code_node_unref0 (base_st); - _vala_code_node_unref0 (st); - return result; + _tmp60_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp59_); + if (_tmp60_) { + ValaStruct* _tmp61_; + gchar* _tmp62_ = NULL; + _tmp61_ = base_st; + _tmp62_ = vala_ccode_base_module_get_ccode_get_value_function ((ValaCodeNode*) _tmp61_); + result = _tmp62_; + _vala_code_node_unref0 (base_st); + _vala_code_node_unref0 (st); + return result; + } else { + ValaStruct* _tmp63_; + ValaStruct* _tmp64_; + ValaStruct* _tmp65_; + ValaStruct* _tmp66_; + _tmp63_ = base_st; + _tmp64_ = vala_struct_get_base_struct (_tmp63_); + _tmp65_ = _tmp64_; + _tmp66_ = _vala_code_node_ref0 (_tmp65_); + _vala_code_node_unref0 (base_st); + base_st = _tmp66_; + } } - _tmp61_ = st; - _tmp62_ = vala_struct_is_simple_type (_tmp61_); - if (_tmp62_) { - ValaStruct* _tmp63_; - ValaSourceReference* _tmp64_; - ValaSourceReference* _tmp65_; - ValaStruct* _tmp66_; - gchar* _tmp67_ = NULL; - gchar* _tmp68_; - gchar* _tmp69_ = NULL; - gchar* _tmp70_; - _tmp63_ = st; - _tmp64_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp63_); - _tmp65_ = _tmp64_; - _tmp66_ = st; - _tmp67_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp66_); - _tmp68_ = _tmp67_; - _tmp69_ = g_strdup_printf ("The type `%s` doesn't declare a GValue get function", _tmp68_); - _tmp70_ = _tmp69_; - vala_report_error (_tmp65_, _tmp70_); - _g_free0 (_tmp70_); - _g_free0 (_tmp68_); + _tmp67_ = st; + _tmp68_ = vala_struct_is_simple_type (_tmp67_); + if (_tmp68_) { + ValaStruct* _tmp69_; + ValaSourceReference* _tmp70_; + ValaSourceReference* _tmp71_; + ValaStruct* _tmp72_; + gchar* _tmp73_ = NULL; + gchar* _tmp74_; + gchar* _tmp75_ = NULL; + gchar* _tmp76_; + _tmp69_ = st; + _tmp70_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp69_); + _tmp71_ = _tmp70_; + _tmp72_ = st; + _tmp73_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp72_); + _tmp74_ = _tmp73_; + _tmp75_ = g_strdup_printf ("The type `%s` doesn't declare a GValue get function", _tmp74_); + _tmp76_ = _tmp75_; + vala_report_error (_tmp71_, _tmp76_); + _g_free0 (_tmp76_); + _g_free0 (_tmp74_); } else { - ValaStruct* _tmp71_; - gboolean _tmp72_ = FALSE; - _tmp71_ = st; - _tmp72_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp71_); - if (_tmp72_) { - gchar* _tmp73_; - _tmp73_ = g_strdup ("g_value_get_boxed"); - result = _tmp73_; + ValaStruct* _tmp77_; + gboolean _tmp78_ = FALSE; + _tmp77_ = st; + _tmp78_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp77_); + if (_tmp78_) { + gchar* _tmp79_; + _tmp79_ = g_strdup ("g_value_get_boxed"); + result = _tmp79_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; } else { - gchar* _tmp74_; - _tmp74_ = g_strdup ("g_value_get_pointer"); - result = _tmp74_; + gchar* _tmp80_; + _tmp80_ = g_strdup ("g_value_get_pointer"); + result = _tmp80_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; @@ -3418,16 +3460,16 @@ _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); } else { - gchar* _tmp75_; - _tmp75_ = g_strdup ("g_value_get_pointer"); - result = _tmp75_; + gchar* _tmp81_; + _tmp81_ = g_strdup ("g_value_get_pointer"); + result = _tmp81_; return result; } } } } - _tmp76_ = g_strdup (""); - result = _tmp76_; + _tmp82_ = g_strdup (""); + result = _tmp82_; return result; } @@ -3435,7 +3477,7 @@ static gchar* vala_ccode_attribute_get_default_set_value_function (ValaCCodeAttribute* self) { gchar* result = NULL; ValaSymbol* _tmp0_; - gchar* _tmp76_; + gchar* _tmp82_; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->sym; if (VALA_IS_CLASS (_tmp0_)) { @@ -3632,9 +3674,8 @@ ValaStruct* _tmp56_; ValaStruct* _tmp57_; ValaStruct* base_st; - ValaStruct* _tmp58_; - ValaStruct* _tmp61_; - gboolean _tmp62_ = FALSE; + ValaStruct* _tmp67_; + gboolean _tmp68_ = FALSE; _tmp52_ = self->priv->sym; _tmp53_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp52_)); st = _tmp53_; @@ -3643,55 +3684,76 @@ _tmp56_ = _tmp55_; _tmp57_ = _vala_code_node_ref0 (_tmp56_); base_st = _tmp57_; - _tmp58_ = base_st; - if (_tmp58_ != NULL) { + while (TRUE) { + ValaStruct* _tmp58_; ValaStruct* _tmp59_; - gchar* _tmp60_ = NULL; + gboolean _tmp60_ = FALSE; + _tmp58_ = base_st; + if (!(_tmp58_ != NULL)) { + break; + } _tmp59_ = base_st; - _tmp60_ = vala_ccode_base_module_get_ccode_set_value_function ((ValaCodeNode*) _tmp59_); - result = _tmp60_; - _vala_code_node_unref0 (base_st); - _vala_code_node_unref0 (st); - return result; + _tmp60_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp59_); + if (_tmp60_) { + ValaStruct* _tmp61_; + gchar* _tmp62_ = NULL; + _tmp61_ = base_st; + _tmp62_ = vala_ccode_base_module_get_ccode_set_value_function ((ValaCodeNode*) _tmp61_); + result = _tmp62_; + _vala_code_node_unref0 (base_st); + _vala_code_node_unref0 (st); + return result; + } else { + ValaStruct* _tmp63_; + ValaStruct* _tmp64_; + ValaStruct* _tmp65_; + ValaStruct* _tmp66_; + _tmp63_ = base_st; + _tmp64_ = vala_struct_get_base_struct (_tmp63_); + _tmp65_ = _tmp64_; + _tmp66_ = _vala_code_node_ref0 (_tmp65_); + _vala_code_node_unref0 (base_st); + base_st = _tmp66_; + } } - _tmp61_ = st; - _tmp62_ = vala_struct_is_simple_type (_tmp61_); - if (_tmp62_) { - ValaStruct* _tmp63_; - ValaSourceReference* _tmp64_; - ValaSourceReference* _tmp65_; - ValaStruct* _tmp66_; - gchar* _tmp67_ = NULL; - gchar* _tmp68_; - gchar* _tmp69_ = NULL; - gchar* _tmp70_; - _tmp63_ = st; - _tmp64_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp63_); - _tmp65_ = _tmp64_; - _tmp66_ = st; - _tmp67_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp66_); - _tmp68_ = _tmp67_; - _tmp69_ = g_strdup_printf ("The type `%s` doesn't declare a GValue set function", _tmp68_); - _tmp70_ = _tmp69_; - vala_report_error (_tmp65_, _tmp70_); - _g_free0 (_tmp70_); - _g_free0 (_tmp68_); + _tmp67_ = st; + _tmp68_ = vala_struct_is_simple_type (_tmp67_); + if (_tmp68_) { + ValaStruct* _tmp69_; + ValaSourceReference* _tmp70_; + ValaSourceReference* _tmp71_; + ValaStruct* _tmp72_; + gchar* _tmp73_ = NULL; + gchar* _tmp74_; + gchar* _tmp75_ = NULL; + gchar* _tmp76_; + _tmp69_ = st; + _tmp70_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp69_); + _tmp71_ = _tmp70_; + _tmp72_ = st; + _tmp73_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp72_); + _tmp74_ = _tmp73_; + _tmp75_ = g_strdup_printf ("The type `%s` doesn't declare a GValue set function", _tmp74_); + _tmp76_ = _tmp75_; + vala_report_error (_tmp71_, _tmp76_); + _g_free0 (_tmp76_); + _g_free0 (_tmp74_); } else { - ValaStruct* _tmp71_; - gboolean _tmp72_ = FALSE; - _tmp71_ = st; - _tmp72_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp71_); - if (_tmp72_) { - gchar* _tmp73_; - _tmp73_ = g_strdup ("g_value_set_boxed"); - result = _tmp73_; + ValaStruct* _tmp77_; + gboolean _tmp78_ = FALSE; + _tmp77_ = st; + _tmp78_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp77_); + if (_tmp78_) { + gchar* _tmp79_; + _tmp79_ = g_strdup ("g_value_set_boxed"); + result = _tmp79_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; } else { - gchar* _tmp74_; - _tmp74_ = g_strdup ("g_value_set_pointer"); - result = _tmp74_; + gchar* _tmp80_; + _tmp80_ = g_strdup ("g_value_set_pointer"); + result = _tmp80_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; @@ -3700,16 +3762,16 @@ _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); } else { - gchar* _tmp75_; - _tmp75_ = g_strdup ("g_value_set_pointer"); - result = _tmp75_; + gchar* _tmp81_; + _tmp81_ = g_strdup ("g_value_set_pointer"); + result = _tmp81_; return result; } } } } - _tmp76_ = g_strdup (""); - result = _tmp76_; + _tmp82_ = g_strdup (""); + result = _tmp82_; return result; } @@ -3717,7 +3779,7 @@ static gchar* vala_ccode_attribute_get_default_take_value_function (ValaCCodeAttribute* self) { gchar* result = NULL; ValaSymbol* _tmp0_; - gchar* _tmp76_; + gchar* _tmp82_; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->sym; if (VALA_IS_CLASS (_tmp0_)) { @@ -3914,9 +3976,8 @@ ValaStruct* _tmp56_; ValaStruct* _tmp57_; ValaStruct* base_st; - ValaStruct* _tmp58_; - ValaStruct* _tmp61_; - gboolean _tmp62_ = FALSE; + ValaStruct* _tmp67_; + gboolean _tmp68_ = FALSE; _tmp52_ = self->priv->sym; _tmp53_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp52_)); st = _tmp53_; @@ -3925,55 +3986,76 @@ _tmp56_ = _tmp55_; _tmp57_ = _vala_code_node_ref0 (_tmp56_); base_st = _tmp57_; - _tmp58_ = base_st; - if (_tmp58_ != NULL) { + while (TRUE) { + ValaStruct* _tmp58_; ValaStruct* _tmp59_; - gchar* _tmp60_ = NULL; + gboolean _tmp60_ = FALSE; + _tmp58_ = base_st; + if (!(_tmp58_ != NULL)) { + break; + } _tmp59_ = base_st; - _tmp60_ = vala_ccode_base_module_get_ccode_take_value_function ((ValaCodeNode*) _tmp59_); - result = _tmp60_; - _vala_code_node_unref0 (base_st); - _vala_code_node_unref0 (st); - return result; + _tmp60_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp59_); + if (_tmp60_) { + ValaStruct* _tmp61_; + gchar* _tmp62_ = NULL; + _tmp61_ = base_st; + _tmp62_ = vala_ccode_base_module_get_ccode_take_value_function ((ValaCodeNode*) _tmp61_); + result = _tmp62_; + _vala_code_node_unref0 (base_st); + _vala_code_node_unref0 (st); + return result; + } else { + ValaStruct* _tmp63_; + ValaStruct* _tmp64_; + ValaStruct* _tmp65_; + ValaStruct* _tmp66_; + _tmp63_ = base_st; + _tmp64_ = vala_struct_get_base_struct (_tmp63_); + _tmp65_ = _tmp64_; + _tmp66_ = _vala_code_node_ref0 (_tmp65_); + _vala_code_node_unref0 (base_st); + base_st = _tmp66_; + } } - _tmp61_ = st; - _tmp62_ = vala_struct_is_simple_type (_tmp61_); - if (_tmp62_) { - ValaStruct* _tmp63_; - ValaSourceReference* _tmp64_; - ValaSourceReference* _tmp65_; - ValaStruct* _tmp66_; - gchar* _tmp67_ = NULL; - gchar* _tmp68_; - gchar* _tmp69_ = NULL; - gchar* _tmp70_; - _tmp63_ = st; - _tmp64_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp63_); - _tmp65_ = _tmp64_; - _tmp66_ = st; - _tmp67_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp66_); - _tmp68_ = _tmp67_; - _tmp69_ = g_strdup_printf ("The type `%s` doesn't declare a GValue take function", _tmp68_); - _tmp70_ = _tmp69_; - vala_report_error (_tmp65_, _tmp70_); - _g_free0 (_tmp70_); - _g_free0 (_tmp68_); + _tmp67_ = st; + _tmp68_ = vala_struct_is_simple_type (_tmp67_); + if (_tmp68_) { + ValaStruct* _tmp69_; + ValaSourceReference* _tmp70_; + ValaSourceReference* _tmp71_; + ValaStruct* _tmp72_; + gchar* _tmp73_ = NULL; + gchar* _tmp74_; + gchar* _tmp75_ = NULL; + gchar* _tmp76_; + _tmp69_ = st; + _tmp70_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp69_); + _tmp71_ = _tmp70_; + _tmp72_ = st; + _tmp73_ = vala_symbol_get_full_name ((ValaSymbol*) _tmp72_); + _tmp74_ = _tmp73_; + _tmp75_ = g_strdup_printf ("The type `%s` doesn't declare a GValue take function", _tmp74_); + _tmp76_ = _tmp75_; + vala_report_error (_tmp71_, _tmp76_); + _g_free0 (_tmp76_); + _g_free0 (_tmp74_); } else { - ValaStruct* _tmp71_; - gboolean _tmp72_ = FALSE; - _tmp71_ = st; - _tmp72_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp71_); - if (_tmp72_) { - gchar* _tmp73_; - _tmp73_ = g_strdup ("g_value_take_boxed"); - result = _tmp73_; + ValaStruct* _tmp77_; + gboolean _tmp78_ = FALSE; + _tmp77_ = st; + _tmp78_ = vala_ccode_base_module_get_ccode_has_type_id ((ValaTypeSymbol*) _tmp77_); + if (_tmp78_) { + gchar* _tmp79_; + _tmp79_ = g_strdup ("g_value_take_boxed"); + result = _tmp79_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; } else { - gchar* _tmp74_; - _tmp74_ = g_strdup ("g_value_set_pointer"); - result = _tmp74_; + gchar* _tmp80_; + _tmp80_ = g_strdup ("g_value_set_pointer"); + result = _tmp80_; _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); return result; @@ -3982,16 +4064,16 @@ _vala_code_node_unref0 (base_st); _vala_code_node_unref0 (st); } else { - gchar* _tmp75_; - _tmp75_ = g_strdup ("g_value_set_pointer"); - result = _tmp75_; + gchar* _tmp81_; + _tmp81_ = g_strdup ("g_value_set_pointer"); + result = _tmp81_; return result; } } } } - _tmp76_ = g_strdup (""); - result = _tmp76_; + _tmp82_ = g_strdup (""); + result = _tmp82_; return result; } @@ -5941,6 +6023,44 @@ } +const gchar* vala_ccode_attribute_get_delegate_target_name (ValaCCodeAttribute* self) { + const gchar* result; + const gchar* _tmp0_; + const gchar* _tmp9_; + g_return_val_if_fail (self != NULL, NULL); + _tmp0_ = self->priv->_delegate_target_name; + if (_tmp0_ == NULL) { + ValaAttribute* _tmp1_; + const gchar* _tmp4_; + _tmp1_ = self->priv->ccode; + if (_tmp1_ != NULL) { + ValaAttribute* _tmp2_; + gchar* _tmp3_ = NULL; + _tmp2_ = self->priv->ccode; + _tmp3_ = vala_attribute_get_string (_tmp2_, "delegate_target_cname"); + _g_free0 (self->priv->_delegate_target_name); + self->priv->_delegate_target_name = _tmp3_; + } + _tmp4_ = self->priv->_delegate_target_name; + if (_tmp4_ == NULL) { + ValaSymbol* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_ = NULL; + _tmp5_ = self->priv->sym; + _tmp6_ = vala_symbol_get_name (_tmp5_); + _tmp7_ = _tmp6_; + _tmp8_ = g_strdup_printf ("%s_target", _tmp7_); + _g_free0 (self->priv->_delegate_target_name); + self->priv->_delegate_target_name = _tmp8_; + } + } + _tmp9_ = self->priv->_delegate_target_name; + result = _tmp9_; + return result; +} + + gboolean vala_ccode_attribute_get_array_length (ValaCCodeAttribute* self) { gboolean result; gboolean _tmp0_; @@ -6128,6 +6248,7 @@ _g_free0 (self->priv->_finish_vfunc_name); _g_free0 (self->priv->_finish_real_name); _g_free0 (self->priv->_real_name); + _g_free0 (self->priv->_delegate_target_name); VALA_ATTRIBUTE_CACHE_CLASS (vala_ccode_attribute_parent_class)->finalize (obj); } diff -Nru vala-0.16-0.15.1/codegen/valaccodeattribute.vala vala-0.16-0.15.2/codegen/valaccodeattribute.vala --- vala-0.16-0.15.1/codegen/valaccodeattribute.vala 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodeattribute.vala 2012-02-23 14:49:44.000000000 +0000 @@ -454,6 +454,20 @@ } } + public string delegate_target_name { + get { + if (_delegate_target_name == null) { + if (ccode != null) { + _delegate_target_name = ccode.get_string ("delegate_target_cname"); + } + if (_delegate_target_name == null) { + _delegate_target_name = "%s_target".printf (sym.name); + } + } + return _delegate_target_name; + } + } + public bool array_length { get; private set; } public string? array_length_type { get; private set; } public bool array_null_terminated { get; private set; } @@ -496,6 +510,7 @@ private string _finish_vfunc_name; private string _finish_real_name; private string _real_name; + private string _delegate_target_name; private static int dynamic_method_id; @@ -913,8 +928,12 @@ } else if (sym is Struct) { var st = (Struct) sym; var base_st = st.base_struct; - if (base_st != null) { - return CCodeBaseModule.get_ccode_marshaller_type_name (base_st); + while (base_st != null) { + if (CCodeBaseModule.get_ccode_has_type_id (base_st)) { + return CCodeBaseModule.get_ccode_marshaller_type_name (base_st); + } else { + base_st = base_st.base_struct; + } } if (st.is_simple_type ()) { Report.error (st.source_reference, "The type `%s` doesn't declare a marshaller type name".printf (st.get_full_name ())); @@ -989,8 +1008,12 @@ } else if (sym is Struct) { var st = (Struct) sym; var base_st = st.base_struct; - if (base_st != null) { - return CCodeBaseModule.get_ccode_get_value_function (base_st); + while (base_st != null) { + if (CCodeBaseModule.get_ccode_has_type_id (base_st)) { + return CCodeBaseModule.get_ccode_get_value_function (base_st); + } else { + base_st = base_st.base_struct; + } } if (st.is_simple_type ()) { Report.error (st.source_reference, "The type `%s` doesn't declare a GValue get function".printf (st.get_full_name ())); @@ -1043,8 +1066,12 @@ } else if (sym is Struct) { var st = (Struct) sym; var base_st = st.base_struct; - if (base_st != null) { - return CCodeBaseModule.get_ccode_set_value_function (base_st); + while (base_st != null) { + if (CCodeBaseModule.get_ccode_has_type_id (base_st)) { + return CCodeBaseModule.get_ccode_set_value_function (base_st); + } else { + base_st = base_st.base_struct; + } } if (st.is_simple_type ()) { Report.error (st.source_reference, "The type `%s` doesn't declare a GValue set function".printf (st.get_full_name ())); @@ -1097,8 +1124,12 @@ } else if (sym is Struct) { var st = (Struct) sym; var base_st = st.base_struct; - if (base_st != null) { - return CCodeBaseModule.get_ccode_take_value_function (base_st); + while (base_st != null) { + if (CCodeBaseModule.get_ccode_has_type_id (base_st)) { + return CCodeBaseModule.get_ccode_take_value_function (base_st); + } else { + base_st = base_st.base_struct; + } } if (st.is_simple_type ()) { Report.error (st.source_reference, "The type `%s` doesn't declare a GValue take function".printf (st.get_full_name ())); diff -Nru vala-0.16-0.15.1/codegen/valaccodebasemodule.c vala-0.16-0.15.2/codegen/valaccodebasemodule.c --- vala-0.16-0.15.1/codegen/valaccodebasemodule.c 2012-01-26 21:08:06.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodebasemodule.c 2012-02-25 16:21:58.000000000 +0000 @@ -358,7 +358,7 @@ gchar* vala_ccode_base_module_get_ccode_declarator_suffix (ValaDataType* type); gboolean vala_ccode_base_module_get_ccode_array_length (ValaCodeNode* node); gchar* vala_ccode_base_module_get_array_length_cname (ValaCCodeBaseModule* self, const gchar* array_cname, gint dim); -gchar* vala_ccode_base_module_get_delegate_target_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); gchar* vala_ccode_base_module_get_delegate_target_destroy_notify_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); static void vala_ccode_base_module_real_visit_field (ValaCodeVisitor* base, ValaField* f); void vala_ccode_base_module_check_type (ValaCCodeBaseModule* self, ValaDataType* type); @@ -392,6 +392,7 @@ static void vala_ccode_base_module_real_generate_cparameters (ValaCCodeBaseModule* self, ValaMethod* m, ValaCCodeFile* decl_space, ValaMap* cparam_map, ValaCCodeFunction* func, ValaCCodeFunctionDeclarator* vdeclarator, ValaMap* carg_map, ValaCCodeFunctionCall* vcall, gint direction); void vala_ccode_base_module_generate_property_accessor_declaration (ValaCCodeBaseModule* self, ValaPropertyAccessor* acc, ValaCCodeFile* decl_space); ValaDataType* vala_ccode_base_module_get_data_type_for_symbol (ValaTypeSymbol* sym); +gchar* vala_ccode_base_module_get_delegate_target_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); static void vala_ccode_base_module_real_visit_property_accessor (ValaCodeVisitor* base, ValaPropertyAccessor* acc); gboolean vala_ccode_base_module_is_gobject_property (ValaCCodeBaseModule* self, ValaProperty* prop); ValaDataType* vala_ccode_base_module_get_current_return_type (ValaCCodeBaseModule* self); @@ -639,6 +640,7 @@ gdouble vala_ccode_base_module_get_ccode_destroy_notify_pos (ValaCodeNode* node); gboolean vala_ccode_base_module_get_ccode_delegate_target (ValaCodeNode* node); gboolean vala_ccode_attribute_get_delegate_target (ValaCCodeAttribute* self); +const gchar* vala_ccode_attribute_get_delegate_target_name (ValaCCodeAttribute* self); gdouble vala_ccode_attribute_get_pos (ValaCCodeAttribute* self); const gchar* vala_ccode_attribute_get_real_name (ValaCCodeAttribute* self); gchar* vala_ccode_base_module_get_ccode_vfunc_name (ValaMethod* m); @@ -4385,92 +4387,87 @@ ValaField* _tmp126_; gchar* _tmp127_ = NULL; gchar* _tmp128_; - gchar* _tmp129_ = NULL; - gchar* _tmp130_; - ValaCCodeVariableDeclarator* _tmp131_; - ValaCCodeVariableDeclarator* _tmp132_; - ValaField* _tmp133_; - gboolean _tmp134_ = FALSE; - ValaCCodeFile* _tmp137_; - ValaCCodeDeclaration* _tmp138_; - ValaDelegateType* _tmp139_; - gboolean _tmp140_; - gboolean _tmp141_; + ValaCCodeVariableDeclarator* _tmp129_; + ValaCCodeVariableDeclarator* _tmp130_; + ValaField* _tmp131_; + gboolean _tmp132_ = FALSE; + ValaCCodeFile* _tmp135_; + ValaCCodeDeclaration* _tmp136_; + ValaDelegateType* _tmp137_; + gboolean _tmp138_; + gboolean _tmp139_; _tmp124_ = vala_ccode_declaration_new ("gpointer"); _vala_ccode_node_unref0 (_cdecl_); _cdecl_ = _tmp124_; _tmp125_ = _cdecl_; _tmp126_ = f; - _tmp127_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp126_); + _tmp127_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp126_); _tmp128_ = _tmp127_; - _tmp129_ = vala_ccode_base_module_get_delegate_target_cname (self, _tmp128_); + _tmp129_ = vala_ccode_variable_declarator_new (_tmp128_, NULL, NULL); _tmp130_ = _tmp129_; - _tmp131_ = vala_ccode_variable_declarator_new (_tmp130_, NULL, NULL); - _tmp132_ = _tmp131_; - vala_ccode_declaration_add_declarator (_tmp125_, (ValaCCodeDeclarator*) _tmp132_); - _vala_ccode_node_unref0 (_tmp132_); - _g_free0 (_tmp130_); + vala_ccode_declaration_add_declarator (_tmp125_, (ValaCCodeDeclarator*) _tmp130_); + _vala_ccode_node_unref0 (_tmp130_); _g_free0 (_tmp128_); - _tmp133_ = f; - _tmp134_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp133_); - if (_tmp134_) { - ValaCCodeDeclaration* _tmp135_; - _tmp135_ = _cdecl_; - vala_ccode_declaration_set_modifiers (_tmp135_, VALA_CCODE_MODIFIERS_STATIC); - } else { - ValaCCodeDeclaration* _tmp136_; - _tmp136_ = _cdecl_; - vala_ccode_declaration_set_modifiers (_tmp136_, VALA_CCODE_MODIFIERS_EXTERN); - } - _tmp137_ = decl_space; - _tmp138_ = _cdecl_; - vala_ccode_file_add_type_member_declaration (_tmp137_, (ValaCCodeNode*) _tmp138_); - _tmp139_ = delegate_type; - _tmp140_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp139_); - _tmp141_ = _tmp140_; - if (_tmp141_) { - ValaCCodeDeclaration* _tmp142_; - ValaCCodeDeclaration* _tmp143_; - ValaField* _tmp144_; + _tmp131_ = f; + _tmp132_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp131_); + if (_tmp132_) { + ValaCCodeDeclaration* _tmp133_; + _tmp133_ = _cdecl_; + vala_ccode_declaration_set_modifiers (_tmp133_, VALA_CCODE_MODIFIERS_STATIC); + } else { + ValaCCodeDeclaration* _tmp134_; + _tmp134_ = _cdecl_; + vala_ccode_declaration_set_modifiers (_tmp134_, VALA_CCODE_MODIFIERS_EXTERN); + } + _tmp135_ = decl_space; + _tmp136_ = _cdecl_; + vala_ccode_file_add_type_member_declaration (_tmp135_, (ValaCCodeNode*) _tmp136_); + _tmp137_ = delegate_type; + _tmp138_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp137_); + _tmp139_ = _tmp138_; + if (_tmp139_) { + ValaCCodeDeclaration* _tmp140_; + ValaCCodeDeclaration* _tmp141_; + ValaField* _tmp142_; + gchar* _tmp143_ = NULL; + gchar* _tmp144_; gchar* _tmp145_ = NULL; gchar* _tmp146_; - gchar* _tmp147_ = NULL; - gchar* _tmp148_; - ValaCCodeVariableDeclarator* _tmp149_; - ValaCCodeVariableDeclarator* _tmp150_; - ValaField* _tmp151_; - gboolean _tmp152_ = FALSE; - ValaCCodeFile* _tmp155_; - ValaCCodeDeclaration* _tmp156_; - _tmp142_ = vala_ccode_declaration_new ("GDestroyNotify"); + ValaCCodeVariableDeclarator* _tmp147_; + ValaCCodeVariableDeclarator* _tmp148_; + ValaField* _tmp149_; + gboolean _tmp150_ = FALSE; + ValaCCodeFile* _tmp153_; + ValaCCodeDeclaration* _tmp154_; + _tmp140_ = vala_ccode_declaration_new ("GDestroyNotify"); _vala_ccode_node_unref0 (_cdecl_); - _cdecl_ = _tmp142_; - _tmp143_ = _cdecl_; - _tmp144_ = f; - _tmp145_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp144_); + _cdecl_ = _tmp140_; + _tmp141_ = _cdecl_; + _tmp142_ = f; + _tmp143_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp142_); + _tmp144_ = _tmp143_; + _tmp145_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp144_); _tmp146_ = _tmp145_; - _tmp147_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp146_); + _tmp147_ = vala_ccode_variable_declarator_new (_tmp146_, NULL, NULL); _tmp148_ = _tmp147_; - _tmp149_ = vala_ccode_variable_declarator_new (_tmp148_, NULL, NULL); - _tmp150_ = _tmp149_; - vala_ccode_declaration_add_declarator (_tmp143_, (ValaCCodeDeclarator*) _tmp150_); - _vala_ccode_node_unref0 (_tmp150_); - _g_free0 (_tmp148_); + vala_ccode_declaration_add_declarator (_tmp141_, (ValaCCodeDeclarator*) _tmp148_); + _vala_ccode_node_unref0 (_tmp148_); _g_free0 (_tmp146_); - _tmp151_ = f; - _tmp152_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp151_); - if (_tmp152_) { - ValaCCodeDeclaration* _tmp153_; - _tmp153_ = _cdecl_; - vala_ccode_declaration_set_modifiers (_tmp153_, VALA_CCODE_MODIFIERS_STATIC); + _g_free0 (_tmp144_); + _tmp149_ = f; + _tmp150_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp149_); + if (_tmp150_) { + ValaCCodeDeclaration* _tmp151_; + _tmp151_ = _cdecl_; + vala_ccode_declaration_set_modifiers (_tmp151_, VALA_CCODE_MODIFIERS_STATIC); } else { - ValaCCodeDeclaration* _tmp154_; - _tmp154_ = _cdecl_; - vala_ccode_declaration_set_modifiers (_tmp154_, VALA_CCODE_MODIFIERS_EXTERN); - } - _tmp155_ = decl_space; - _tmp156_ = _cdecl_; - vala_ccode_file_add_type_member_declaration (_tmp155_, (ValaCCodeNode*) _tmp156_); + ValaCCodeDeclaration* _tmp152_; + _tmp152_ = _cdecl_; + vala_ccode_declaration_set_modifiers (_tmp152_, VALA_CCODE_MODIFIERS_EXTERN); + } + _tmp153_ = decl_space; + _tmp154_ = _cdecl_; + vala_ccode_file_add_type_member_declaration (_tmp153_, (ValaCCodeNode*) _tmp154_); } } _vala_code_node_unref0 (delegate_type); @@ -5212,9 +5209,9 @@ ValaDataType* _tmp294_; ValaDataType* _tmp295_; gboolean _tmp298_; - ValaField* _tmp413_; - ValaExpression* _tmp414_; - ValaExpression* _tmp415_; + ValaField* _tmp411_; + ValaExpression* _tmp412_; + ValaExpression* _tmp413_; _tmp244_ = f; _tmp245_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp244_); _tmp246_ = _tmp245_; @@ -5547,101 +5544,96 @@ ValaField* _tmp378_; gchar* _tmp379_ = NULL; gchar* _tmp380_; - gchar* _tmp381_ = NULL; - gchar* _tmp382_; - ValaCCodeConstant* _tmp383_; - ValaCCodeConstant* _tmp384_; - ValaCCodeVariableDeclarator* _tmp385_; - ValaCCodeVariableDeclarator* _tmp386_; - ValaField* _tmp387_; - gboolean _tmp388_ = FALSE; - ValaCCodeFile* _tmp391_; - ValaCCodeDeclaration* _tmp392_; - ValaDelegateType* _tmp393_; - gboolean _tmp394_; - gboolean _tmp395_; + ValaCCodeConstant* _tmp381_; + ValaCCodeConstant* _tmp382_; + ValaCCodeVariableDeclarator* _tmp383_; + ValaCCodeVariableDeclarator* _tmp384_; + ValaField* _tmp385_; + gboolean _tmp386_ = FALSE; + ValaCCodeFile* _tmp389_; + ValaCCodeDeclaration* _tmp390_; + ValaDelegateType* _tmp391_; + gboolean _tmp392_; + gboolean _tmp393_; _tmp376_ = vala_ccode_declaration_new ("gpointer"); target_def = _tmp376_; _tmp377_ = target_def; _tmp378_ = f; - _tmp379_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp378_); + _tmp379_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp378_); _tmp380_ = _tmp379_; - _tmp381_ = vala_ccode_base_module_get_delegate_target_cname (self, _tmp380_); + _tmp381_ = vala_ccode_constant_new ("NULL"); _tmp382_ = _tmp381_; - _tmp383_ = vala_ccode_constant_new ("NULL"); + _tmp383_ = vala_ccode_variable_declarator_new (_tmp380_, (ValaCCodeExpression*) _tmp382_, NULL); _tmp384_ = _tmp383_; - _tmp385_ = vala_ccode_variable_declarator_new (_tmp382_, (ValaCCodeExpression*) _tmp384_, NULL); - _tmp386_ = _tmp385_; - vala_ccode_declaration_add_declarator (_tmp377_, (ValaCCodeDeclarator*) _tmp386_); - _vala_ccode_node_unref0 (_tmp386_); + vala_ccode_declaration_add_declarator (_tmp377_, (ValaCCodeDeclarator*) _tmp384_); _vala_ccode_node_unref0 (_tmp384_); - _g_free0 (_tmp382_); + _vala_ccode_node_unref0 (_tmp382_); _g_free0 (_tmp380_); - _tmp387_ = f; - _tmp388_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp387_); - if (!_tmp388_) { - ValaCCodeDeclaration* _tmp389_; - _tmp389_ = target_def; - vala_ccode_declaration_set_modifiers (_tmp389_, VALA_CCODE_MODIFIERS_EXTERN); + _tmp385_ = f; + _tmp386_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp385_); + if (!_tmp386_) { + ValaCCodeDeclaration* _tmp387_; + _tmp387_ = target_def; + vala_ccode_declaration_set_modifiers (_tmp387_, VALA_CCODE_MODIFIERS_EXTERN); } else { - ValaCCodeDeclaration* _tmp390_; - _tmp390_ = target_def; - vala_ccode_declaration_set_modifiers (_tmp390_, VALA_CCODE_MODIFIERS_STATIC); + ValaCCodeDeclaration* _tmp388_; + _tmp388_ = target_def; + vala_ccode_declaration_set_modifiers (_tmp388_, VALA_CCODE_MODIFIERS_STATIC); } - _tmp391_ = self->cfile; - _tmp392_ = target_def; - vala_ccode_file_add_type_member_declaration (_tmp391_, (ValaCCodeNode*) _tmp392_); - _tmp393_ = delegate_type; - _tmp394_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp393_); - _tmp395_ = _tmp394_; - if (_tmp395_) { - ValaCCodeDeclaration* _tmp396_; + _tmp389_ = self->cfile; + _tmp390_ = target_def; + vala_ccode_file_add_type_member_declaration (_tmp389_, (ValaCCodeNode*) _tmp390_); + _tmp391_ = delegate_type; + _tmp392_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp391_); + _tmp393_ = _tmp392_; + if (_tmp393_) { + ValaCCodeDeclaration* _tmp394_; ValaCCodeDeclaration* target_destroy_notify_def; - ValaCCodeDeclaration* _tmp397_; - ValaField* _tmp398_; + ValaCCodeDeclaration* _tmp395_; + ValaField* _tmp396_; + gchar* _tmp397_ = NULL; + gchar* _tmp398_; gchar* _tmp399_ = NULL; gchar* _tmp400_; - gchar* _tmp401_ = NULL; - gchar* _tmp402_; - ValaCCodeConstant* _tmp403_; - ValaCCodeConstant* _tmp404_; - ValaCCodeVariableDeclarator* _tmp405_; - ValaCCodeVariableDeclarator* _tmp406_; - ValaField* _tmp407_; - gboolean _tmp408_ = FALSE; - ValaCCodeFile* _tmp411_; - ValaCCodeDeclaration* _tmp412_; - _tmp396_ = vala_ccode_declaration_new ("GDestroyNotify"); - target_destroy_notify_def = _tmp396_; - _tmp397_ = target_destroy_notify_def; - _tmp398_ = f; - _tmp399_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp398_); + ValaCCodeConstant* _tmp401_; + ValaCCodeConstant* _tmp402_; + ValaCCodeVariableDeclarator* _tmp403_; + ValaCCodeVariableDeclarator* _tmp404_; + ValaField* _tmp405_; + gboolean _tmp406_ = FALSE; + ValaCCodeFile* _tmp409_; + ValaCCodeDeclaration* _tmp410_; + _tmp394_ = vala_ccode_declaration_new ("GDestroyNotify"); + target_destroy_notify_def = _tmp394_; + _tmp395_ = target_destroy_notify_def; + _tmp396_ = f; + _tmp397_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp396_); + _tmp398_ = _tmp397_; + _tmp399_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp398_); _tmp400_ = _tmp399_; - _tmp401_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp400_); + _tmp401_ = vala_ccode_constant_new ("NULL"); _tmp402_ = _tmp401_; - _tmp403_ = vala_ccode_constant_new ("NULL"); + _tmp403_ = vala_ccode_variable_declarator_new (_tmp400_, (ValaCCodeExpression*) _tmp402_, NULL); _tmp404_ = _tmp403_; - _tmp405_ = vala_ccode_variable_declarator_new (_tmp402_, (ValaCCodeExpression*) _tmp404_, NULL); - _tmp406_ = _tmp405_; - vala_ccode_declaration_add_declarator (_tmp397_, (ValaCCodeDeclarator*) _tmp406_); - _vala_ccode_node_unref0 (_tmp406_); + vala_ccode_declaration_add_declarator (_tmp395_, (ValaCCodeDeclarator*) _tmp404_); _vala_ccode_node_unref0 (_tmp404_); - _g_free0 (_tmp402_); + _vala_ccode_node_unref0 (_tmp402_); _g_free0 (_tmp400_); - _tmp407_ = f; - _tmp408_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp407_); - if (!_tmp408_) { - ValaCCodeDeclaration* _tmp409_; - _tmp409_ = target_destroy_notify_def; - vala_ccode_declaration_set_modifiers (_tmp409_, VALA_CCODE_MODIFIERS_EXTERN); + _g_free0 (_tmp398_); + _tmp405_ = f; + _tmp406_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp405_); + if (!_tmp406_) { + ValaCCodeDeclaration* _tmp407_; + _tmp407_ = target_destroy_notify_def; + vala_ccode_declaration_set_modifiers (_tmp407_, VALA_CCODE_MODIFIERS_EXTERN); } else { - ValaCCodeDeclaration* _tmp410_; - _tmp410_ = target_destroy_notify_def; - vala_ccode_declaration_set_modifiers (_tmp410_, VALA_CCODE_MODIFIERS_STATIC); + ValaCCodeDeclaration* _tmp408_; + _tmp408_ = target_destroy_notify_def; + vala_ccode_declaration_set_modifiers (_tmp408_, VALA_CCODE_MODIFIERS_STATIC); } - _tmp411_ = self->cfile; - _tmp412_ = target_destroy_notify_def; - vala_ccode_file_add_type_member_declaration (_tmp411_, (ValaCCodeNode*) _tmp412_); + _tmp409_ = self->cfile; + _tmp410_ = target_destroy_notify_def; + vala_ccode_file_add_type_member_declaration (_tmp409_, (ValaCCodeNode*) _tmp410_); _vala_ccode_node_unref0 (target_destroy_notify_def); } _vala_ccode_node_unref0 (target_def); @@ -5649,244 +5641,244 @@ _vala_code_node_unref0 (delegate_type); } } - _tmp413_ = f; - _tmp414_ = vala_variable_get_initializer ((ValaVariable*) _tmp413_); - _tmp415_ = _tmp414_; - if (_tmp415_ != NULL) { - ValaField* _tmp416_; - ValaExpression* _tmp417_; - ValaExpression* _tmp418_; - ValaCCodeExpression* _tmp419_ = NULL; + _tmp411_ = f; + _tmp412_ = vala_variable_get_initializer ((ValaVariable*) _tmp411_); + _tmp413_ = _tmp412_; + if (_tmp413_ != NULL) { + ValaField* _tmp414_; + ValaExpression* _tmp415_; + ValaExpression* _tmp416_; + ValaCCodeExpression* _tmp417_ = NULL; ValaCCodeExpression* rhs; - ValaCCodeExpression* _tmp420_; - gboolean _tmp421_ = FALSE; - _tmp416_ = f; - _tmp417_ = vala_variable_get_initializer ((ValaVariable*) _tmp416_); - _tmp418_ = _tmp417_; - _tmp419_ = vala_ccode_base_module_get_cvalue (self, _tmp418_); - rhs = _tmp419_; - _tmp420_ = rhs; - _tmp421_ = vala_ccode_base_module_is_constant_ccode_expression (self, _tmp420_); - if (!_tmp421_) { - ValaField* _tmp422_; - ValaSymbol* _tmp423_; - ValaSymbol* _tmp424_; - _tmp422_ = f; - _tmp423_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp422_); - _tmp424_ = _tmp423_; - if (VALA_IS_CLASS (_tmp424_)) { - ValaField* _tmp425_; - ValaExpression* _tmp426_; - ValaExpression* _tmp427_; - gboolean _tmp464_ = FALSE; - gboolean _tmp465_ = FALSE; - ValaField* _tmp466_; - ValaDataType* _tmp467_; - ValaDataType* _tmp468_; - gboolean _tmp471_; - gboolean _tmp475_; - _tmp425_ = f; - _tmp426_ = vala_variable_get_initializer ((ValaVariable*) _tmp425_); - _tmp427_ = _tmp426_; - if (VALA_IS_INITIALIZER_LIST (_tmp427_)) { - ValaCCodeFunction* _tmp428_; - ValaCCodeFunction* _tmp429_; - ValaField* _tmp430_; - ValaDataType* _tmp431_; - ValaDataType* _tmp432_; - ValaLocalVariable* _tmp433_ = NULL; + ValaCCodeExpression* _tmp418_; + gboolean _tmp419_ = FALSE; + _tmp414_ = f; + _tmp415_ = vala_variable_get_initializer ((ValaVariable*) _tmp414_); + _tmp416_ = _tmp415_; + _tmp417_ = vala_ccode_base_module_get_cvalue (self, _tmp416_); + rhs = _tmp417_; + _tmp418_ = rhs; + _tmp419_ = vala_ccode_base_module_is_constant_ccode_expression (self, _tmp418_); + if (!_tmp419_) { + ValaField* _tmp420_; + ValaSymbol* _tmp421_; + ValaSymbol* _tmp422_; + _tmp420_ = f; + _tmp421_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp420_); + _tmp422_ = _tmp421_; + if (VALA_IS_CLASS (_tmp422_)) { + ValaField* _tmp423_; + ValaExpression* _tmp424_; + ValaExpression* _tmp425_; + gboolean _tmp462_ = FALSE; + gboolean _tmp463_ = FALSE; + ValaField* _tmp464_; + ValaDataType* _tmp465_; + ValaDataType* _tmp466_; + gboolean _tmp469_; + gboolean _tmp473_; + _tmp423_ = f; + _tmp424_ = vala_variable_get_initializer ((ValaVariable*) _tmp423_); + _tmp425_ = _tmp424_; + if (VALA_IS_INITIALIZER_LIST (_tmp425_)) { + ValaCCodeFunction* _tmp426_; + ValaCCodeFunction* _tmp427_; + ValaField* _tmp428_; + ValaDataType* _tmp429_; + ValaDataType* _tmp430_; + ValaLocalVariable* _tmp431_ = NULL; ValaLocalVariable* temp_decl; - ValaLocalVariable* _tmp434_; - const gchar* _tmp435_; - const gchar* _tmp436_; - ValaCCodeExpression* _tmp437_; - ValaCCodeVariableDeclarator* _tmp438_; + ValaLocalVariable* _tmp432_; + const gchar* _tmp433_; + const gchar* _tmp434_; + ValaCCodeExpression* _tmp435_; + ValaCCodeVariableDeclarator* _tmp436_; ValaCCodeVariableDeclarator* vardecl; - ValaCCodeFunction* _tmp439_; - ValaCCodeFunction* _tmp440_; - ValaLocalVariable* _tmp441_; - ValaDataType* _tmp442_; - ValaDataType* _tmp443_; - gchar* _tmp444_ = NULL; - gchar* _tmp445_; - ValaCCodeVariableDeclarator* _tmp446_; - ValaLocalVariable* _tmp447_; - const gchar* _tmp448_; - const gchar* _tmp449_; - gchar* _tmp450_ = NULL; - gchar* _tmp451_; - ValaCCodeExpression* _tmp452_ = NULL; - ValaCCodeExpression* _tmp453_; + ValaCCodeFunction* _tmp437_; + ValaCCodeFunction* _tmp438_; + ValaLocalVariable* _tmp439_; + ValaDataType* _tmp440_; + ValaDataType* _tmp441_; + gchar* _tmp442_ = NULL; + gchar* _tmp443_; + ValaCCodeVariableDeclarator* _tmp444_; + ValaLocalVariable* _tmp445_; + const gchar* _tmp446_; + const gchar* _tmp447_; + gchar* _tmp448_ = NULL; + gchar* _tmp449_; + ValaCCodeExpression* _tmp450_ = NULL; + ValaCCodeExpression* _tmp451_; ValaCCodeExpression* tmp; - ValaCCodeFunction* _tmp454_; - ValaCCodeFunction* _tmp455_; - ValaCCodeExpression* _tmp456_; - ValaCCodeExpression* _tmp457_; - ValaCCodeFunction* _tmp458_; - ValaCCodeFunction* _tmp459_; - _tmp428_ = vala_ccode_base_module_get_ccode (self); - _tmp429_ = _tmp428_; - vala_ccode_function_open_block (_tmp429_); - _tmp430_ = f; - _tmp431_ = vala_variable_get_variable_type ((ValaVariable*) _tmp430_); - _tmp432_ = _tmp431_; - _tmp433_ = vala_ccode_base_module_get_temp_variable (self, _tmp432_, TRUE, NULL, TRUE); - temp_decl = _tmp433_; - _tmp434_ = temp_decl; - _tmp435_ = vala_symbol_get_name ((ValaSymbol*) _tmp434_); - _tmp436_ = _tmp435_; - _tmp437_ = rhs; - _tmp438_ = vala_ccode_variable_declarator_new_zero (_tmp436_, _tmp437_, NULL); - vardecl = _tmp438_; - _tmp439_ = vala_ccode_base_module_get_ccode (self); - _tmp440_ = _tmp439_; - _tmp441_ = temp_decl; - _tmp442_ = vala_variable_get_variable_type ((ValaVariable*) _tmp441_); + ValaCCodeFunction* _tmp452_; + ValaCCodeFunction* _tmp453_; + ValaCCodeExpression* _tmp454_; + ValaCCodeExpression* _tmp455_; + ValaCCodeFunction* _tmp456_; + ValaCCodeFunction* _tmp457_; + _tmp426_ = vala_ccode_base_module_get_ccode (self); + _tmp427_ = _tmp426_; + vala_ccode_function_open_block (_tmp427_); + _tmp428_ = f; + _tmp429_ = vala_variable_get_variable_type ((ValaVariable*) _tmp428_); + _tmp430_ = _tmp429_; + _tmp431_ = vala_ccode_base_module_get_temp_variable (self, _tmp430_, TRUE, NULL, TRUE); + temp_decl = _tmp431_; + _tmp432_ = temp_decl; + _tmp433_ = vala_symbol_get_name ((ValaSymbol*) _tmp432_); + _tmp434_ = _tmp433_; + _tmp435_ = rhs; + _tmp436_ = vala_ccode_variable_declarator_new_zero (_tmp434_, _tmp435_, NULL); + vardecl = _tmp436_; + _tmp437_ = vala_ccode_base_module_get_ccode (self); + _tmp438_ = _tmp437_; + _tmp439_ = temp_decl; + _tmp440_ = vala_variable_get_variable_type ((ValaVariable*) _tmp439_); + _tmp441_ = _tmp440_; + _tmp442_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp441_); _tmp443_ = _tmp442_; - _tmp444_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp443_); - _tmp445_ = _tmp444_; - _tmp446_ = vardecl; - vala_ccode_function_add_declaration (_tmp440_, _tmp445_, (ValaCCodeDeclarator*) _tmp446_, 0); - _g_free0 (_tmp445_); - _tmp447_ = temp_decl; - _tmp448_ = vala_symbol_get_name ((ValaSymbol*) _tmp447_); + _tmp444_ = vardecl; + vala_ccode_function_add_declaration (_tmp438_, _tmp443_, (ValaCCodeDeclarator*) _tmp444_, 0); + _g_free0 (_tmp443_); + _tmp445_ = temp_decl; + _tmp446_ = vala_symbol_get_name ((ValaSymbol*) _tmp445_); + _tmp447_ = _tmp446_; + _tmp448_ = vala_ccode_base_module_get_variable_cname (self, _tmp447_); _tmp449_ = _tmp448_; - _tmp450_ = vala_ccode_base_module_get_variable_cname (self, _tmp449_); + _tmp450_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp449_); _tmp451_ = _tmp450_; - _tmp452_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp451_); + _g_free0 (_tmp449_); + tmp = _tmp451_; + _tmp452_ = vala_ccode_base_module_get_ccode (self); _tmp453_ = _tmp452_; - _g_free0 (_tmp451_); - tmp = _tmp453_; - _tmp454_ = vala_ccode_base_module_get_ccode (self); - _tmp455_ = _tmp454_; - _tmp456_ = lhs; - _tmp457_ = tmp; - vala_ccode_function_add_assignment (_tmp455_, _tmp456_, _tmp457_); - _tmp458_ = vala_ccode_base_module_get_ccode (self); - _tmp459_ = _tmp458_; - vala_ccode_function_close (_tmp459_); + _tmp454_ = lhs; + _tmp455_ = tmp; + vala_ccode_function_add_assignment (_tmp453_, _tmp454_, _tmp455_); + _tmp456_ = vala_ccode_base_module_get_ccode (self); + _tmp457_ = _tmp456_; + vala_ccode_function_close (_tmp457_); _vala_ccode_node_unref0 (tmp); _vala_ccode_node_unref0 (vardecl); _vala_code_node_unref0 (temp_decl); } else { - ValaCCodeFunction* _tmp460_; - ValaCCodeFunction* _tmp461_; - ValaCCodeExpression* _tmp462_; - ValaCCodeExpression* _tmp463_; - _tmp460_ = vala_ccode_base_module_get_ccode (self); - _tmp461_ = _tmp460_; - _tmp462_ = lhs; - _tmp463_ = rhs; - vala_ccode_function_add_assignment (_tmp461_, _tmp462_, _tmp463_); + ValaCCodeFunction* _tmp458_; + ValaCCodeFunction* _tmp459_; + ValaCCodeExpression* _tmp460_; + ValaCCodeExpression* _tmp461_; + _tmp458_ = vala_ccode_base_module_get_ccode (self); + _tmp459_ = _tmp458_; + _tmp460_ = lhs; + _tmp461_ = rhs; + vala_ccode_function_add_assignment (_tmp459_, _tmp460_, _tmp461_); } - _tmp466_ = f; - _tmp467_ = vala_variable_get_variable_type ((ValaVariable*) _tmp466_); - _tmp468_ = _tmp467_; - if (VALA_IS_ARRAY_TYPE (_tmp468_)) { - ValaField* _tmp469_; - gboolean _tmp470_ = FALSE; - _tmp469_ = f; - _tmp470_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp469_); - _tmp465_ = _tmp470_; + _tmp464_ = f; + _tmp465_ = vala_variable_get_variable_type ((ValaVariable*) _tmp464_); + _tmp466_ = _tmp465_; + if (VALA_IS_ARRAY_TYPE (_tmp466_)) { + ValaField* _tmp467_; + gboolean _tmp468_ = FALSE; + _tmp467_ = f; + _tmp468_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp467_); + _tmp463_ = _tmp468_; } else { - _tmp465_ = FALSE; + _tmp463_ = FALSE; } - _tmp471_ = _tmp465_; - if (_tmp471_) { - ValaField* _tmp472_; - ValaExpression* _tmp473_; - ValaExpression* _tmp474_; - _tmp472_ = f; - _tmp473_ = vala_variable_get_initializer ((ValaVariable*) _tmp472_); - _tmp474_ = _tmp473_; - _tmp464_ = VALA_IS_ARRAY_CREATION_EXPRESSION (_tmp474_); + _tmp469_ = _tmp463_; + if (_tmp469_) { + ValaField* _tmp470_; + ValaExpression* _tmp471_; + ValaExpression* _tmp472_; + _tmp470_ = f; + _tmp471_ = vala_variable_get_initializer ((ValaVariable*) _tmp470_); + _tmp472_ = _tmp471_; + _tmp462_ = VALA_IS_ARRAY_CREATION_EXPRESSION (_tmp472_); } else { - _tmp464_ = FALSE; + _tmp462_ = FALSE; } - _tmp475_ = _tmp464_; - if (_tmp475_) { - ValaField* _tmp476_; - ValaDataType* _tmp477_; - ValaDataType* _tmp478_; - ValaArrayType* _tmp479_; + _tmp473_ = _tmp462_; + if (_tmp473_) { + ValaField* _tmp474_; + ValaDataType* _tmp475_; + ValaDataType* _tmp476_; + ValaArrayType* _tmp477_; ValaArrayType* array_type; - ValaField* _tmp480_; - ValaTargetValue* _tmp481_ = NULL; + ValaField* _tmp478_; + ValaTargetValue* _tmp479_ = NULL; ValaTargetValue* field_value; - ValaField* _tmp482_; - ValaExpression* _tmp483_; - ValaExpression* _tmp484_; - ValaList* _tmp485_ = NULL; + ValaField* _tmp480_; + ValaExpression* _tmp481_; + ValaExpression* _tmp482_; + ValaList* _tmp483_ = NULL; ValaList* sizes; - _tmp476_ = f; - _tmp477_ = vala_variable_get_variable_type ((ValaVariable*) _tmp476_); - _tmp478_ = _tmp477_; - _tmp479_ = _vala_code_node_ref0 (VALA_ARRAY_TYPE (_tmp478_)); - array_type = _tmp479_; + _tmp474_ = f; + _tmp475_ = vala_variable_get_variable_type ((ValaVariable*) _tmp474_); + _tmp476_ = _tmp475_; + _tmp477_ = _vala_code_node_ref0 (VALA_ARRAY_TYPE (_tmp476_)); + array_type = _tmp477_; + _tmp478_ = f; + _tmp479_ = vala_ccode_base_module_get_field_cvalue (self, _tmp478_, NULL); + field_value = _tmp479_; _tmp480_ = f; - _tmp481_ = vala_ccode_base_module_get_field_cvalue (self, _tmp480_, NULL); - field_value = _tmp481_; - _tmp482_ = f; - _tmp483_ = vala_variable_get_initializer ((ValaVariable*) _tmp482_); - _tmp484_ = _tmp483_; - _tmp485_ = vala_array_creation_expression_get_sizes (VALA_ARRAY_CREATION_EXPRESSION (_tmp484_)); - sizes = _tmp485_; + _tmp481_ = vala_variable_get_initializer ((ValaVariable*) _tmp480_); + _tmp482_ = _tmp481_; + _tmp483_ = vala_array_creation_expression_get_sizes (VALA_ARRAY_CREATION_EXPRESSION (_tmp482_)); + sizes = _tmp483_; { gint dim; dim = 1; { - gboolean _tmp486_; - _tmp486_ = TRUE; + gboolean _tmp484_; + _tmp484_ = TRUE; while (TRUE) { - gboolean _tmp487_; + gboolean _tmp485_; + gint _tmp487_; + ValaArrayType* _tmp488_; gint _tmp489_; - ValaArrayType* _tmp490_; - gint _tmp491_; + gint _tmp490_; + ValaTargetValue* _tmp491_; gint _tmp492_; - ValaTargetValue* _tmp493_; - gint _tmp494_; - ValaCCodeExpression* _tmp495_ = NULL; + ValaCCodeExpression* _tmp493_ = NULL; ValaCCodeExpression* array_len_lhs; - ValaList* _tmp496_; - gint _tmp497_; - gpointer _tmp498_ = NULL; + ValaList* _tmp494_; + gint _tmp495_; + gpointer _tmp496_ = NULL; ValaExpression* size; - ValaCCodeFunction* _tmp499_; - ValaCCodeFunction* _tmp500_; - ValaCCodeExpression* _tmp501_; - ValaExpression* _tmp502_; - ValaCCodeExpression* _tmp503_ = NULL; - ValaCCodeExpression* _tmp504_; - _tmp487_ = _tmp486_; - if (!_tmp487_) { - gint _tmp488_; - _tmp488_ = dim; - dim = _tmp488_ + 1; + ValaCCodeFunction* _tmp497_; + ValaCCodeFunction* _tmp498_; + ValaCCodeExpression* _tmp499_; + ValaExpression* _tmp500_; + ValaCCodeExpression* _tmp501_ = NULL; + ValaCCodeExpression* _tmp502_; + _tmp485_ = _tmp484_; + if (!_tmp485_) { + gint _tmp486_; + _tmp486_ = dim; + dim = _tmp486_ + 1; } - _tmp486_ = FALSE; - _tmp489_ = dim; - _tmp490_ = array_type; - _tmp491_ = vala_array_type_get_rank (_tmp490_); - _tmp492_ = _tmp491_; - if (!(_tmp489_ <= _tmp492_)) { + _tmp484_ = FALSE; + _tmp487_ = dim; + _tmp488_ = array_type; + _tmp489_ = vala_array_type_get_rank (_tmp488_); + _tmp490_ = _tmp489_; + if (!(_tmp487_ <= _tmp490_)) { break; } - _tmp493_ = field_value; - _tmp494_ = dim; - _tmp495_ = vala_ccode_base_module_get_array_length_cvalue (self, _tmp493_, _tmp494_); - array_len_lhs = _tmp495_; - _tmp496_ = sizes; - _tmp497_ = dim; - _tmp498_ = vala_list_get (_tmp496_, _tmp497_ - 1); - size = (ValaExpression*) _tmp498_; - _tmp499_ = vala_ccode_base_module_get_ccode (self); - _tmp500_ = _tmp499_; - _tmp501_ = array_len_lhs; - _tmp502_ = size; - _tmp503_ = vala_ccode_base_module_get_cvalue (self, _tmp502_); - _tmp504_ = _tmp503_; - vala_ccode_function_add_assignment (_tmp500_, _tmp501_, _tmp504_); - _vala_ccode_node_unref0 (_tmp504_); + _tmp491_ = field_value; + _tmp492_ = dim; + _tmp493_ = vala_ccode_base_module_get_array_length_cvalue (self, _tmp491_, _tmp492_); + array_len_lhs = _tmp493_; + _tmp494_ = sizes; + _tmp495_ = dim; + _tmp496_ = vala_list_get (_tmp494_, _tmp495_ - 1); + size = (ValaExpression*) _tmp496_; + _tmp497_ = vala_ccode_base_module_get_ccode (self); + _tmp498_ = _tmp497_; + _tmp499_ = array_len_lhs; + _tmp500_ = size; + _tmp501_ = vala_ccode_base_module_get_cvalue (self, _tmp500_); + _tmp502_ = _tmp501_; + vala_ccode_function_add_assignment (_tmp498_, _tmp499_, _tmp502_); + _vala_ccode_node_unref0 (_tmp502_); _vala_code_node_unref0 (size); _vala_ccode_node_unref0 (array_len_lhs); } @@ -5897,16 +5889,16 @@ _vala_code_node_unref0 (array_type); } } else { - ValaField* _tmp505_; - ValaField* _tmp506_; - ValaSourceReference* _tmp507_; - ValaSourceReference* _tmp508_; - _tmp505_ = f; - vala_code_node_set_error ((ValaCodeNode*) _tmp505_, TRUE); - _tmp506_ = f; - _tmp507_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp506_); - _tmp508_ = _tmp507_; - vala_report_error (_tmp508_, "Non-constant field initializers not supported in this context"); + ValaField* _tmp503_; + ValaField* _tmp504_; + ValaSourceReference* _tmp505_; + ValaSourceReference* _tmp506_; + _tmp503_ = f; + vala_code_node_set_error ((ValaCodeNode*) _tmp503_, TRUE); + _tmp504_ = f; + _tmp505_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp504_); + _tmp506_ = _tmp505_; + vala_report_error (_tmp506_, "Non-constant field initializers not supported in this context"); _vala_ccode_node_unref0 (rhs); _vala_ccode_node_unref0 (var_def); _vala_ccode_node_unref0 (var_decl); @@ -9547,9 +9539,9 @@ gboolean _tmp50_ = FALSE; ValaArrayType* _tmp51_; gboolean _tmp54_; - ValaParameter* _tmp101_; - ValaParameter* _tmp102_; - ValaTargetValue* _tmp103_; + ValaParameter* _tmp97_; + ValaParameter* _tmp98_; + ValaTargetValue* _tmp99_; g_return_if_fail (self != NULL); g_return_if_fail (param != NULL); g_return_if_fail (data != NULL); @@ -9713,76 +9705,67 @@ if (_tmp74_) { ValaCCodeStruct* _tmp75_; ValaParameter* _tmp76_; - const gchar* _tmp77_; - const gchar* _tmp78_; - gchar* _tmp79_ = NULL; - gchar* _tmp80_; - gchar* _tmp81_ = NULL; - gchar* _tmp82_; - ValaParameter* _tmp83_; - ValaDataType* _tmp84_; - ValaDataType* _tmp85_; - gboolean _tmp86_; - gboolean _tmp87_; + gchar* _tmp77_ = NULL; + gchar* _tmp78_; + ValaParameter* _tmp79_; + ValaDataType* _tmp80_; + ValaDataType* _tmp81_; + gboolean _tmp82_; + gboolean _tmp83_; _tmp75_ = data; _tmp76_ = param; - _tmp77_ = vala_symbol_get_name ((ValaSymbol*) _tmp76_); + _tmp77_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp76_); _tmp78_ = _tmp77_; - _tmp79_ = vala_ccode_base_module_get_variable_cname (self, _tmp78_); - _tmp80_ = _tmp79_; - _tmp81_ = vala_ccode_base_module_get_delegate_target_cname (self, _tmp80_); - _tmp82_ = _tmp81_; - vala_ccode_struct_add_field (_tmp75_, "gpointer", _tmp82_, NULL); - _g_free0 (_tmp82_); - _g_free0 (_tmp80_); - _tmp83_ = param; - _tmp84_ = vala_variable_get_variable_type ((ValaVariable*) _tmp83_); - _tmp85_ = _tmp84_; - _tmp86_ = vala_data_type_get_value_owned (_tmp85_); - _tmp87_ = _tmp86_; - if (_tmp87_) { - ValaCCodeStruct* _tmp88_; - ValaParameter* _tmp89_; - const gchar* _tmp90_; - const gchar* _tmp91_; - gchar* _tmp92_ = NULL; - gchar* _tmp93_; - gchar* _tmp94_ = NULL; - gchar* _tmp95_; - ValaParameter* _tmp96_; - ValaTargetValue* _tmp97_ = NULL; + vala_ccode_struct_add_field (_tmp75_, "gpointer", _tmp78_, NULL); + _g_free0 (_tmp78_); + _tmp79_ = param; + _tmp80_ = vala_variable_get_variable_type ((ValaVariable*) _tmp79_); + _tmp81_ = _tmp80_; + _tmp82_ = vala_data_type_get_value_owned (_tmp81_); + _tmp83_ = _tmp82_; + if (_tmp83_) { + ValaCCodeStruct* _tmp84_; + ValaParameter* _tmp85_; + const gchar* _tmp86_; + const gchar* _tmp87_; + gchar* _tmp88_ = NULL; + gchar* _tmp89_; + gchar* _tmp90_ = NULL; + gchar* _tmp91_; + ValaParameter* _tmp92_; + ValaTargetValue* _tmp93_ = NULL; ValaTargetValue* lvalue; - ValaTargetValue* _tmp98_; - ValaTargetValue* _tmp99_; - ValaCCodeExpression* _tmp100_ = NULL; - _tmp88_ = data; - _tmp89_ = param; - _tmp90_ = vala_symbol_get_name ((ValaSymbol*) _tmp89_); + ValaTargetValue* _tmp94_; + ValaTargetValue* _tmp95_; + ValaCCodeExpression* _tmp96_ = NULL; + _tmp84_ = data; + _tmp85_ = param; + _tmp86_ = vala_symbol_get_name ((ValaSymbol*) _tmp85_); + _tmp87_ = _tmp86_; + _tmp88_ = vala_ccode_base_module_get_variable_cname (self, _tmp87_); + _tmp89_ = _tmp88_; + _tmp90_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp89_); _tmp91_ = _tmp90_; - _tmp92_ = vala_ccode_base_module_get_variable_cname (self, _tmp91_); - _tmp93_ = _tmp92_; - _tmp94_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp93_); - _tmp95_ = _tmp94_; - vala_ccode_struct_add_field (_tmp88_, "GDestroyNotify", _tmp95_, NULL); - _g_free0 (_tmp95_); - _g_free0 (_tmp93_); - _tmp96_ = param; - _tmp97_ = vala_ccode_base_module_get_parameter_cvalue (self, _tmp96_); - lvalue = _tmp97_; - _tmp98_ = value; - _tmp99_ = lvalue; - _tmp100_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cvalue (self, _tmp99_); - _vala_ccode_node_unref0 (VALA_GLIB_VALUE (_tmp98_)->delegate_target_destroy_notify_cvalue); - VALA_GLIB_VALUE (_tmp98_)->delegate_target_destroy_notify_cvalue = _tmp100_; + vala_ccode_struct_add_field (_tmp84_, "GDestroyNotify", _tmp91_, NULL); + _g_free0 (_tmp91_); + _g_free0 (_tmp89_); + _tmp92_ = param; + _tmp93_ = vala_ccode_base_module_get_parameter_cvalue (self, _tmp92_); + lvalue = _tmp93_; + _tmp94_ = value; + _tmp95_ = lvalue; + _tmp96_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cvalue (self, _tmp95_); + _vala_ccode_node_unref0 (VALA_GLIB_VALUE (_tmp94_)->delegate_target_destroy_notify_cvalue); + VALA_GLIB_VALUE (_tmp94_)->delegate_target_destroy_notify_cvalue = _tmp96_; _vala_target_value_unref0 (lvalue); } } } - _tmp101_ = param; - vala_parameter_set_captured (_tmp101_, TRUE); - _tmp102_ = param; - _tmp103_ = value; - vala_code_generator_store_parameter ((ValaCodeGenerator*) self, _tmp102_, _tmp103_); + _tmp97_ = param; + vala_parameter_set_captured (_tmp97_, TRUE); + _tmp98_ = param; + _tmp99_ = value; + vala_code_generator_store_parameter ((ValaCodeGenerator*) self, _tmp98_, _tmp99_); _vala_code_node_unref0 (deleg_type); _vala_code_node_unref0 (array_type); _vala_target_value_unref0 (value); @@ -9807,20 +9790,20 @@ ValaBlock* _tmp19_; gboolean _tmp20_; gboolean _tmp21_; - ValaBlock* _tmp847_; - ValaSymbol* _tmp848_; - ValaSymbol* _tmp849_; - ValaBlock* _tmp930_; - gboolean _tmp931_; - gboolean _tmp932_; - gboolean _tmp960_ = FALSE; - gboolean _tmp961_ = FALSE; - ValaBlock* _tmp962_; - ValaCodeNode* _tmp963_; - ValaCodeNode* _tmp964_; - gboolean _tmp968_; - gboolean _tmp972_; - ValaCCodeBaseModuleEmitContext* _tmp975_; + ValaBlock* _tmp858_; + ValaSymbol* _tmp859_; + ValaSymbol* _tmp860_; + ValaBlock* _tmp941_; + gboolean _tmp942_; + gboolean _tmp943_; + gboolean _tmp971_ = FALSE; + gboolean _tmp972_ = FALSE; + ValaBlock* _tmp973_; + ValaCodeNode* _tmp974_; + ValaCodeNode* _tmp975_; + gboolean _tmp979_; + gboolean _tmp983_; + ValaCCodeBaseModuleEmitContext* _tmp986_; self = (ValaCCodeBaseModule*) base; g_return_if_fail (b != NULL); _tmp0_ = self->emit_context; @@ -9989,73 +9972,84 @@ ValaCCodeFunction* _tmp464_; ValaCCodeFunction* unref_fun; ValaCCodeFunction* _tmp465_; - gint _tmp466_; - gchar* _tmp467_ = NULL; - gchar* _tmp468_; - const gchar* _tmp469_; - gchar* _tmp470_; - gchar* _tmp471_; - ValaCCodeParameter* _tmp472_; - ValaCCodeParameter* _tmp473_; - ValaCCodeFunction* _tmp474_; - ValaCCodeFunction* _tmp475_; - ValaCCodeIdentifier* _tmp476_; - ValaCCodeIdentifier* _tmp477_; - ValaCCodeFunctionCall* _tmp478_; - ValaCCodeFunctionCall* _tmp479_; - gint _tmp480_; - gchar* _tmp481_ = NULL; + ValaCCodeParameter* _tmp466_; + ValaCCodeParameter* _tmp467_; + ValaCCodeFunction* _tmp468_; + ValaCCodeFunction* _tmp469_; + ValaCCodeFunction* _tmp470_; + ValaCCodeFunction* _tmp471_; + const gchar* _tmp472_; + gchar* _tmp473_; + gchar* _tmp474_; + gint _tmp475_; + gchar* _tmp476_ = NULL; + gchar* _tmp477_; + ValaCCodeIdentifier* _tmp478_; + ValaCCodeIdentifier* _tmp479_; + const gchar* _tmp480_; + gchar* _tmp481_; gchar* _tmp482_; - ValaCCodeIdentifier* _tmp483_; - ValaCCodeIdentifier* _tmp484_; - ValaCCodeMemberAccess* _tmp485_; - ValaCCodeMemberAccess* _tmp486_; - ValaCCodeUnaryExpression* _tmp487_; - ValaCCodeUnaryExpression* _tmp488_; - ValaCCodeFunction* _tmp489_; - ValaCCodeFunction* _tmp490_; - ValaCCodeFunctionCall* _tmp491_; - gint _tmp492_; - gchar* _tmp493_ = NULL; - gchar* _tmp494_; + ValaCCodeCastExpression* _tmp483_; + ValaCCodeCastExpression* _tmp484_; + ValaCCodeVariableDeclarator* _tmp485_; + ValaCCodeVariableDeclarator* _tmp486_; + ValaCCodeIdentifier* _tmp487_; + ValaCCodeIdentifier* _tmp488_; + ValaCCodeFunctionCall* _tmp489_; + ValaCCodeFunctionCall* _tmp490_; + gint _tmp491_; + gchar* _tmp492_ = NULL; + gchar* _tmp493_; + ValaCCodeIdentifier* _tmp494_; ValaCCodeIdentifier* _tmp495_; - ValaCCodeExpression* _tmp496_; + ValaCCodeMemberAccess* _tmp496_; + ValaCCodeMemberAccess* _tmp497_; + ValaCCodeUnaryExpression* _tmp498_; + ValaCCodeUnaryExpression* _tmp499_; + ValaCCodeFunction* _tmp500_; + ValaCCodeFunction* _tmp501_; + ValaCCodeFunctionCall* _tmp502_; + gint _tmp503_; + gchar* _tmp504_ = NULL; + gchar* _tmp505_; + ValaCCodeIdentifier* _tmp506_; + ValaCCodeExpression* _tmp507_; ValaCCodeExpression* outer_block; - ValaBlock* _tmp497_; + ValaBlock* _tmp508_; ValaBlock* parent_closure_block; - ValaDataType* _tmp510_ = NULL; - ValaDataType* _tmp511_; - gboolean _tmp512_; - ValaMethod* _tmp530_; - ValaMethod* _tmp531_; - ValaBlock* _tmp637_; - ValaSymbol* _tmp638_; - ValaSymbol* _tmp639_; - ValaBlock* _tmp720_; - ValaCCodeIdentifier* _tmp774_; - ValaCCodeIdentifier* _tmp775_; - ValaCCodeFunctionCall* _tmp776_; - ValaCCodeFunctionCall* _tmp777_; - ValaCCodeFunctionCall* data_free; - ValaCCodeFunctionCall* _tmp778_; - const gchar* _tmp779_; - ValaCCodeIdentifier* _tmp780_; - ValaCCodeIdentifier* _tmp781_; - ValaCCodeFunctionCall* _tmp782_; - gint _tmp783_; - gchar* _tmp784_ = NULL; - gchar* _tmp785_; + ValaDataType* _tmp521_ = NULL; + ValaDataType* _tmp522_; + gboolean _tmp523_; + ValaMethod* _tmp541_; + ValaMethod* _tmp542_; + ValaBlock* _tmp648_; + ValaSymbol* _tmp649_; + ValaSymbol* _tmp650_; + ValaBlock* _tmp731_; + ValaCCodeIdentifier* _tmp785_; ValaCCodeIdentifier* _tmp786_; - ValaCCodeIdentifier* _tmp787_; - ValaCCodeFunction* _tmp788_; - ValaCCodeFunction* _tmp789_; - ValaCCodeFunctionCall* _tmp790_; - ValaCCodeFunction* _tmp791_; - ValaCCodeFunction* _tmp792_; - ValaCCodeFile* _tmp793_; - ValaCCodeFunction* _tmp794_; - ValaCCodeFile* _tmp795_; - ValaCCodeFunction* _tmp796_; + ValaCCodeFunctionCall* _tmp787_; + ValaCCodeFunctionCall* _tmp788_; + ValaCCodeFunctionCall* data_free; + ValaCCodeFunctionCall* _tmp789_; + const gchar* _tmp790_; + ValaCCodeIdentifier* _tmp791_; + ValaCCodeIdentifier* _tmp792_; + ValaCCodeFunctionCall* _tmp793_; + gint _tmp794_; + gchar* _tmp795_ = NULL; + gchar* _tmp796_; + ValaCCodeIdentifier* _tmp797_; + ValaCCodeIdentifier* _tmp798_; + ValaCCodeFunction* _tmp799_; + ValaCCodeFunction* _tmp800_; + ValaCCodeFunctionCall* _tmp801_; + ValaCCodeFunction* _tmp802_; + ValaCCodeFunction* _tmp803_; + ValaCCodeFile* _tmp804_; + ValaCCodeFunction* _tmp805_; + ValaCCodeFile* _tmp806_; + ValaCCodeFunction* _tmp807_; _tmp22_ = b; _tmp23_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp22_); _tmp24_ = _tmp23_; @@ -11153,324 +11147,340 @@ _g_free0 (_tmp462_); unref_fun = _tmp464_; _tmp465_ = unref_fun; - _tmp466_ = block_id; - _tmp467_ = g_strdup_printf ("_data%d_", _tmp466_); - _tmp468_ = _tmp467_; - _tmp469_ = struct_name; - _tmp470_ = g_strconcat (_tmp469_, "*", NULL); + _tmp466_ = vala_ccode_parameter_new ("_userdata_", "void *"); + _tmp467_ = _tmp466_; + vala_ccode_function_add_parameter (_tmp465_, _tmp467_); + _vala_ccode_node_unref0 (_tmp467_); + _tmp468_ = unref_fun; + vala_ccode_function_set_modifiers (_tmp468_, VALA_CCODE_MODIFIERS_STATIC); + _tmp469_ = unref_fun; + vala_ccode_base_module_push_function (self, _tmp469_); + _tmp470_ = vala_ccode_base_module_get_ccode (self); _tmp471_ = _tmp470_; - _tmp472_ = vala_ccode_parameter_new (_tmp468_, _tmp471_); - _tmp473_ = _tmp472_; - vala_ccode_function_add_parameter (_tmp465_, _tmp473_); - _vala_ccode_node_unref0 (_tmp473_); - _g_free0 (_tmp471_); - _g_free0 (_tmp468_); - _tmp474_ = unref_fun; - vala_ccode_function_set_modifiers (_tmp474_, VALA_CCODE_MODIFIERS_STATIC); - _tmp475_ = unref_fun; - vala_ccode_base_module_push_function (self, _tmp475_); - _tmp476_ = vala_ccode_identifier_new ("g_atomic_int_dec_and_test"); + _tmp472_ = struct_name; + _tmp473_ = g_strconcat (_tmp472_, "*", NULL); + _tmp474_ = _tmp473_; + _tmp475_ = block_id; + _tmp476_ = g_strdup_printf ("_data%d_", _tmp475_); _tmp477_ = _tmp476_; - _tmp478_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp477_); - _vala_ccode_node_unref0 (ccall); - ccall = _tmp478_; - _vala_ccode_node_unref0 (_tmp477_); - _tmp479_ = ccall; - _tmp480_ = block_id; - _tmp481_ = g_strdup_printf ("_data%d_", _tmp480_); + _tmp478_ = vala_ccode_identifier_new ("_userdata_"); + _tmp479_ = _tmp478_; + _tmp480_ = struct_name; + _tmp481_ = g_strconcat (_tmp480_, "*", NULL); _tmp482_ = _tmp481_; - _tmp483_ = vala_ccode_identifier_new (_tmp482_); + _tmp483_ = vala_ccode_cast_expression_new ((ValaCCodeExpression*) _tmp479_, _tmp482_); _tmp484_ = _tmp483_; - _tmp485_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp484_, "_ref_count_"); + _tmp485_ = vala_ccode_variable_declarator_new (_tmp477_, (ValaCCodeExpression*) _tmp484_, NULL); _tmp486_ = _tmp485_; - _tmp487_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_ADDRESS_OF, (ValaCCodeExpression*) _tmp486_); - _tmp488_ = _tmp487_; - vala_ccode_function_call_add_argument (_tmp479_, (ValaCCodeExpression*) _tmp488_); - _vala_ccode_node_unref0 (_tmp488_); + vala_ccode_function_add_declaration (_tmp471_, _tmp474_, (ValaCCodeDeclarator*) _tmp486_, 0); _vala_ccode_node_unref0 (_tmp486_); _vala_ccode_node_unref0 (_tmp484_); _g_free0 (_tmp482_); - _tmp489_ = vala_ccode_base_module_get_ccode (self); - _tmp490_ = _tmp489_; - _tmp491_ = ccall; - vala_ccode_function_open_if (_tmp490_, (ValaCCodeExpression*) _tmp491_); - _tmp492_ = block_id; - _tmp493_ = g_strdup_printf ("_data%d_", _tmp492_); - _tmp494_ = _tmp493_; - _tmp495_ = vala_ccode_identifier_new (_tmp494_); - _tmp496_ = (ValaCCodeExpression*) _tmp495_; - _g_free0 (_tmp494_); - outer_block = _tmp496_; - _tmp497_ = b; - parent_closure_block = _tmp497_; + _vala_ccode_node_unref0 (_tmp479_); + _g_free0 (_tmp477_); + _g_free0 (_tmp474_); + _tmp487_ = vala_ccode_identifier_new ("g_atomic_int_dec_and_test"); + _tmp488_ = _tmp487_; + _tmp489_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp488_); + _vala_ccode_node_unref0 (ccall); + ccall = _tmp489_; + _vala_ccode_node_unref0 (_tmp488_); + _tmp490_ = ccall; + _tmp491_ = block_id; + _tmp492_ = g_strdup_printf ("_data%d_", _tmp491_); + _tmp493_ = _tmp492_; + _tmp494_ = vala_ccode_identifier_new (_tmp493_); + _tmp495_ = _tmp494_; + _tmp496_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp495_, "_ref_count_"); + _tmp497_ = _tmp496_; + _tmp498_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_ADDRESS_OF, (ValaCCodeExpression*) _tmp497_); + _tmp499_ = _tmp498_; + vala_ccode_function_call_add_argument (_tmp490_, (ValaCCodeExpression*) _tmp499_); + _vala_ccode_node_unref0 (_tmp499_); + _vala_ccode_node_unref0 (_tmp497_); + _vala_ccode_node_unref0 (_tmp495_); + _g_free0 (_tmp493_); + _tmp500_ = vala_ccode_base_module_get_ccode (self); + _tmp501_ = _tmp500_; + _tmp502_ = ccall; + vala_ccode_function_open_if (_tmp501_, (ValaCCodeExpression*) _tmp502_); + _tmp503_ = block_id; + _tmp504_ = g_strdup_printf ("_data%d_", _tmp503_); + _tmp505_ = _tmp504_; + _tmp506_ = vala_ccode_identifier_new (_tmp505_); + _tmp507_ = (ValaCCodeExpression*) _tmp506_; + _g_free0 (_tmp505_); + outer_block = _tmp507_; + _tmp508_ = b; + parent_closure_block = _tmp508_; while (TRUE) { - ValaBlock* _tmp498_; - ValaSymbol* _tmp499_; - ValaSymbol* _tmp500_; - ValaBlock* _tmp501_ = NULL; - ValaBlock* _tmp502_; - ValaBlock* _tmp503_; - gint _tmp504_ = 0; + ValaBlock* _tmp509_; + ValaSymbol* _tmp510_; + ValaSymbol* _tmp511_; + ValaBlock* _tmp512_ = NULL; + ValaBlock* _tmp513_; + ValaBlock* _tmp514_; + gint _tmp515_ = 0; gint parent_block_id; - ValaCCodeExpression* _tmp505_; - gint _tmp506_; - gchar* _tmp507_ = NULL; - gchar* _tmp508_; - ValaCCodeMemberAccess* _tmp509_; - _tmp498_ = parent_closure_block; - _tmp499_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp498_); - _tmp500_ = _tmp499_; - _tmp501_ = vala_ccode_base_module_next_closure_block (self, _tmp500_); - parent_closure_block = _tmp501_; - _tmp502_ = parent_closure_block; - if (_tmp502_ == NULL) { + ValaCCodeExpression* _tmp516_; + gint _tmp517_; + gchar* _tmp518_ = NULL; + gchar* _tmp519_; + ValaCCodeMemberAccess* _tmp520_; + _tmp509_ = parent_closure_block; + _tmp510_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp509_); + _tmp511_ = _tmp510_; + _tmp512_ = vala_ccode_base_module_next_closure_block (self, _tmp511_); + parent_closure_block = _tmp512_; + _tmp513_ = parent_closure_block; + if (_tmp513_ == NULL) { break; } - _tmp503_ = parent_closure_block; - _tmp504_ = vala_ccode_base_module_get_block_id (self, _tmp503_); - parent_block_id = _tmp504_; - _tmp505_ = outer_block; - _tmp506_ = parent_block_id; - _tmp507_ = g_strdup_printf ("_data%d_", _tmp506_); - _tmp508_ = _tmp507_; - _tmp509_ = vala_ccode_member_access_new_pointer (_tmp505_, _tmp508_); + _tmp514_ = parent_closure_block; + _tmp515_ = vala_ccode_base_module_get_block_id (self, _tmp514_); + parent_block_id = _tmp515_; + _tmp516_ = outer_block; + _tmp517_ = parent_block_id; + _tmp518_ = g_strdup_printf ("_data%d_", _tmp517_); + _tmp519_ = _tmp518_; + _tmp520_ = vala_ccode_member_access_new_pointer (_tmp516_, _tmp519_); _vala_ccode_node_unref0 (outer_block); - outer_block = (ValaCCodeExpression*) _tmp509_; - _g_free0 (_tmp508_); + outer_block = (ValaCCodeExpression*) _tmp520_; + _g_free0 (_tmp519_); } - _tmp510_ = vala_ccode_base_module_get_this_type (self); - _tmp511_ = _tmp510_; - _tmp512_ = _tmp511_ != NULL; - _vala_code_node_unref0 (_tmp511_); - if (_tmp512_) { - ValaCCodeFunction* _tmp513_; - ValaCCodeFunction* _tmp514_; - ValaTypeSymbol* _tmp515_; - ValaTypeSymbol* _tmp516_; - gchar* _tmp517_ = NULL; - gchar* _tmp518_; - gchar* _tmp519_ = NULL; - gchar* _tmp520_; - ValaCCodeVariableDeclarator* _tmp521_; - ValaCCodeVariableDeclarator* _tmp522_; - ValaCCodeFunction* _tmp523_; + _tmp521_ = vala_ccode_base_module_get_this_type (self); + _tmp522_ = _tmp521_; + _tmp523_ = _tmp522_ != NULL; + _vala_code_node_unref0 (_tmp522_); + if (_tmp523_) { ValaCCodeFunction* _tmp524_; - ValaCCodeIdentifier* _tmp525_; - ValaCCodeIdentifier* _tmp526_; - ValaCCodeExpression* _tmp527_; - ValaCCodeMemberAccess* _tmp528_; - ValaCCodeMemberAccess* _tmp529_; - _tmp513_ = vala_ccode_base_module_get_ccode (self); - _tmp514_ = _tmp513_; - _tmp515_ = vala_ccode_base_module_get_current_type_symbol (self); - _tmp516_ = _tmp515_; - _tmp517_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp516_); - _tmp518_ = _tmp517_; - _tmp519_ = g_strdup_printf ("%s *", _tmp518_); - _tmp520_ = _tmp519_; - _tmp521_ = vala_ccode_variable_declarator_new ("self", NULL, NULL); - _tmp522_ = _tmp521_; - vala_ccode_function_add_declaration (_tmp514_, _tmp520_, (ValaCCodeDeclarator*) _tmp522_, 0); - _vala_ccode_node_unref0 (_tmp522_); - _g_free0 (_tmp520_); - _g_free0 (_tmp518_); - _tmp523_ = vala_ccode_base_module_get_ccode (self); - _tmp524_ = _tmp523_; - _tmp525_ = vala_ccode_identifier_new ("self"); - _tmp526_ = _tmp525_; - _tmp527_ = outer_block; - _tmp528_ = vala_ccode_member_access_new_pointer (_tmp527_, "self"); + ValaCCodeFunction* _tmp525_; + ValaTypeSymbol* _tmp526_; + ValaTypeSymbol* _tmp527_; + gchar* _tmp528_ = NULL; + gchar* _tmp529_; + gchar* _tmp530_ = NULL; + gchar* _tmp531_; + ValaCCodeVariableDeclarator* _tmp532_; + ValaCCodeVariableDeclarator* _tmp533_; + ValaCCodeFunction* _tmp534_; + ValaCCodeFunction* _tmp535_; + ValaCCodeIdentifier* _tmp536_; + ValaCCodeIdentifier* _tmp537_; + ValaCCodeExpression* _tmp538_; + ValaCCodeMemberAccess* _tmp539_; + ValaCCodeMemberAccess* _tmp540_; + _tmp524_ = vala_ccode_base_module_get_ccode (self); + _tmp525_ = _tmp524_; + _tmp526_ = vala_ccode_base_module_get_current_type_symbol (self); + _tmp527_ = _tmp526_; + _tmp528_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp527_); _tmp529_ = _tmp528_; - vala_ccode_function_add_assignment (_tmp524_, (ValaCCodeExpression*) _tmp526_, (ValaCCodeExpression*) _tmp529_); - _vala_ccode_node_unref0 (_tmp529_); - _vala_ccode_node_unref0 (_tmp526_); - } - _tmp530_ = vala_ccode_base_module_get_current_method (self); - _tmp531_ = _tmp530_; - if (_tmp531_ != NULL) { + _tmp530_ = g_strdup_printf ("%s *", _tmp529_); + _tmp531_ = _tmp530_; + _tmp532_ = vala_ccode_variable_declarator_new ("self", NULL, NULL); + _tmp533_ = _tmp532_; + vala_ccode_function_add_declaration (_tmp525_, _tmp531_, (ValaCCodeDeclarator*) _tmp533_, 0); + _vala_ccode_node_unref0 (_tmp533_); + _g_free0 (_tmp531_); + _g_free0 (_tmp529_); + _tmp534_ = vala_ccode_base_module_get_ccode (self); + _tmp535_ = _tmp534_; + _tmp536_ = vala_ccode_identifier_new ("self"); + _tmp537_ = _tmp536_; + _tmp538_ = outer_block; + _tmp539_ = vala_ccode_member_access_new_pointer (_tmp538_, "self"); + _tmp540_ = _tmp539_; + vala_ccode_function_add_assignment (_tmp535_, (ValaCCodeExpression*) _tmp537_, (ValaCCodeExpression*) _tmp540_); + _vala_ccode_node_unref0 (_tmp540_); + _vala_ccode_node_unref0 (_tmp537_); + } + _tmp541_ = vala_ccode_base_module_get_current_method (self); + _tmp542_ = _tmp541_; + if (_tmp542_ != NULL) { { - ValaMethod* _tmp532_; - ValaMethod* _tmp533_; - ValaList* _tmp534_ = NULL; + ValaMethod* _tmp543_; + ValaMethod* _tmp544_; + ValaList* _tmp545_ = NULL; ValaList* _type_param_list; - ValaList* _tmp535_; - gint _tmp536_; - gint _tmp537_; + ValaList* _tmp546_; + gint _tmp547_; + gint _tmp548_; gint _type_param_size; gint _type_param_index; - _tmp532_ = vala_ccode_base_module_get_current_method (self); - _tmp533_ = _tmp532_; - _tmp534_ = vala_method_get_type_parameters (_tmp533_); - _type_param_list = _tmp534_; - _tmp535_ = _type_param_list; - _tmp536_ = vala_collection_get_size ((ValaCollection*) _tmp535_); - _tmp537_ = _tmp536_; - _type_param_size = _tmp537_; + _tmp543_ = vala_ccode_base_module_get_current_method (self); + _tmp544_ = _tmp543_; + _tmp545_ = vala_method_get_type_parameters (_tmp544_); + _type_param_list = _tmp545_; + _tmp546_ = _type_param_list; + _tmp547_ = vala_collection_get_size ((ValaCollection*) _tmp546_); + _tmp548_ = _tmp547_; + _type_param_size = _tmp548_; _type_param_index = -1; while (TRUE) { - gint _tmp538_; - gint _tmp539_; - gint _tmp540_; - ValaList* _tmp541_; - gint _tmp542_; - gpointer _tmp543_ = NULL; + gint _tmp549_; + gint _tmp550_; + gint _tmp551_; + ValaList* _tmp552_; + gint _tmp553_; + gpointer _tmp554_ = NULL; ValaTypeParameter* type_param; gchar* func_name = NULL; - ValaTypeParameter* _tmp544_; - const gchar* _tmp545_; - const gchar* _tmp546_; - gchar* _tmp547_ = NULL; - gchar* _tmp548_; - gchar* _tmp549_ = NULL; - ValaCCodeFunction* _tmp550_; - ValaCCodeFunction* _tmp551_; - const gchar* _tmp552_; - ValaCCodeVariableDeclarator* _tmp553_; - ValaCCodeVariableDeclarator* _tmp554_; - ValaCCodeFunction* _tmp555_; - ValaCCodeFunction* _tmp556_; + ValaTypeParameter* _tmp555_; + const gchar* _tmp556_; const gchar* _tmp557_; - ValaCCodeIdentifier* _tmp558_; - ValaCCodeIdentifier* _tmp559_; - ValaCCodeExpression* _tmp560_; - const gchar* _tmp561_; - ValaCCodeMemberAccess* _tmp562_; - ValaCCodeMemberAccess* _tmp563_; - ValaTypeParameter* _tmp564_; - const gchar* _tmp565_; - const gchar* _tmp566_; - gchar* _tmp567_ = NULL; - gchar* _tmp568_; - gchar* _tmp569_ = NULL; - ValaCCodeFunction* _tmp570_; - ValaCCodeFunction* _tmp571_; + gchar* _tmp558_ = NULL; + gchar* _tmp559_; + gchar* _tmp560_ = NULL; + ValaCCodeFunction* _tmp561_; + ValaCCodeFunction* _tmp562_; + const gchar* _tmp563_; + ValaCCodeVariableDeclarator* _tmp564_; + ValaCCodeVariableDeclarator* _tmp565_; + ValaCCodeFunction* _tmp566_; + ValaCCodeFunction* _tmp567_; + const gchar* _tmp568_; + ValaCCodeIdentifier* _tmp569_; + ValaCCodeIdentifier* _tmp570_; + ValaCCodeExpression* _tmp571_; const gchar* _tmp572_; - ValaCCodeVariableDeclarator* _tmp573_; - ValaCCodeVariableDeclarator* _tmp574_; - ValaCCodeFunction* _tmp575_; - ValaCCodeFunction* _tmp576_; + ValaCCodeMemberAccess* _tmp573_; + ValaCCodeMemberAccess* _tmp574_; + ValaTypeParameter* _tmp575_; + const gchar* _tmp576_; const gchar* _tmp577_; - ValaCCodeIdentifier* _tmp578_; - ValaCCodeIdentifier* _tmp579_; - ValaCCodeExpression* _tmp580_; - const gchar* _tmp581_; - ValaCCodeMemberAccess* _tmp582_; - ValaCCodeMemberAccess* _tmp583_; - ValaTypeParameter* _tmp584_; - const gchar* _tmp585_; - const gchar* _tmp586_; - gchar* _tmp587_ = NULL; - gchar* _tmp588_; - gchar* _tmp589_ = NULL; - ValaCCodeFunction* _tmp590_; - ValaCCodeFunction* _tmp591_; + gchar* _tmp578_ = NULL; + gchar* _tmp579_; + gchar* _tmp580_ = NULL; + ValaCCodeFunction* _tmp581_; + ValaCCodeFunction* _tmp582_; + const gchar* _tmp583_; + ValaCCodeVariableDeclarator* _tmp584_; + ValaCCodeVariableDeclarator* _tmp585_; + ValaCCodeFunction* _tmp586_; + ValaCCodeFunction* _tmp587_; + const gchar* _tmp588_; + ValaCCodeIdentifier* _tmp589_; + ValaCCodeIdentifier* _tmp590_; + ValaCCodeExpression* _tmp591_; const gchar* _tmp592_; - ValaCCodeVariableDeclarator* _tmp593_; - ValaCCodeVariableDeclarator* _tmp594_; - ValaCCodeFunction* _tmp595_; - ValaCCodeFunction* _tmp596_; + ValaCCodeMemberAccess* _tmp593_; + ValaCCodeMemberAccess* _tmp594_; + ValaTypeParameter* _tmp595_; + const gchar* _tmp596_; const gchar* _tmp597_; - ValaCCodeIdentifier* _tmp598_; - ValaCCodeIdentifier* _tmp599_; - ValaCCodeExpression* _tmp600_; - const gchar* _tmp601_; - ValaCCodeMemberAccess* _tmp602_; - ValaCCodeMemberAccess* _tmp603_; - _tmp538_ = _type_param_index; - _type_param_index = _tmp538_ + 1; - _tmp539_ = _type_param_index; - _tmp540_ = _type_param_size; - if (!(_tmp539_ < _tmp540_)) { + gchar* _tmp598_ = NULL; + gchar* _tmp599_; + gchar* _tmp600_ = NULL; + ValaCCodeFunction* _tmp601_; + ValaCCodeFunction* _tmp602_; + const gchar* _tmp603_; + ValaCCodeVariableDeclarator* _tmp604_; + ValaCCodeVariableDeclarator* _tmp605_; + ValaCCodeFunction* _tmp606_; + ValaCCodeFunction* _tmp607_; + const gchar* _tmp608_; + ValaCCodeIdentifier* _tmp609_; + ValaCCodeIdentifier* _tmp610_; + ValaCCodeExpression* _tmp611_; + const gchar* _tmp612_; + ValaCCodeMemberAccess* _tmp613_; + ValaCCodeMemberAccess* _tmp614_; + _tmp549_ = _type_param_index; + _type_param_index = _tmp549_ + 1; + _tmp550_ = _type_param_index; + _tmp551_ = _type_param_size; + if (!(_tmp550_ < _tmp551_)) { break; } - _tmp541_ = _type_param_list; - _tmp542_ = _type_param_index; - _tmp543_ = vala_list_get (_tmp541_, _tmp542_); - type_param = (ValaTypeParameter*) _tmp543_; - _tmp544_ = type_param; - _tmp545_ = vala_symbol_get_name ((ValaSymbol*) _tmp544_); - _tmp546_ = _tmp545_; - _tmp547_ = g_utf8_strdown (_tmp546_, (gssize) (-1)); - _tmp548_ = _tmp547_; - _tmp549_ = g_strdup_printf ("%s_type", _tmp548_); - _g_free0 (func_name); - func_name = _tmp549_; - _g_free0 (_tmp548_); - _tmp550_ = vala_ccode_base_module_get_ccode (self); - _tmp551_ = _tmp550_; - _tmp552_ = func_name; - _tmp553_ = vala_ccode_variable_declarator_new (_tmp552_, NULL, NULL); - _tmp554_ = _tmp553_; - vala_ccode_function_add_declaration (_tmp551_, "GType", (ValaCCodeDeclarator*) _tmp554_, 0); - _vala_ccode_node_unref0 (_tmp554_); - _tmp555_ = vala_ccode_base_module_get_ccode (self); - _tmp556_ = _tmp555_; - _tmp557_ = func_name; - _tmp558_ = vala_ccode_identifier_new (_tmp557_); + _tmp552_ = _type_param_list; + _tmp553_ = _type_param_index; + _tmp554_ = vala_list_get (_tmp552_, _tmp553_); + type_param = (ValaTypeParameter*) _tmp554_; + _tmp555_ = type_param; + _tmp556_ = vala_symbol_get_name ((ValaSymbol*) _tmp555_); + _tmp557_ = _tmp556_; + _tmp558_ = g_utf8_strdown (_tmp557_, (gssize) (-1)); _tmp559_ = _tmp558_; - _tmp560_ = outer_block; - _tmp561_ = func_name; - _tmp562_ = vala_ccode_member_access_new_pointer (_tmp560_, _tmp561_); - _tmp563_ = _tmp562_; - vala_ccode_function_add_assignment (_tmp556_, (ValaCCodeExpression*) _tmp559_, (ValaCCodeExpression*) _tmp563_); - _vala_ccode_node_unref0 (_tmp563_); - _vala_ccode_node_unref0 (_tmp559_); - _tmp564_ = type_param; - _tmp565_ = vala_symbol_get_name ((ValaSymbol*) _tmp564_); - _tmp566_ = _tmp565_; - _tmp567_ = g_utf8_strdown (_tmp566_, (gssize) (-1)); - _tmp568_ = _tmp567_; - _tmp569_ = g_strdup_printf ("%s_dup_func", _tmp568_); + _tmp560_ = g_strdup_printf ("%s_type", _tmp559_); _g_free0 (func_name); - func_name = _tmp569_; - _g_free0 (_tmp568_); - _tmp570_ = vala_ccode_base_module_get_ccode (self); - _tmp571_ = _tmp570_; + func_name = _tmp560_; + _g_free0 (_tmp559_); + _tmp561_ = vala_ccode_base_module_get_ccode (self); + _tmp562_ = _tmp561_; + _tmp563_ = func_name; + _tmp564_ = vala_ccode_variable_declarator_new (_tmp563_, NULL, NULL); + _tmp565_ = _tmp564_; + vala_ccode_function_add_declaration (_tmp562_, "GType", (ValaCCodeDeclarator*) _tmp565_, 0); + _vala_ccode_node_unref0 (_tmp565_); + _tmp566_ = vala_ccode_base_module_get_ccode (self); + _tmp567_ = _tmp566_; + _tmp568_ = func_name; + _tmp569_ = vala_ccode_identifier_new (_tmp568_); + _tmp570_ = _tmp569_; + _tmp571_ = outer_block; _tmp572_ = func_name; - _tmp573_ = vala_ccode_variable_declarator_new (_tmp572_, NULL, NULL); + _tmp573_ = vala_ccode_member_access_new_pointer (_tmp571_, _tmp572_); _tmp574_ = _tmp573_; - vala_ccode_function_add_declaration (_tmp571_, "GBoxedCopyFunc", (ValaCCodeDeclarator*) _tmp574_, 0); + vala_ccode_function_add_assignment (_tmp567_, (ValaCCodeExpression*) _tmp570_, (ValaCCodeExpression*) _tmp574_); _vala_ccode_node_unref0 (_tmp574_); - _tmp575_ = vala_ccode_base_module_get_ccode (self); - _tmp576_ = _tmp575_; - _tmp577_ = func_name; - _tmp578_ = vala_ccode_identifier_new (_tmp577_); + _vala_ccode_node_unref0 (_tmp570_); + _tmp575_ = type_param; + _tmp576_ = vala_symbol_get_name ((ValaSymbol*) _tmp575_); + _tmp577_ = _tmp576_; + _tmp578_ = g_utf8_strdown (_tmp577_, (gssize) (-1)); _tmp579_ = _tmp578_; - _tmp580_ = outer_block; - _tmp581_ = func_name; - _tmp582_ = vala_ccode_member_access_new_pointer (_tmp580_, _tmp581_); - _tmp583_ = _tmp582_; - vala_ccode_function_add_assignment (_tmp576_, (ValaCCodeExpression*) _tmp579_, (ValaCCodeExpression*) _tmp583_); - _vala_ccode_node_unref0 (_tmp583_); - _vala_ccode_node_unref0 (_tmp579_); - _tmp584_ = type_param; - _tmp585_ = vala_symbol_get_name ((ValaSymbol*) _tmp584_); - _tmp586_ = _tmp585_; - _tmp587_ = g_utf8_strdown (_tmp586_, (gssize) (-1)); - _tmp588_ = _tmp587_; - _tmp589_ = g_strdup_printf ("%s_destroy_func", _tmp588_); + _tmp580_ = g_strdup_printf ("%s_dup_func", _tmp579_); _g_free0 (func_name); - func_name = _tmp589_; - _g_free0 (_tmp588_); - _tmp590_ = vala_ccode_base_module_get_ccode (self); - _tmp591_ = _tmp590_; + func_name = _tmp580_; + _g_free0 (_tmp579_); + _tmp581_ = vala_ccode_base_module_get_ccode (self); + _tmp582_ = _tmp581_; + _tmp583_ = func_name; + _tmp584_ = vala_ccode_variable_declarator_new (_tmp583_, NULL, NULL); + _tmp585_ = _tmp584_; + vala_ccode_function_add_declaration (_tmp582_, "GBoxedCopyFunc", (ValaCCodeDeclarator*) _tmp585_, 0); + _vala_ccode_node_unref0 (_tmp585_); + _tmp586_ = vala_ccode_base_module_get_ccode (self); + _tmp587_ = _tmp586_; + _tmp588_ = func_name; + _tmp589_ = vala_ccode_identifier_new (_tmp588_); + _tmp590_ = _tmp589_; + _tmp591_ = outer_block; _tmp592_ = func_name; - _tmp593_ = vala_ccode_variable_declarator_new (_tmp592_, NULL, NULL); + _tmp593_ = vala_ccode_member_access_new_pointer (_tmp591_, _tmp592_); _tmp594_ = _tmp593_; - vala_ccode_function_add_declaration (_tmp591_, "GDestroyNotify", (ValaCCodeDeclarator*) _tmp594_, 0); + vala_ccode_function_add_assignment (_tmp587_, (ValaCCodeExpression*) _tmp590_, (ValaCCodeExpression*) _tmp594_); _vala_ccode_node_unref0 (_tmp594_); - _tmp595_ = vala_ccode_base_module_get_ccode (self); - _tmp596_ = _tmp595_; - _tmp597_ = func_name; - _tmp598_ = vala_ccode_identifier_new (_tmp597_); + _vala_ccode_node_unref0 (_tmp590_); + _tmp595_ = type_param; + _tmp596_ = vala_symbol_get_name ((ValaSymbol*) _tmp595_); + _tmp597_ = _tmp596_; + _tmp598_ = g_utf8_strdown (_tmp597_, (gssize) (-1)); _tmp599_ = _tmp598_; - _tmp600_ = outer_block; - _tmp601_ = func_name; - _tmp602_ = vala_ccode_member_access_new_pointer (_tmp600_, _tmp601_); - _tmp603_ = _tmp602_; - vala_ccode_function_add_assignment (_tmp596_, (ValaCCodeExpression*) _tmp599_, (ValaCCodeExpression*) _tmp603_); - _vala_ccode_node_unref0 (_tmp603_); - _vala_ccode_node_unref0 (_tmp599_); + _tmp600_ = g_strdup_printf ("%s_destroy_func", _tmp599_); + _g_free0 (func_name); + func_name = _tmp600_; + _g_free0 (_tmp599_); + _tmp601_ = vala_ccode_base_module_get_ccode (self); + _tmp602_ = _tmp601_; + _tmp603_ = func_name; + _tmp604_ = vala_ccode_variable_declarator_new (_tmp603_, NULL, NULL); + _tmp605_ = _tmp604_; + vala_ccode_function_add_declaration (_tmp602_, "GDestroyNotify", (ValaCCodeDeclarator*) _tmp605_, 0); + _vala_ccode_node_unref0 (_tmp605_); + _tmp606_ = vala_ccode_base_module_get_ccode (self); + _tmp607_ = _tmp606_; + _tmp608_ = func_name; + _tmp609_ = vala_ccode_identifier_new (_tmp608_); + _tmp610_ = _tmp609_; + _tmp611_ = outer_block; + _tmp612_ = func_name; + _tmp613_ = vala_ccode_member_access_new_pointer (_tmp611_, _tmp612_); + _tmp614_ = _tmp613_; + vala_ccode_function_add_assignment (_tmp607_, (ValaCCodeExpression*) _tmp610_, (ValaCCodeExpression*) _tmp614_); + _vala_ccode_node_unref0 (_tmp614_); + _vala_ccode_node_unref0 (_tmp610_); _g_free0 (func_name); _vala_code_node_unref0 (type_param); } @@ -11478,97 +11488,97 @@ } } { - ValaList* _tmp604_; - gint _tmp605_; - gint _tmp606_; + ValaList* _tmp615_; + gint _tmp616_; + gint _tmp617_; gint i; - _tmp604_ = local_vars; - _tmp605_ = vala_collection_get_size ((ValaCollection*) _tmp604_); - _tmp606_ = _tmp605_; - i = _tmp606_ - 1; + _tmp615_ = local_vars; + _tmp616_ = vala_collection_get_size ((ValaCollection*) _tmp615_); + _tmp617_ = _tmp616_; + i = _tmp617_ - 1; { - gboolean _tmp607_; - _tmp607_ = TRUE; + gboolean _tmp618_; + _tmp618_ = TRUE; while (TRUE) { - gboolean _tmp608_; - gint _tmp610_; - ValaList* _tmp611_; - gint _tmp612_; - gpointer _tmp613_ = NULL; + gboolean _tmp619_; + gint _tmp621_; + ValaList* _tmp622_; + gint _tmp623_; + gpointer _tmp624_ = NULL; ValaLocalVariable* local; - ValaLocalVariable* _tmp614_; - gboolean _tmp615_; - gboolean _tmp616_; - _tmp608_ = _tmp607_; - if (!_tmp608_) { - gint _tmp609_; - _tmp609_ = i; - i = _tmp609_ - 1; - } - _tmp607_ = FALSE; - _tmp610_ = i; - if (!(_tmp610_ >= 0)) { + ValaLocalVariable* _tmp625_; + gboolean _tmp626_; + gboolean _tmp627_; + _tmp619_ = _tmp618_; + if (!_tmp619_) { + gint _tmp620_; + _tmp620_ = i; + i = _tmp620_ - 1; + } + _tmp618_ = FALSE; + _tmp621_ = i; + if (!(_tmp621_ >= 0)) { break; } - _tmp611_ = local_vars; - _tmp612_ = i; - _tmp613_ = vala_list_get (_tmp611_, _tmp612_); - local = (ValaLocalVariable*) _tmp613_; - _tmp614_ = local; - _tmp615_ = vala_local_variable_get_captured (_tmp614_); - _tmp616_ = _tmp615_; - if (_tmp616_) { - ValaLocalVariable* _tmp617_; - ValaDataType* _tmp618_; - ValaDataType* _tmp619_; - gboolean _tmp620_ = FALSE; - _tmp617_ = local; - _tmp618_ = vala_variable_get_variable_type ((ValaVariable*) _tmp617_); - _tmp619_ = _tmp618_; - _tmp620_ = vala_ccode_base_module_requires_destroy (self, _tmp619_); - if (_tmp620_) { + _tmp622_ = local_vars; + _tmp623_ = i; + _tmp624_ = vala_list_get (_tmp622_, _tmp623_); + local = (ValaLocalVariable*) _tmp624_; + _tmp625_ = local; + _tmp626_ = vala_local_variable_get_captured (_tmp625_); + _tmp627_ = _tmp626_; + if (_tmp627_) { + ValaLocalVariable* _tmp628_; + ValaDataType* _tmp629_; + ValaDataType* _tmp630_; + gboolean _tmp631_ = FALSE; + _tmp628_ = local; + _tmp629_ = vala_variable_get_variable_type ((ValaVariable*) _tmp628_); + _tmp630_ = _tmp629_; + _tmp631_ = vala_ccode_base_module_requires_destroy (self, _tmp630_); + if (_tmp631_) { gboolean old_coroutine; - ValaMethod* _tmp621_; - ValaMethod* _tmp622_; - ValaCCodeFunction* _tmp629_; - ValaCCodeFunction* _tmp630_; - ValaLocalVariable* _tmp631_; - ValaCCodeExpression* _tmp632_ = NULL; - ValaCCodeExpression* _tmp633_; - gboolean _tmp634_; + ValaMethod* _tmp632_; + ValaMethod* _tmp633_; + ValaCCodeFunction* _tmp640_; + ValaCCodeFunction* _tmp641_; + ValaLocalVariable* _tmp642_; + ValaCCodeExpression* _tmp643_ = NULL; + ValaCCodeExpression* _tmp644_; + gboolean _tmp645_; old_coroutine = FALSE; - _tmp621_ = vala_ccode_base_module_get_current_method (self); - _tmp622_ = _tmp621_; - if (_tmp622_ != NULL) { - ValaMethod* _tmp623_; - ValaMethod* _tmp624_; - gboolean _tmp625_; - gboolean _tmp626_; - ValaMethod* _tmp627_; - ValaMethod* _tmp628_; - _tmp623_ = vala_ccode_base_module_get_current_method (self); - _tmp624_ = _tmp623_; - _tmp625_ = vala_method_get_coroutine (_tmp624_); - _tmp626_ = _tmp625_; - old_coroutine = _tmp626_; - _tmp627_ = vala_ccode_base_module_get_current_method (self); - _tmp628_ = _tmp627_; - vala_method_set_coroutine (_tmp628_, FALSE); - } - _tmp629_ = vala_ccode_base_module_get_ccode (self); - _tmp630_ = _tmp629_; - _tmp631_ = local; - _tmp632_ = vala_ccode_base_module_destroy_local (self, _tmp631_); + _tmp632_ = vala_ccode_base_module_get_current_method (self); _tmp633_ = _tmp632_; - vala_ccode_function_add_expression (_tmp630_, _tmp633_); - _vala_ccode_node_unref0 (_tmp633_); - _tmp634_ = old_coroutine; - if (_tmp634_) { + if (_tmp633_ != NULL) { + ValaMethod* _tmp634_; ValaMethod* _tmp635_; - ValaMethod* _tmp636_; - _tmp635_ = vala_ccode_base_module_get_current_method (self); - _tmp636_ = _tmp635_; - vala_method_set_coroutine (_tmp636_, TRUE); + gboolean _tmp636_; + gboolean _tmp637_; + ValaMethod* _tmp638_; + ValaMethod* _tmp639_; + _tmp634_ = vala_ccode_base_module_get_current_method (self); + _tmp635_ = _tmp634_; + _tmp636_ = vala_method_get_coroutine (_tmp635_); + _tmp637_ = _tmp636_; + old_coroutine = _tmp637_; + _tmp638_ = vala_ccode_base_module_get_current_method (self); + _tmp639_ = _tmp638_; + vala_method_set_coroutine (_tmp639_, FALSE); + } + _tmp640_ = vala_ccode_base_module_get_ccode (self); + _tmp641_ = _tmp640_; + _tmp642_ = local; + _tmp643_ = vala_ccode_base_module_destroy_local (self, _tmp642_); + _tmp644_ = _tmp643_; + vala_ccode_function_add_expression (_tmp641_, _tmp644_); + _vala_ccode_node_unref0 (_tmp644_); + _tmp645_ = old_coroutine; + if (_tmp645_) { + ValaMethod* _tmp646_; + ValaMethod* _tmp647_; + _tmp646_ = vala_ccode_base_module_get_current_method (self); + _tmp647_ = _tmp646_; + vala_method_set_coroutine (_tmp647_, TRUE); } } } @@ -11576,127 +11586,127 @@ } } } - _tmp637_ = b; - _tmp638_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp637_); - _tmp639_ = _tmp638_; - if (VALA_IS_METHOD (_tmp639_)) { - ValaBlock* _tmp640_; - ValaSymbol* _tmp641_; - ValaSymbol* _tmp642_; - ValaMethod* _tmp643_; + _tmp648_ = b; + _tmp649_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp648_); + _tmp650_ = _tmp649_; + if (VALA_IS_METHOD (_tmp650_)) { + ValaBlock* _tmp651_; + ValaSymbol* _tmp652_; + ValaSymbol* _tmp653_; + ValaMethod* _tmp654_; ValaMethod* m; - _tmp640_ = b; - _tmp641_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp640_); - _tmp642_ = _tmp641_; - _tmp643_ = _vala_code_node_ref0 (VALA_METHOD (_tmp642_)); - m = _tmp643_; + _tmp651_ = b; + _tmp652_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp651_); + _tmp653_ = _tmp652_; + _tmp654_ = _vala_code_node_ref0 (VALA_METHOD (_tmp653_)); + m = _tmp654_; { - ValaMethod* _tmp644_; - ValaList* _tmp645_ = NULL; + ValaMethod* _tmp655_; + ValaList* _tmp656_ = NULL; ValaList* _param_list; - ValaList* _tmp646_; - gint _tmp647_; - gint _tmp648_; + ValaList* _tmp657_; + gint _tmp658_; + gint _tmp659_; gint _param_size; gint _param_index; - _tmp644_ = m; - _tmp645_ = vala_method_get_parameters (_tmp644_); - _param_list = _tmp645_; - _tmp646_ = _param_list; - _tmp647_ = vala_collection_get_size ((ValaCollection*) _tmp646_); - _tmp648_ = _tmp647_; - _param_size = _tmp648_; + _tmp655_ = m; + _tmp656_ = vala_method_get_parameters (_tmp655_); + _param_list = _tmp656_; + _tmp657_ = _param_list; + _tmp658_ = vala_collection_get_size ((ValaCollection*) _tmp657_); + _tmp659_ = _tmp658_; + _param_size = _tmp659_; _param_index = -1; while (TRUE) { - gint _tmp649_; - gint _tmp650_; - gint _tmp651_; - ValaList* _tmp652_; - gint _tmp653_; - gpointer _tmp654_ = NULL; + gint _tmp660_; + gint _tmp661_; + gint _tmp662_; + ValaList* _tmp663_; + gint _tmp664_; + gpointer _tmp665_ = NULL; ValaParameter* param; - ValaParameter* _tmp655_; - gboolean _tmp656_; - gboolean _tmp657_; - _tmp649_ = _param_index; - _param_index = _tmp649_ + 1; - _tmp650_ = _param_index; - _tmp651_ = _param_size; - if (!(_tmp650_ < _tmp651_)) { + ValaParameter* _tmp666_; + gboolean _tmp667_; + gboolean _tmp668_; + _tmp660_ = _param_index; + _param_index = _tmp660_ + 1; + _tmp661_ = _param_index; + _tmp662_ = _param_size; + if (!(_tmp661_ < _tmp662_)) { break; } - _tmp652_ = _param_list; - _tmp653_ = _param_index; - _tmp654_ = vala_list_get (_tmp652_, _tmp653_); - param = (ValaParameter*) _tmp654_; - _tmp655_ = param; - _tmp656_ = vala_parameter_get_captured (_tmp655_); - _tmp657_ = _tmp656_; - if (_tmp657_) { - ValaParameter* _tmp658_; - ValaDataType* _tmp659_; - ValaDataType* _tmp660_; - ValaDataType* _tmp661_ = NULL; + _tmp663_ = _param_list; + _tmp664_ = _param_index; + _tmp665_ = vala_list_get (_tmp663_, _tmp664_); + param = (ValaParameter*) _tmp665_; + _tmp666_ = param; + _tmp667_ = vala_parameter_get_captured (_tmp666_); + _tmp668_ = _tmp667_; + if (_tmp668_) { + ValaParameter* _tmp669_; + ValaDataType* _tmp670_; + ValaDataType* _tmp671_; + ValaDataType* _tmp672_ = NULL; ValaDataType* param_type; - ValaDataType* _tmp662_; - gboolean _tmp663_; - gboolean _tmp664_; - ValaDataType* _tmp668_; - gboolean _tmp669_ = FALSE; - _tmp658_ = param; - _tmp659_ = vala_variable_get_variable_type ((ValaVariable*) _tmp658_); - _tmp660_ = _tmp659_; - _tmp661_ = vala_data_type_copy (_tmp660_); - param_type = _tmp661_; - _tmp662_ = param_type; - _tmp663_ = vala_data_type_get_value_owned (_tmp662_); - _tmp664_ = _tmp663_; - if (!_tmp664_) { - ValaDataType* _tmp665_; - ValaDataType* _tmp666_; - gboolean _tmp667_ = FALSE; - _tmp665_ = param_type; - _tmp666_ = param_type; - _tmp667_ = vala_ccode_base_module_no_implicit_copy (self, _tmp666_); - vala_data_type_set_value_owned (_tmp665_, !_tmp667_); + ValaDataType* _tmp673_; + gboolean _tmp674_; + gboolean _tmp675_; + ValaDataType* _tmp679_; + gboolean _tmp680_ = FALSE; + _tmp669_ = param; + _tmp670_ = vala_variable_get_variable_type ((ValaVariable*) _tmp669_); + _tmp671_ = _tmp670_; + _tmp672_ = vala_data_type_copy (_tmp671_); + param_type = _tmp672_; + _tmp673_ = param_type; + _tmp674_ = vala_data_type_get_value_owned (_tmp673_); + _tmp675_ = _tmp674_; + if (!_tmp675_) { + ValaDataType* _tmp676_; + ValaDataType* _tmp677_; + gboolean _tmp678_ = FALSE; + _tmp676_ = param_type; + _tmp677_ = param_type; + _tmp678_ = vala_ccode_base_module_no_implicit_copy (self, _tmp677_); + vala_data_type_set_value_owned (_tmp676_, !_tmp678_); } - _tmp668_ = param_type; - _tmp669_ = vala_ccode_base_module_requires_destroy (self, _tmp668_); - if (_tmp669_) { + _tmp679_ = param_type; + _tmp680_ = vala_ccode_base_module_requires_destroy (self, _tmp679_); + if (_tmp680_) { gboolean old_coroutine; - ValaMethod* _tmp670_; - ValaCCodeFunction* _tmp675_; - ValaCCodeFunction* _tmp676_; - ValaParameter* _tmp677_; - ValaCCodeExpression* _tmp678_ = NULL; - ValaCCodeExpression* _tmp679_; - gboolean _tmp680_; + ValaMethod* _tmp681_; + ValaCCodeFunction* _tmp686_; + ValaCCodeFunction* _tmp687_; + ValaParameter* _tmp688_; + ValaCCodeExpression* _tmp689_ = NULL; + ValaCCodeExpression* _tmp690_; + gboolean _tmp691_; old_coroutine = FALSE; - _tmp670_ = m; - if (_tmp670_ != NULL) { - ValaMethod* _tmp671_; - gboolean _tmp672_; - gboolean _tmp673_; - ValaMethod* _tmp674_; - _tmp671_ = m; - _tmp672_ = vala_method_get_coroutine (_tmp671_); - _tmp673_ = _tmp672_; - old_coroutine = _tmp673_; - _tmp674_ = m; - vala_method_set_coroutine (_tmp674_, FALSE); + _tmp681_ = m; + if (_tmp681_ != NULL) { + ValaMethod* _tmp682_; + gboolean _tmp683_; + gboolean _tmp684_; + ValaMethod* _tmp685_; + _tmp682_ = m; + _tmp683_ = vala_method_get_coroutine (_tmp682_); + _tmp684_ = _tmp683_; + old_coroutine = _tmp684_; + _tmp685_ = m; + vala_method_set_coroutine (_tmp685_, FALSE); } - _tmp675_ = vala_ccode_base_module_get_ccode (self); - _tmp676_ = _tmp675_; - _tmp677_ = param; - _tmp678_ = vala_ccode_base_module_destroy_parameter (self, _tmp677_); - _tmp679_ = _tmp678_; - vala_ccode_function_add_expression (_tmp676_, _tmp679_); - _vala_ccode_node_unref0 (_tmp679_); - _tmp680_ = old_coroutine; - if (_tmp680_) { - ValaMethod* _tmp681_; - _tmp681_ = m; - vala_method_set_coroutine (_tmp681_, TRUE); + _tmp686_ = vala_ccode_base_module_get_ccode (self); + _tmp687_ = _tmp686_; + _tmp688_ = param; + _tmp689_ = vala_ccode_base_module_destroy_parameter (self, _tmp688_); + _tmp690_ = _tmp689_; + vala_ccode_function_add_expression (_tmp687_, _tmp690_); + _vala_ccode_node_unref0 (_tmp690_); + _tmp691_ = old_coroutine; + if (_tmp691_) { + ValaMethod* _tmp692_; + _tmp692_ = m; + vala_method_set_coroutine (_tmp692_, TRUE); } } _vala_code_node_unref0 (param_type); @@ -11707,278 +11717,278 @@ } _vala_code_node_unref0 (m); } else { - ValaBlock* _tmp682_; - ValaSymbol* _tmp683_; - ValaSymbol* _tmp684_; - _tmp682_ = b; - _tmp683_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp682_); - _tmp684_ = _tmp683_; - if (VALA_IS_PROPERTY_ACCESSOR (_tmp684_)) { - ValaBlock* _tmp685_; - ValaSymbol* _tmp686_; - ValaSymbol* _tmp687_; - ValaPropertyAccessor* _tmp688_; + ValaBlock* _tmp693_; + ValaSymbol* _tmp694_; + ValaSymbol* _tmp695_; + _tmp693_ = b; + _tmp694_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp693_); + _tmp695_ = _tmp694_; + if (VALA_IS_PROPERTY_ACCESSOR (_tmp695_)) { + ValaBlock* _tmp696_; + ValaSymbol* _tmp697_; + ValaSymbol* _tmp698_; + ValaPropertyAccessor* _tmp699_; ValaPropertyAccessor* acc; - gboolean _tmp689_ = FALSE; - ValaPropertyAccessor* _tmp690_; - gboolean _tmp691_; - gboolean _tmp692_; - gboolean _tmp698_; - _tmp685_ = b; - _tmp686_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp685_); - _tmp687_ = _tmp686_; - _tmp688_ = _vala_code_node_ref0 (VALA_PROPERTY_ACCESSOR (_tmp687_)); - acc = _tmp688_; - _tmp690_ = acc; - _tmp691_ = vala_property_accessor_get_readable (_tmp690_); - _tmp692_ = _tmp691_; - if (!_tmp692_) { - ValaPropertyAccessor* _tmp693_; - ValaParameter* _tmp694_; - ValaParameter* _tmp695_; - gboolean _tmp696_; - gboolean _tmp697_; - _tmp693_ = acc; - _tmp694_ = vala_property_accessor_get_value_parameter (_tmp693_); - _tmp695_ = _tmp694_; - _tmp696_ = vala_parameter_get_captured (_tmp695_); - _tmp697_ = _tmp696_; - _tmp689_ = _tmp697_; - } else { - _tmp689_ = FALSE; - } - _tmp698_ = _tmp689_; - if (_tmp698_) { - ValaPropertyAccessor* _tmp699_; - ValaParameter* _tmp700_; - ValaParameter* _tmp701_; - ValaDataType* _tmp702_; - ValaDataType* _tmp703_; - ValaDataType* _tmp704_ = NULL; - ValaDataType* param_type; - ValaDataType* _tmp705_; - gboolean _tmp706_; + gboolean _tmp700_ = FALSE; + ValaPropertyAccessor* _tmp701_; + gboolean _tmp702_; + gboolean _tmp703_; + gboolean _tmp709_; + _tmp696_ = b; + _tmp697_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp696_); + _tmp698_ = _tmp697_; + _tmp699_ = _vala_code_node_ref0 (VALA_PROPERTY_ACCESSOR (_tmp698_)); + acc = _tmp699_; + _tmp701_ = acc; + _tmp702_ = vala_property_accessor_get_readable (_tmp701_); + _tmp703_ = _tmp702_; + if (!_tmp703_) { + ValaPropertyAccessor* _tmp704_; + ValaParameter* _tmp705_; + ValaParameter* _tmp706_; gboolean _tmp707_; - ValaDataType* _tmp711_; - gboolean _tmp712_ = FALSE; - _tmp699_ = acc; - _tmp700_ = vala_property_accessor_get_value_parameter (_tmp699_); - _tmp701_ = _tmp700_; - _tmp702_ = vala_variable_get_variable_type ((ValaVariable*) _tmp701_); - _tmp703_ = _tmp702_; - _tmp704_ = vala_data_type_copy (_tmp703_); - param_type = _tmp704_; - _tmp705_ = param_type; - _tmp706_ = vala_data_type_get_value_owned (_tmp705_); - _tmp707_ = _tmp706_; - if (!_tmp707_) { - ValaDataType* _tmp708_; - ValaDataType* _tmp709_; - gboolean _tmp710_ = FALSE; - _tmp708_ = param_type; - _tmp709_ = param_type; - _tmp710_ = vala_ccode_base_module_no_implicit_copy (self, _tmp709_); - vala_data_type_set_value_owned (_tmp708_, !_tmp710_); - } - _tmp711_ = param_type; - _tmp712_ = vala_ccode_base_module_requires_destroy (self, _tmp711_); - if (_tmp712_) { - ValaCCodeFunction* _tmp713_; - ValaCCodeFunction* _tmp714_; - ValaPropertyAccessor* _tmp715_; - ValaParameter* _tmp716_; - ValaParameter* _tmp717_; - ValaCCodeExpression* _tmp718_ = NULL; - ValaCCodeExpression* _tmp719_; - _tmp713_ = vala_ccode_base_module_get_ccode (self); - _tmp714_ = _tmp713_; - _tmp715_ = acc; - _tmp716_ = vala_property_accessor_get_value_parameter (_tmp715_); - _tmp717_ = _tmp716_; - _tmp718_ = vala_ccode_base_module_destroy_parameter (self, _tmp717_); - _tmp719_ = _tmp718_; - vala_ccode_function_add_expression (_tmp714_, _tmp719_); - _vala_ccode_node_unref0 (_tmp719_); + gboolean _tmp708_; + _tmp704_ = acc; + _tmp705_ = vala_property_accessor_get_value_parameter (_tmp704_); + _tmp706_ = _tmp705_; + _tmp707_ = vala_parameter_get_captured (_tmp706_); + _tmp708_ = _tmp707_; + _tmp700_ = _tmp708_; + } else { + _tmp700_ = FALSE; + } + _tmp709_ = _tmp700_; + if (_tmp709_) { + ValaPropertyAccessor* _tmp710_; + ValaParameter* _tmp711_; + ValaParameter* _tmp712_; + ValaDataType* _tmp713_; + ValaDataType* _tmp714_; + ValaDataType* _tmp715_ = NULL; + ValaDataType* param_type; + ValaDataType* _tmp716_; + gboolean _tmp717_; + gboolean _tmp718_; + ValaDataType* _tmp722_; + gboolean _tmp723_ = FALSE; + _tmp710_ = acc; + _tmp711_ = vala_property_accessor_get_value_parameter (_tmp710_); + _tmp712_ = _tmp711_; + _tmp713_ = vala_variable_get_variable_type ((ValaVariable*) _tmp712_); + _tmp714_ = _tmp713_; + _tmp715_ = vala_data_type_copy (_tmp714_); + param_type = _tmp715_; + _tmp716_ = param_type; + _tmp717_ = vala_data_type_get_value_owned (_tmp716_); + _tmp718_ = _tmp717_; + if (!_tmp718_) { + ValaDataType* _tmp719_; + ValaDataType* _tmp720_; + gboolean _tmp721_ = FALSE; + _tmp719_ = param_type; + _tmp720_ = param_type; + _tmp721_ = vala_ccode_base_module_no_implicit_copy (self, _tmp720_); + vala_data_type_set_value_owned (_tmp719_, !_tmp721_); + } + _tmp722_ = param_type; + _tmp723_ = vala_ccode_base_module_requires_destroy (self, _tmp722_); + if (_tmp723_) { + ValaCCodeFunction* _tmp724_; + ValaCCodeFunction* _tmp725_; + ValaPropertyAccessor* _tmp726_; + ValaParameter* _tmp727_; + ValaParameter* _tmp728_; + ValaCCodeExpression* _tmp729_ = NULL; + ValaCCodeExpression* _tmp730_; + _tmp724_ = vala_ccode_base_module_get_ccode (self); + _tmp725_ = _tmp724_; + _tmp726_ = acc; + _tmp727_ = vala_property_accessor_get_value_parameter (_tmp726_); + _tmp728_ = _tmp727_; + _tmp729_ = vala_ccode_base_module_destroy_parameter (self, _tmp728_); + _tmp730_ = _tmp729_; + vala_ccode_function_add_expression (_tmp725_, _tmp730_); + _vala_ccode_node_unref0 (_tmp730_); } _vala_code_node_unref0 (param_type); } _vala_code_node_unref0 (acc); } } - _tmp720_ = parent_block; - if (_tmp720_ != NULL) { - ValaBlock* _tmp721_; - gint _tmp722_ = 0; + _tmp731_ = parent_block; + if (_tmp731_ != NULL) { + ValaBlock* _tmp732_; + gint _tmp733_ = 0; gint parent_block_id; - gint _tmp723_; - gchar* _tmp724_ = NULL; - gchar* _tmp725_; - ValaCCodeIdentifier* _tmp726_; - ValaCCodeIdentifier* _tmp727_; - ValaCCodeFunctionCall* _tmp728_; - ValaCCodeFunctionCall* _tmp729_; + gint _tmp734_; + gchar* _tmp735_ = NULL; + gchar* _tmp736_; + ValaCCodeIdentifier* _tmp737_; + ValaCCodeIdentifier* _tmp738_; + ValaCCodeFunctionCall* _tmp739_; + ValaCCodeFunctionCall* _tmp740_; ValaCCodeFunctionCall* unref_call; - ValaCCodeFunctionCall* _tmp730_; - gint _tmp731_; - gchar* _tmp732_ = NULL; - gchar* _tmp733_; - ValaCCodeIdentifier* _tmp734_; - ValaCCodeIdentifier* _tmp735_; - gint _tmp736_; - gchar* _tmp737_ = NULL; - gchar* _tmp738_; - ValaCCodeMemberAccess* _tmp739_; - ValaCCodeMemberAccess* _tmp740_; - ValaCCodeFunction* _tmp741_; - ValaCCodeFunction* _tmp742_; - ValaCCodeFunctionCall* _tmp743_; - ValaCCodeFunction* _tmp744_; - ValaCCodeFunction* _tmp745_; - gint _tmp746_; - gchar* _tmp747_ = NULL; - gchar* _tmp748_; - ValaCCodeIdentifier* _tmp749_; - ValaCCodeIdentifier* _tmp750_; - gint _tmp751_; - gchar* _tmp752_ = NULL; - gchar* _tmp753_; - ValaCCodeMemberAccess* _tmp754_; - ValaCCodeMemberAccess* _tmp755_; - ValaCCodeConstant* _tmp756_; - ValaCCodeConstant* _tmp757_; - _tmp721_ = parent_block; - _tmp722_ = vala_ccode_base_module_get_block_id (self, _tmp721_); - parent_block_id = _tmp722_; - _tmp723_ = parent_block_id; - _tmp724_ = g_strdup_printf ("block%d_data_unref", _tmp723_); - _tmp725_ = _tmp724_; - _tmp726_ = vala_ccode_identifier_new (_tmp725_); - _tmp727_ = _tmp726_; - _tmp728_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp727_); - _tmp729_ = _tmp728_; - _vala_ccode_node_unref0 (_tmp727_); - _g_free0 (_tmp725_); - unref_call = _tmp729_; - _tmp730_ = unref_call; - _tmp731_ = block_id; - _tmp732_ = g_strdup_printf ("_data%d_", _tmp731_); - _tmp733_ = _tmp732_; - _tmp734_ = vala_ccode_identifier_new (_tmp733_); - _tmp735_ = _tmp734_; - _tmp736_ = parent_block_id; - _tmp737_ = g_strdup_printf ("_data%d_", _tmp736_); + ValaCCodeFunctionCall* _tmp741_; + gint _tmp742_; + gchar* _tmp743_ = NULL; + gchar* _tmp744_; + ValaCCodeIdentifier* _tmp745_; + ValaCCodeIdentifier* _tmp746_; + gint _tmp747_; + gchar* _tmp748_ = NULL; + gchar* _tmp749_; + ValaCCodeMemberAccess* _tmp750_; + ValaCCodeMemberAccess* _tmp751_; + ValaCCodeFunction* _tmp752_; + ValaCCodeFunction* _tmp753_; + ValaCCodeFunctionCall* _tmp754_; + ValaCCodeFunction* _tmp755_; + ValaCCodeFunction* _tmp756_; + gint _tmp757_; + gchar* _tmp758_ = NULL; + gchar* _tmp759_; + ValaCCodeIdentifier* _tmp760_; + ValaCCodeIdentifier* _tmp761_; + gint _tmp762_; + gchar* _tmp763_ = NULL; + gchar* _tmp764_; + ValaCCodeMemberAccess* _tmp765_; + ValaCCodeMemberAccess* _tmp766_; + ValaCCodeConstant* _tmp767_; + ValaCCodeConstant* _tmp768_; + _tmp732_ = parent_block; + _tmp733_ = vala_ccode_base_module_get_block_id (self, _tmp732_); + parent_block_id = _tmp733_; + _tmp734_ = parent_block_id; + _tmp735_ = g_strdup_printf ("block%d_data_unref", _tmp734_); + _tmp736_ = _tmp735_; + _tmp737_ = vala_ccode_identifier_new (_tmp736_); _tmp738_ = _tmp737_; - _tmp739_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp735_, _tmp738_); + _tmp739_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp738_); _tmp740_ = _tmp739_; - vala_ccode_function_call_add_argument (_tmp730_, (ValaCCodeExpression*) _tmp740_); - _vala_ccode_node_unref0 (_tmp740_); - _g_free0 (_tmp738_); - _vala_ccode_node_unref0 (_tmp735_); - _g_free0 (_tmp733_); - _tmp741_ = vala_ccode_base_module_get_ccode (self); - _tmp742_ = _tmp741_; - _tmp743_ = unref_call; - vala_ccode_function_add_expression (_tmp742_, (ValaCCodeExpression*) _tmp743_); - _tmp744_ = vala_ccode_base_module_get_ccode (self); - _tmp745_ = _tmp744_; - _tmp746_ = block_id; - _tmp747_ = g_strdup_printf ("_data%d_", _tmp746_); - _tmp748_ = _tmp747_; - _tmp749_ = vala_ccode_identifier_new (_tmp748_); - _tmp750_ = _tmp749_; - _tmp751_ = parent_block_id; - _tmp752_ = g_strdup_printf ("_data%d_", _tmp751_); + _vala_ccode_node_unref0 (_tmp738_); + _g_free0 (_tmp736_); + unref_call = _tmp740_; + _tmp741_ = unref_call; + _tmp742_ = block_id; + _tmp743_ = g_strdup_printf ("_data%d_", _tmp742_); + _tmp744_ = _tmp743_; + _tmp745_ = vala_ccode_identifier_new (_tmp744_); + _tmp746_ = _tmp745_; + _tmp747_ = parent_block_id; + _tmp748_ = g_strdup_printf ("_data%d_", _tmp747_); + _tmp749_ = _tmp748_; + _tmp750_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp746_, _tmp749_); + _tmp751_ = _tmp750_; + vala_ccode_function_call_add_argument (_tmp741_, (ValaCCodeExpression*) _tmp751_); + _vala_ccode_node_unref0 (_tmp751_); + _g_free0 (_tmp749_); + _vala_ccode_node_unref0 (_tmp746_); + _g_free0 (_tmp744_); + _tmp752_ = vala_ccode_base_module_get_ccode (self); _tmp753_ = _tmp752_; - _tmp754_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp750_, _tmp753_); - _tmp755_ = _tmp754_; - _tmp756_ = vala_ccode_constant_new ("NULL"); - _tmp757_ = _tmp756_; - vala_ccode_function_add_assignment (_tmp745_, (ValaCCodeExpression*) _tmp755_, (ValaCCodeExpression*) _tmp757_); - _vala_ccode_node_unref0 (_tmp757_); - _vala_ccode_node_unref0 (_tmp755_); - _g_free0 (_tmp753_); - _vala_ccode_node_unref0 (_tmp750_); - _g_free0 (_tmp748_); + _tmp754_ = unref_call; + vala_ccode_function_add_expression (_tmp753_, (ValaCCodeExpression*) _tmp754_); + _tmp755_ = vala_ccode_base_module_get_ccode (self); + _tmp756_ = _tmp755_; + _tmp757_ = block_id; + _tmp758_ = g_strdup_printf ("_data%d_", _tmp757_); + _tmp759_ = _tmp758_; + _tmp760_ = vala_ccode_identifier_new (_tmp759_); + _tmp761_ = _tmp760_; + _tmp762_ = parent_block_id; + _tmp763_ = g_strdup_printf ("_data%d_", _tmp762_); + _tmp764_ = _tmp763_; + _tmp765_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp761_, _tmp764_); + _tmp766_ = _tmp765_; + _tmp767_ = vala_ccode_constant_new ("NULL"); + _tmp768_ = _tmp767_; + vala_ccode_function_add_assignment (_tmp756_, (ValaCCodeExpression*) _tmp766_, (ValaCCodeExpression*) _tmp768_); + _vala_ccode_node_unref0 (_tmp768_); + _vala_ccode_node_unref0 (_tmp766_); + _g_free0 (_tmp764_); + _vala_ccode_node_unref0 (_tmp761_); + _g_free0 (_tmp759_); _vala_ccode_node_unref0 (unref_call); } else { - ValaDataType* _tmp758_ = NULL; - ValaDataType* _tmp759_; - gboolean _tmp760_; - _tmp758_ = vala_ccode_base_module_get_this_type (self); - _tmp759_ = _tmp758_; - _tmp760_ = _tmp759_ != NULL; - _vala_code_node_unref0 (_tmp759_); - if (_tmp760_) { - ValaTypeSymbol* _tmp761_; - ValaTypeSymbol* _tmp762_; - ValaDataType* _tmp763_ = NULL; - ValaDataType* _tmp764_; - ValaCCodeIdentifier* _tmp765_; - ValaCCodeIdentifier* _tmp766_; - ValaGLibValue* _tmp767_; - ValaGLibValue* _tmp768_; + ValaDataType* _tmp769_ = NULL; + ValaDataType* _tmp770_; + gboolean _tmp771_; + _tmp769_ = vala_ccode_base_module_get_this_type (self); + _tmp770_ = _tmp769_; + _tmp771_ = _tmp770_ != NULL; + _vala_code_node_unref0 (_tmp770_); + if (_tmp771_) { + ValaTypeSymbol* _tmp772_; + ValaTypeSymbol* _tmp773_; + ValaDataType* _tmp774_ = NULL; + ValaDataType* _tmp775_; + ValaCCodeIdentifier* _tmp776_; + ValaCCodeIdentifier* _tmp777_; + ValaGLibValue* _tmp778_; + ValaGLibValue* _tmp779_; ValaGLibValue* this_value; - ValaCCodeFunction* _tmp769_; - ValaCCodeFunction* _tmp770_; - ValaGLibValue* _tmp771_; - ValaCCodeExpression* _tmp772_ = NULL; - ValaCCodeExpression* _tmp773_; - _tmp761_ = vala_ccode_base_module_get_current_type_symbol (self); - _tmp762_ = _tmp761_; - _tmp763_ = vala_ccode_base_module_get_data_type_for_symbol (_tmp762_); - _tmp764_ = _tmp763_; - _tmp765_ = vala_ccode_identifier_new ("self"); - _tmp766_ = _tmp765_; - _tmp767_ = vala_glib_value_new (_tmp764_, (ValaCCodeExpression*) _tmp766_, TRUE); - _tmp768_ = _tmp767_; - _vala_ccode_node_unref0 (_tmp766_); - _vala_code_node_unref0 (_tmp764_); - this_value = _tmp768_; - _tmp769_ = vala_ccode_base_module_get_ccode (self); - _tmp770_ = _tmp769_; - _tmp771_ = this_value; - _tmp772_ = vala_ccode_base_module_destroy_value (self, (ValaTargetValue*) _tmp771_, FALSE); + ValaCCodeFunction* _tmp780_; + ValaCCodeFunction* _tmp781_; + ValaGLibValue* _tmp782_; + ValaCCodeExpression* _tmp783_ = NULL; + ValaCCodeExpression* _tmp784_; + _tmp772_ = vala_ccode_base_module_get_current_type_symbol (self); _tmp773_ = _tmp772_; - vala_ccode_function_add_expression (_tmp770_, _tmp773_); - _vala_ccode_node_unref0 (_tmp773_); + _tmp774_ = vala_ccode_base_module_get_data_type_for_symbol (_tmp773_); + _tmp775_ = _tmp774_; + _tmp776_ = vala_ccode_identifier_new ("self"); + _tmp777_ = _tmp776_; + _tmp778_ = vala_glib_value_new (_tmp775_, (ValaCCodeExpression*) _tmp777_, TRUE); + _tmp779_ = _tmp778_; + _vala_ccode_node_unref0 (_tmp777_); + _vala_code_node_unref0 (_tmp775_); + this_value = _tmp779_; + _tmp780_ = vala_ccode_base_module_get_ccode (self); + _tmp781_ = _tmp780_; + _tmp782_ = this_value; + _tmp783_ = vala_ccode_base_module_destroy_value (self, (ValaTargetValue*) _tmp782_, FALSE); + _tmp784_ = _tmp783_; + vala_ccode_function_add_expression (_tmp781_, _tmp784_); + _vala_ccode_node_unref0 (_tmp784_); _vala_target_value_unref0 (this_value); } } - _tmp774_ = vala_ccode_identifier_new ("g_slice_free"); - _tmp775_ = _tmp774_; - _tmp776_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp775_); - _tmp777_ = _tmp776_; - _vala_ccode_node_unref0 (_tmp775_); - data_free = _tmp777_; - _tmp778_ = data_free; - _tmp779_ = struct_name; - _tmp780_ = vala_ccode_identifier_new (_tmp779_); - _tmp781_ = _tmp780_; - vala_ccode_function_call_add_argument (_tmp778_, (ValaCCodeExpression*) _tmp781_); - _vala_ccode_node_unref0 (_tmp781_); - _tmp782_ = data_free; - _tmp783_ = block_id; - _tmp784_ = g_strdup_printf ("_data%d_", _tmp783_); - _tmp785_ = _tmp784_; - _tmp786_ = vala_ccode_identifier_new (_tmp785_); - _tmp787_ = _tmp786_; - vala_ccode_function_call_add_argument (_tmp782_, (ValaCCodeExpression*) _tmp787_); - _vala_ccode_node_unref0 (_tmp787_); - _g_free0 (_tmp785_); - _tmp788_ = vala_ccode_base_module_get_ccode (self); - _tmp789_ = _tmp788_; - _tmp790_ = data_free; - vala_ccode_function_add_expression (_tmp789_, (ValaCCodeExpression*) _tmp790_); - _tmp791_ = vala_ccode_base_module_get_ccode (self); + _tmp785_ = vala_ccode_identifier_new ("g_slice_free"); + _tmp786_ = _tmp785_; + _tmp787_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp786_); + _tmp788_ = _tmp787_; + _vala_ccode_node_unref0 (_tmp786_); + data_free = _tmp788_; + _tmp789_ = data_free; + _tmp790_ = struct_name; + _tmp791_ = vala_ccode_identifier_new (_tmp790_); _tmp792_ = _tmp791_; - vala_ccode_function_close (_tmp792_); + vala_ccode_function_call_add_argument (_tmp789_, (ValaCCodeExpression*) _tmp792_); + _vala_ccode_node_unref0 (_tmp792_); + _tmp793_ = data_free; + _tmp794_ = block_id; + _tmp795_ = g_strdup_printf ("_data%d_", _tmp794_); + _tmp796_ = _tmp795_; + _tmp797_ = vala_ccode_identifier_new (_tmp796_); + _tmp798_ = _tmp797_; + vala_ccode_function_call_add_argument (_tmp793_, (ValaCCodeExpression*) _tmp798_); + _vala_ccode_node_unref0 (_tmp798_); + _g_free0 (_tmp796_); + _tmp799_ = vala_ccode_base_module_get_ccode (self); + _tmp800_ = _tmp799_; + _tmp801_ = data_free; + vala_ccode_function_add_expression (_tmp800_, (ValaCCodeExpression*) _tmp801_); + _tmp802_ = vala_ccode_base_module_get_ccode (self); + _tmp803_ = _tmp802_; + vala_ccode_function_close (_tmp803_); vala_ccode_base_module_pop_function (self); - _tmp793_ = self->cfile; - _tmp794_ = unref_fun; - vala_ccode_file_add_function_declaration (_tmp793_, _tmp794_); - _tmp795_ = self->cfile; - _tmp796_ = unref_fun; - vala_ccode_file_add_function (_tmp795_, _tmp796_); + _tmp804_ = self->cfile; + _tmp805_ = unref_fun; + vala_ccode_file_add_function_declaration (_tmp804_, _tmp805_); + _tmp806_ = self->cfile; + _tmp807_ = unref_fun; + vala_ccode_file_add_function (_tmp806_, _tmp807_); _vala_ccode_node_unref0 (data_free); _vala_ccode_node_unref0 (outer_block); _vala_ccode_node_unref0 (unref_fun); @@ -11991,299 +12001,299 @@ _vala_code_node_unref0 (parent_block); } { - ValaBlock* _tmp797_; - ValaList* _tmp798_ = NULL; + ValaBlock* _tmp808_; + ValaList* _tmp809_ = NULL; ValaList* _stmt_list; - ValaList* _tmp799_; - gint _tmp800_; - gint _tmp801_; + ValaList* _tmp810_; + gint _tmp811_; + gint _tmp812_; gint _stmt_size; gint _stmt_index; - _tmp797_ = b; - _tmp798_ = vala_block_get_statements (_tmp797_); - _stmt_list = _tmp798_; - _tmp799_ = _stmt_list; - _tmp800_ = vala_collection_get_size ((ValaCollection*) _tmp799_); - _tmp801_ = _tmp800_; - _stmt_size = _tmp801_; + _tmp808_ = b; + _tmp809_ = vala_block_get_statements (_tmp808_); + _stmt_list = _tmp809_; + _tmp810_ = _stmt_list; + _tmp811_ = vala_collection_get_size ((ValaCollection*) _tmp810_); + _tmp812_ = _tmp811_; + _stmt_size = _tmp812_; _stmt_index = -1; while (TRUE) { - gint _tmp802_; - gint _tmp803_; - gint _tmp804_; - ValaList* _tmp805_; - gint _tmp806_; - gpointer _tmp807_ = NULL; + gint _tmp813_; + gint _tmp814_; + gint _tmp815_; + ValaList* _tmp816_; + gint _tmp817_; + gpointer _tmp818_ = NULL; ValaStatement* stmt; - ValaStatement* _tmp808_; - ValaSourceReference* _tmp809_; - ValaSourceReference* _tmp810_; - ValaStatement* _tmp811_; - _tmp802_ = _stmt_index; - _stmt_index = _tmp802_ + 1; - _tmp803_ = _stmt_index; - _tmp804_ = _stmt_size; - if (!(_tmp803_ < _tmp804_)) { + ValaStatement* _tmp819_; + ValaSourceReference* _tmp820_; + ValaSourceReference* _tmp821_; + ValaStatement* _tmp822_; + _tmp813_ = _stmt_index; + _stmt_index = _tmp813_ + 1; + _tmp814_ = _stmt_index; + _tmp815_ = _stmt_size; + if (!(_tmp814_ < _tmp815_)) { break; } - _tmp805_ = _stmt_list; - _tmp806_ = _stmt_index; - _tmp807_ = vala_list_get (_tmp805_, _tmp806_); - stmt = (ValaStatement*) _tmp807_; - _tmp808_ = stmt; - _tmp809_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp808_); - _tmp810_ = _tmp809_; - vala_ccode_base_module_push_line (self, _tmp810_); - _tmp811_ = stmt; - vala_code_node_emit ((ValaCodeNode*) _tmp811_, (ValaCodeGenerator*) self); + _tmp816_ = _stmt_list; + _tmp817_ = _stmt_index; + _tmp818_ = vala_list_get (_tmp816_, _tmp817_); + stmt = (ValaStatement*) _tmp818_; + _tmp819_ = stmt; + _tmp820_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp819_); + _tmp821_ = _tmp820_; + vala_ccode_base_module_push_line (self, _tmp821_); + _tmp822_ = stmt; + vala_code_node_emit ((ValaCodeNode*) _tmp822_, (ValaCodeGenerator*) self); vala_ccode_base_module_pop_line (self); _vala_code_node_unref0 (stmt); } _vala_iterable_unref0 (_stmt_list); } { - ValaList* _tmp812_; - gint _tmp813_; - gint _tmp814_; + ValaList* _tmp823_; + gint _tmp824_; + gint _tmp825_; gint i; - _tmp812_ = local_vars; - _tmp813_ = vala_collection_get_size ((ValaCollection*) _tmp812_); - _tmp814_ = _tmp813_; - i = _tmp814_ - 1; + _tmp823_ = local_vars; + _tmp824_ = vala_collection_get_size ((ValaCollection*) _tmp823_); + _tmp825_ = _tmp824_; + i = _tmp825_ - 1; { - gboolean _tmp815_; - _tmp815_ = TRUE; + gboolean _tmp826_; + _tmp826_ = TRUE; while (TRUE) { - gboolean _tmp816_; - gint _tmp818_; - ValaList* _tmp819_; - gint _tmp820_; - gpointer _tmp821_ = NULL; - ValaLocalVariable* local; - ValaLocalVariable* _tmp822_; - gboolean _tmp823_ = FALSE; - gboolean _tmp824_ = FALSE; - gboolean _tmp825_ = FALSE; - ValaLocalVariable* _tmp826_; gboolean _tmp827_; - gboolean _tmp828_; - gboolean _tmp832_; - gboolean _tmp836_; - gboolean _tmp841_; - _tmp816_ = _tmp815_; - if (!_tmp816_) { - gint _tmp817_; - _tmp817_ = i; - i = _tmp817_ - 1; - } - _tmp815_ = FALSE; - _tmp818_ = i; - if (!(_tmp818_ >= 0)) { + gint _tmp829_; + ValaList* _tmp830_; + gint _tmp831_; + gpointer _tmp832_ = NULL; + ValaLocalVariable* local; + ValaLocalVariable* _tmp833_; + gboolean _tmp834_ = FALSE; + gboolean _tmp835_ = FALSE; + gboolean _tmp836_ = FALSE; + ValaLocalVariable* _tmp837_; + gboolean _tmp838_; + gboolean _tmp839_; + gboolean _tmp843_; + gboolean _tmp847_; + gboolean _tmp852_; + _tmp827_ = _tmp826_; + if (!_tmp827_) { + gint _tmp828_; + _tmp828_ = i; + i = _tmp828_ - 1; + } + _tmp826_ = FALSE; + _tmp829_ = i; + if (!(_tmp829_ >= 0)) { break; } - _tmp819_ = local_vars; - _tmp820_ = i; - _tmp821_ = vala_list_get (_tmp819_, _tmp820_); - local = (ValaLocalVariable*) _tmp821_; - _tmp822_ = local; - vala_symbol_set_active ((ValaSymbol*) _tmp822_, FALSE); - _tmp826_ = local; - _tmp827_ = vala_code_node_get_unreachable ((ValaCodeNode*) _tmp826_); - _tmp828_ = _tmp827_; - if (!_tmp828_) { - ValaLocalVariable* _tmp829_; - gboolean _tmp830_; - gboolean _tmp831_; - _tmp829_ = local; - _tmp830_ = vala_local_variable_get_floating (_tmp829_); - _tmp831_ = _tmp830_; - _tmp825_ = !_tmp831_; - } else { - _tmp825_ = FALSE; - } - _tmp832_ = _tmp825_; - if (_tmp832_) { - ValaLocalVariable* _tmp833_; - gboolean _tmp834_; - gboolean _tmp835_; - _tmp833_ = local; - _tmp834_ = vala_local_variable_get_captured (_tmp833_); - _tmp835_ = _tmp834_; - _tmp824_ = !_tmp835_; - } else { - _tmp824_ = FALSE; - } - _tmp836_ = _tmp824_; - if (_tmp836_) { - ValaLocalVariable* _tmp837_; - ValaDataType* _tmp838_; - ValaDataType* _tmp839_; - gboolean _tmp840_ = FALSE; - _tmp837_ = local; - _tmp838_ = vala_variable_get_variable_type ((ValaVariable*) _tmp837_); - _tmp839_ = _tmp838_; - _tmp840_ = vala_ccode_base_module_requires_destroy (self, _tmp839_); - _tmp823_ = _tmp840_; - } else { - _tmp823_ = FALSE; - } - _tmp841_ = _tmp823_; - if (_tmp841_) { - ValaCCodeFunction* _tmp842_; - ValaCCodeFunction* _tmp843_; + _tmp830_ = local_vars; + _tmp831_ = i; + _tmp832_ = vala_list_get (_tmp830_, _tmp831_); + local = (ValaLocalVariable*) _tmp832_; + _tmp833_ = local; + vala_symbol_set_active ((ValaSymbol*) _tmp833_, FALSE); + _tmp837_ = local; + _tmp838_ = vala_code_node_get_unreachable ((ValaCodeNode*) _tmp837_); + _tmp839_ = _tmp838_; + if (!_tmp839_) { + ValaLocalVariable* _tmp840_; + gboolean _tmp841_; + gboolean _tmp842_; + _tmp840_ = local; + _tmp841_ = vala_local_variable_get_floating (_tmp840_); + _tmp842_ = _tmp841_; + _tmp836_ = !_tmp842_; + } else { + _tmp836_ = FALSE; + } + _tmp843_ = _tmp836_; + if (_tmp843_) { ValaLocalVariable* _tmp844_; - ValaCCodeExpression* _tmp845_ = NULL; - ValaCCodeExpression* _tmp846_; - _tmp842_ = vala_ccode_base_module_get_ccode (self); - _tmp843_ = _tmp842_; + gboolean _tmp845_; + gboolean _tmp846_; _tmp844_ = local; - _tmp845_ = vala_ccode_base_module_destroy_local (self, _tmp844_); + _tmp845_ = vala_local_variable_get_captured (_tmp844_); _tmp846_ = _tmp845_; - vala_ccode_function_add_expression (_tmp843_, _tmp846_); - _vala_ccode_node_unref0 (_tmp846_); + _tmp835_ = !_tmp846_; + } else { + _tmp835_ = FALSE; + } + _tmp847_ = _tmp835_; + if (_tmp847_) { + ValaLocalVariable* _tmp848_; + ValaDataType* _tmp849_; + ValaDataType* _tmp850_; + gboolean _tmp851_ = FALSE; + _tmp848_ = local; + _tmp849_ = vala_variable_get_variable_type ((ValaVariable*) _tmp848_); + _tmp850_ = _tmp849_; + _tmp851_ = vala_ccode_base_module_requires_destroy (self, _tmp850_); + _tmp834_ = _tmp851_; + } else { + _tmp834_ = FALSE; + } + _tmp852_ = _tmp834_; + if (_tmp852_) { + ValaCCodeFunction* _tmp853_; + ValaCCodeFunction* _tmp854_; + ValaLocalVariable* _tmp855_; + ValaCCodeExpression* _tmp856_ = NULL; + ValaCCodeExpression* _tmp857_; + _tmp853_ = vala_ccode_base_module_get_ccode (self); + _tmp854_ = _tmp853_; + _tmp855_ = local; + _tmp856_ = vala_ccode_base_module_destroy_local (self, _tmp855_); + _tmp857_ = _tmp856_; + vala_ccode_function_add_expression (_tmp854_, _tmp857_); + _vala_ccode_node_unref0 (_tmp857_); } _vala_code_node_unref0 (local); } } } - _tmp847_ = b; - _tmp848_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp847_); - _tmp849_ = _tmp848_; - if (VALA_IS_METHOD (_tmp849_)) { - ValaBlock* _tmp850_; - ValaSymbol* _tmp851_; - ValaSymbol* _tmp852_; - ValaMethod* _tmp853_; + _tmp858_ = b; + _tmp859_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp858_); + _tmp860_ = _tmp859_; + if (VALA_IS_METHOD (_tmp860_)) { + ValaBlock* _tmp861_; + ValaSymbol* _tmp862_; + ValaSymbol* _tmp863_; + ValaMethod* _tmp864_; ValaMethod* m; - _tmp850_ = b; - _tmp851_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp850_); - _tmp852_ = _tmp851_; - _tmp853_ = _vala_code_node_ref0 (VALA_METHOD (_tmp852_)); - m = _tmp853_; + _tmp861_ = b; + _tmp862_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp861_); + _tmp863_ = _tmp862_; + _tmp864_ = _vala_code_node_ref0 (VALA_METHOD (_tmp863_)); + m = _tmp864_; { - ValaMethod* _tmp854_; - ValaList* _tmp855_ = NULL; + ValaMethod* _tmp865_; + ValaList* _tmp866_ = NULL; ValaList* _param_list; - ValaList* _tmp856_; - gint _tmp857_; - gint _tmp858_; + ValaList* _tmp867_; + gint _tmp868_; + gint _tmp869_; gint _param_size; gint _param_index; - _tmp854_ = m; - _tmp855_ = vala_method_get_parameters (_tmp854_); - _param_list = _tmp855_; - _tmp856_ = _param_list; - _tmp857_ = vala_collection_get_size ((ValaCollection*) _tmp856_); - _tmp858_ = _tmp857_; - _param_size = _tmp858_; + _tmp865_ = m; + _tmp866_ = vala_method_get_parameters (_tmp865_); + _param_list = _tmp866_; + _tmp867_ = _param_list; + _tmp868_ = vala_collection_get_size ((ValaCollection*) _tmp867_); + _tmp869_ = _tmp868_; + _param_size = _tmp869_; _param_index = -1; while (TRUE) { - gint _tmp859_; - gint _tmp860_; - gint _tmp861_; - ValaList* _tmp862_; - gint _tmp863_; - gpointer _tmp864_ = NULL; + gint _tmp870_; + gint _tmp871_; + gint _tmp872_; + ValaList* _tmp873_; + gint _tmp874_; + gpointer _tmp875_ = NULL; ValaParameter* param; - gboolean _tmp865_ = FALSE; - gboolean _tmp866_ = FALSE; - gboolean _tmp867_ = FALSE; - ValaParameter* _tmp868_; - gboolean _tmp869_; - gboolean _tmp870_; - gboolean _tmp874_; - gboolean _tmp879_; - gboolean _tmp883_; - _tmp859_ = _param_index; - _param_index = _tmp859_ + 1; - _tmp860_ = _param_index; - _tmp861_ = _param_size; - if (!(_tmp860_ < _tmp861_)) { + gboolean _tmp876_ = FALSE; + gboolean _tmp877_ = FALSE; + gboolean _tmp878_ = FALSE; + ValaParameter* _tmp879_; + gboolean _tmp880_; + gboolean _tmp881_; + gboolean _tmp885_; + gboolean _tmp890_; + gboolean _tmp894_; + _tmp870_ = _param_index; + _param_index = _tmp870_ + 1; + _tmp871_ = _param_index; + _tmp872_ = _param_size; + if (!(_tmp871_ < _tmp872_)) { break; } - _tmp862_ = _param_list; - _tmp863_ = _param_index; - _tmp864_ = vala_list_get (_tmp862_, _tmp863_); - param = (ValaParameter*) _tmp864_; - _tmp868_ = param; - _tmp869_ = vala_parameter_get_captured (_tmp868_); - _tmp870_ = _tmp869_; - if (!_tmp870_) { - ValaParameter* _tmp871_; - gboolean _tmp872_; - gboolean _tmp873_; - _tmp871_ = param; - _tmp872_ = vala_parameter_get_ellipsis (_tmp871_); - _tmp873_ = _tmp872_; - _tmp867_ = !_tmp873_; - } else { - _tmp867_ = FALSE; - } - _tmp874_ = _tmp867_; - if (_tmp874_) { - ValaParameter* _tmp875_; - ValaDataType* _tmp876_; - ValaDataType* _tmp877_; - gboolean _tmp878_ = FALSE; - _tmp875_ = param; - _tmp876_ = vala_variable_get_variable_type ((ValaVariable*) _tmp875_); - _tmp877_ = _tmp876_; - _tmp878_ = vala_ccode_base_module_requires_destroy (self, _tmp877_); - _tmp866_ = _tmp878_; - } else { - _tmp866_ = FALSE; - } - _tmp879_ = _tmp866_; - if (_tmp879_) { - ValaParameter* _tmp880_; - ValaParameterDirection _tmp881_; - ValaParameterDirection _tmp882_; - _tmp880_ = param; - _tmp881_ = vala_parameter_get_direction (_tmp880_); - _tmp882_ = _tmp881_; - _tmp865_ = _tmp882_ == VALA_PARAMETER_DIRECTION_IN; - } else { - _tmp865_ = FALSE; - } - _tmp883_ = _tmp865_; - if (_tmp883_) { - ValaCCodeFunction* _tmp884_; - ValaCCodeFunction* _tmp885_; + _tmp873_ = _param_list; + _tmp874_ = _param_index; + _tmp875_ = vala_list_get (_tmp873_, _tmp874_); + param = (ValaParameter*) _tmp875_; + _tmp879_ = param; + _tmp880_ = vala_parameter_get_captured (_tmp879_); + _tmp881_ = _tmp880_; + if (!_tmp881_) { + ValaParameter* _tmp882_; + gboolean _tmp883_; + gboolean _tmp884_; + _tmp882_ = param; + _tmp883_ = vala_parameter_get_ellipsis (_tmp882_); + _tmp884_ = _tmp883_; + _tmp878_ = !_tmp884_; + } else { + _tmp878_ = FALSE; + } + _tmp885_ = _tmp878_; + if (_tmp885_) { ValaParameter* _tmp886_; - ValaCCodeExpression* _tmp887_ = NULL; - ValaCCodeExpression* _tmp888_; - _tmp884_ = vala_ccode_base_module_get_ccode (self); - _tmp885_ = _tmp884_; + ValaDataType* _tmp887_; + ValaDataType* _tmp888_; + gboolean _tmp889_ = FALSE; _tmp886_ = param; - _tmp887_ = vala_ccode_base_module_destroy_parameter (self, _tmp886_); + _tmp887_ = vala_variable_get_variable_type ((ValaVariable*) _tmp886_); _tmp888_ = _tmp887_; - vala_ccode_function_add_expression (_tmp885_, _tmp888_); - _vala_ccode_node_unref0 (_tmp888_); + _tmp889_ = vala_ccode_base_module_requires_destroy (self, _tmp888_); + _tmp877_ = _tmp889_; } else { - gboolean _tmp889_ = FALSE; - ValaParameter* _tmp890_; - ValaParameterDirection _tmp891_; + _tmp877_ = FALSE; + } + _tmp890_ = _tmp877_; + if (_tmp890_) { + ValaParameter* _tmp891_; ValaParameterDirection _tmp892_; - gboolean _tmp896_; - _tmp890_ = param; - _tmp891_ = vala_parameter_get_direction (_tmp890_); - _tmp892_ = _tmp891_; - if (_tmp892_ == VALA_PARAMETER_DIRECTION_OUT) { - ValaMethod* _tmp893_; - gboolean _tmp894_; - gboolean _tmp895_; - _tmp893_ = m; - _tmp894_ = vala_method_get_coroutine (_tmp893_); - _tmp895_ = _tmp894_; - _tmp889_ = !_tmp895_; + ValaParameterDirection _tmp893_; + _tmp891_ = param; + _tmp892_ = vala_parameter_get_direction (_tmp891_); + _tmp893_ = _tmp892_; + _tmp876_ = _tmp893_ == VALA_PARAMETER_DIRECTION_IN; + } else { + _tmp876_ = FALSE; + } + _tmp894_ = _tmp876_; + if (_tmp894_) { + ValaCCodeFunction* _tmp895_; + ValaCCodeFunction* _tmp896_; + ValaParameter* _tmp897_; + ValaCCodeExpression* _tmp898_ = NULL; + ValaCCodeExpression* _tmp899_; + _tmp895_ = vala_ccode_base_module_get_ccode (self); + _tmp896_ = _tmp895_; + _tmp897_ = param; + _tmp898_ = vala_ccode_base_module_destroy_parameter (self, _tmp897_); + _tmp899_ = _tmp898_; + vala_ccode_function_add_expression (_tmp896_, _tmp899_); + _vala_ccode_node_unref0 (_tmp899_); + } else { + gboolean _tmp900_ = FALSE; + ValaParameter* _tmp901_; + ValaParameterDirection _tmp902_; + ValaParameterDirection _tmp903_; + gboolean _tmp907_; + _tmp901_ = param; + _tmp902_ = vala_parameter_get_direction (_tmp901_); + _tmp903_ = _tmp902_; + if (_tmp903_ == VALA_PARAMETER_DIRECTION_OUT) { + ValaMethod* _tmp904_; + gboolean _tmp905_; + gboolean _tmp906_; + _tmp904_ = m; + _tmp905_ = vala_method_get_coroutine (_tmp904_); + _tmp906_ = _tmp905_; + _tmp900_ = !_tmp906_; } else { - _tmp889_ = FALSE; + _tmp900_ = FALSE; } - _tmp896_ = _tmp889_; - if (_tmp896_) { - ValaParameter* _tmp897_; - _tmp897_ = param; - vala_ccode_base_module_return_out_parameter (self, _tmp897_); + _tmp907_ = _tmp900_; + if (_tmp907_) { + ValaParameter* _tmp908_; + _tmp908_ = param; + vala_ccode_base_module_return_out_parameter (self, _tmp908_); } } _vala_code_node_unref0 (param); @@ -12292,198 +12302,198 @@ } _vala_code_node_unref0 (m); } else { - ValaBlock* _tmp898_; - ValaSymbol* _tmp899_; - ValaSymbol* _tmp900_; - _tmp898_ = b; - _tmp899_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp898_); - _tmp900_ = _tmp899_; - if (VALA_IS_PROPERTY_ACCESSOR (_tmp900_)) { - ValaBlock* _tmp901_; - ValaSymbol* _tmp902_; - ValaSymbol* _tmp903_; - ValaPropertyAccessor* _tmp904_; + ValaBlock* _tmp909_; + ValaSymbol* _tmp910_; + ValaSymbol* _tmp911_; + _tmp909_ = b; + _tmp910_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp909_); + _tmp911_ = _tmp910_; + if (VALA_IS_PROPERTY_ACCESSOR (_tmp911_)) { + ValaBlock* _tmp912_; + ValaSymbol* _tmp913_; + ValaSymbol* _tmp914_; + ValaPropertyAccessor* _tmp915_; ValaPropertyAccessor* acc; - gboolean _tmp905_ = FALSE; - gboolean _tmp906_ = FALSE; - ValaPropertyAccessor* _tmp907_; - ValaParameter* _tmp908_; - ValaParameter* _tmp909_; - gboolean _tmp915_; - gboolean _tmp922_; - _tmp901_ = b; - _tmp902_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp901_); - _tmp903_ = _tmp902_; - _tmp904_ = _vala_code_node_ref0 (VALA_PROPERTY_ACCESSOR (_tmp903_)); - acc = _tmp904_; - _tmp907_ = acc; - _tmp908_ = vala_property_accessor_get_value_parameter (_tmp907_); - _tmp909_ = _tmp908_; - if (_tmp909_ != NULL) { - ValaPropertyAccessor* _tmp910_; - ValaParameter* _tmp911_; - ValaParameter* _tmp912_; - gboolean _tmp913_; - gboolean _tmp914_; - _tmp910_ = acc; - _tmp911_ = vala_property_accessor_get_value_parameter (_tmp910_); - _tmp912_ = _tmp911_; - _tmp913_ = vala_parameter_get_captured (_tmp912_); - _tmp914_ = _tmp913_; - _tmp906_ = !_tmp914_; - } else { - _tmp906_ = FALSE; - } - _tmp915_ = _tmp906_; - if (_tmp915_) { - ValaPropertyAccessor* _tmp916_; - ValaParameter* _tmp917_; - ValaParameter* _tmp918_; - ValaDataType* _tmp919_; - ValaDataType* _tmp920_; - gboolean _tmp921_ = FALSE; - _tmp916_ = acc; - _tmp917_ = vala_property_accessor_get_value_parameter (_tmp916_); - _tmp918_ = _tmp917_; - _tmp919_ = vala_variable_get_variable_type ((ValaVariable*) _tmp918_); - _tmp920_ = _tmp919_; - _tmp921_ = vala_ccode_base_module_requires_destroy (self, _tmp920_); - _tmp905_ = _tmp921_; - } else { - _tmp905_ = FALSE; - } - _tmp922_ = _tmp905_; - if (_tmp922_) { - ValaCCodeFunction* _tmp923_; - ValaCCodeFunction* _tmp924_; - ValaPropertyAccessor* _tmp925_; - ValaParameter* _tmp926_; - ValaParameter* _tmp927_; - ValaCCodeExpression* _tmp928_ = NULL; - ValaCCodeExpression* _tmp929_; - _tmp923_ = vala_ccode_base_module_get_ccode (self); - _tmp924_ = _tmp923_; - _tmp925_ = acc; - _tmp926_ = vala_property_accessor_get_value_parameter (_tmp925_); - _tmp927_ = _tmp926_; - _tmp928_ = vala_ccode_base_module_destroy_parameter (self, _tmp927_); + gboolean _tmp916_ = FALSE; + gboolean _tmp917_ = FALSE; + ValaPropertyAccessor* _tmp918_; + ValaParameter* _tmp919_; + ValaParameter* _tmp920_; + gboolean _tmp926_; + gboolean _tmp933_; + _tmp912_ = b; + _tmp913_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp912_); + _tmp914_ = _tmp913_; + _tmp915_ = _vala_code_node_ref0 (VALA_PROPERTY_ACCESSOR (_tmp914_)); + acc = _tmp915_; + _tmp918_ = acc; + _tmp919_ = vala_property_accessor_get_value_parameter (_tmp918_); + _tmp920_ = _tmp919_; + if (_tmp920_ != NULL) { + ValaPropertyAccessor* _tmp921_; + ValaParameter* _tmp922_; + ValaParameter* _tmp923_; + gboolean _tmp924_; + gboolean _tmp925_; + _tmp921_ = acc; + _tmp922_ = vala_property_accessor_get_value_parameter (_tmp921_); + _tmp923_ = _tmp922_; + _tmp924_ = vala_parameter_get_captured (_tmp923_); + _tmp925_ = _tmp924_; + _tmp917_ = !_tmp925_; + } else { + _tmp917_ = FALSE; + } + _tmp926_ = _tmp917_; + if (_tmp926_) { + ValaPropertyAccessor* _tmp927_; + ValaParameter* _tmp928_; + ValaParameter* _tmp929_; + ValaDataType* _tmp930_; + ValaDataType* _tmp931_; + gboolean _tmp932_ = FALSE; + _tmp927_ = acc; + _tmp928_ = vala_property_accessor_get_value_parameter (_tmp927_); _tmp929_ = _tmp928_; - vala_ccode_function_add_expression (_tmp924_, _tmp929_); - _vala_ccode_node_unref0 (_tmp929_); + _tmp930_ = vala_variable_get_variable_type ((ValaVariable*) _tmp929_); + _tmp931_ = _tmp930_; + _tmp932_ = vala_ccode_base_module_requires_destroy (self, _tmp931_); + _tmp916_ = _tmp932_; + } else { + _tmp916_ = FALSE; + } + _tmp933_ = _tmp916_; + if (_tmp933_) { + ValaCCodeFunction* _tmp934_; + ValaCCodeFunction* _tmp935_; + ValaPropertyAccessor* _tmp936_; + ValaParameter* _tmp937_; + ValaParameter* _tmp938_; + ValaCCodeExpression* _tmp939_ = NULL; + ValaCCodeExpression* _tmp940_; + _tmp934_ = vala_ccode_base_module_get_ccode (self); + _tmp935_ = _tmp934_; + _tmp936_ = acc; + _tmp937_ = vala_property_accessor_get_value_parameter (_tmp936_); + _tmp938_ = _tmp937_; + _tmp939_ = vala_ccode_base_module_destroy_parameter (self, _tmp938_); + _tmp940_ = _tmp939_; + vala_ccode_function_add_expression (_tmp935_, _tmp940_); + _vala_ccode_node_unref0 (_tmp940_); } _vala_code_node_unref0 (acc); } } - _tmp930_ = b; - _tmp931_ = vala_block_get_captured (_tmp930_); - _tmp932_ = _tmp931_; - if (_tmp932_) { - ValaBlock* _tmp933_; - gint _tmp934_ = 0; + _tmp941_ = b; + _tmp942_ = vala_block_get_captured (_tmp941_); + _tmp943_ = _tmp942_; + if (_tmp943_) { + ValaBlock* _tmp944_; + gint _tmp945_ = 0; gint block_id; - gint _tmp935_; - gchar* _tmp936_ = NULL; - gchar* _tmp937_; - ValaCCodeIdentifier* _tmp938_; - ValaCCodeIdentifier* _tmp939_; - ValaCCodeFunctionCall* _tmp940_; - ValaCCodeFunctionCall* _tmp941_; + gint _tmp946_; + gchar* _tmp947_ = NULL; + gchar* _tmp948_; + ValaCCodeIdentifier* _tmp949_; + ValaCCodeIdentifier* _tmp950_; + ValaCCodeFunctionCall* _tmp951_; + ValaCCodeFunctionCall* _tmp952_; ValaCCodeFunctionCall* data_unref; - ValaCCodeFunctionCall* _tmp942_; - gint _tmp943_; - gchar* _tmp944_ = NULL; - gchar* _tmp945_; - ValaCCodeExpression* _tmp946_ = NULL; - ValaCCodeExpression* _tmp947_; - ValaCCodeFunction* _tmp948_; - ValaCCodeFunction* _tmp949_; - ValaCCodeFunctionCall* _tmp950_; - ValaCCodeFunction* _tmp951_; - ValaCCodeFunction* _tmp952_; - gint _tmp953_; - gchar* _tmp954_ = NULL; - gchar* _tmp955_; - ValaCCodeExpression* _tmp956_ = NULL; - ValaCCodeExpression* _tmp957_; - ValaCCodeConstant* _tmp958_; - ValaCCodeConstant* _tmp959_; - _tmp933_ = b; - _tmp934_ = vala_ccode_base_module_get_block_id (self, _tmp933_); - block_id = _tmp934_; - _tmp935_ = block_id; - _tmp936_ = g_strdup_printf ("block%d_data_unref", _tmp935_); - _tmp937_ = _tmp936_; - _tmp938_ = vala_ccode_identifier_new (_tmp937_); - _tmp939_ = _tmp938_; - _tmp940_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp939_); - _tmp941_ = _tmp940_; - _vala_ccode_node_unref0 (_tmp939_); - _g_free0 (_tmp937_); - data_unref = _tmp941_; - _tmp942_ = data_unref; - _tmp943_ = block_id; - _tmp944_ = g_strdup_printf ("_data%d_", _tmp943_); - _tmp945_ = _tmp944_; - _tmp946_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp945_); - _tmp947_ = _tmp946_; - vala_ccode_function_call_add_argument (_tmp942_, _tmp947_); - _vala_ccode_node_unref0 (_tmp947_); - _g_free0 (_tmp945_); - _tmp948_ = vala_ccode_base_module_get_ccode (self); - _tmp949_ = _tmp948_; - _tmp950_ = data_unref; - vala_ccode_function_add_expression (_tmp949_, (ValaCCodeExpression*) _tmp950_); - _tmp951_ = vala_ccode_base_module_get_ccode (self); + ValaCCodeFunctionCall* _tmp953_; + gint _tmp954_; + gchar* _tmp955_ = NULL; + gchar* _tmp956_; + ValaCCodeExpression* _tmp957_ = NULL; + ValaCCodeExpression* _tmp958_; + ValaCCodeFunction* _tmp959_; + ValaCCodeFunction* _tmp960_; + ValaCCodeFunctionCall* _tmp961_; + ValaCCodeFunction* _tmp962_; + ValaCCodeFunction* _tmp963_; + gint _tmp964_; + gchar* _tmp965_ = NULL; + gchar* _tmp966_; + ValaCCodeExpression* _tmp967_ = NULL; + ValaCCodeExpression* _tmp968_; + ValaCCodeConstant* _tmp969_; + ValaCCodeConstant* _tmp970_; + _tmp944_ = b; + _tmp945_ = vala_ccode_base_module_get_block_id (self, _tmp944_); + block_id = _tmp945_; + _tmp946_ = block_id; + _tmp947_ = g_strdup_printf ("block%d_data_unref", _tmp946_); + _tmp948_ = _tmp947_; + _tmp949_ = vala_ccode_identifier_new (_tmp948_); + _tmp950_ = _tmp949_; + _tmp951_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp950_); _tmp952_ = _tmp951_; - _tmp953_ = block_id; - _tmp954_ = g_strdup_printf ("_data%d_", _tmp953_); - _tmp955_ = _tmp954_; - _tmp956_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp955_); - _tmp957_ = _tmp956_; - _tmp958_ = vala_ccode_constant_new ("NULL"); - _tmp959_ = _tmp958_; - vala_ccode_function_add_assignment (_tmp952_, _tmp957_, (ValaCCodeExpression*) _tmp959_); - _vala_ccode_node_unref0 (_tmp959_); - _vala_ccode_node_unref0 (_tmp957_); - _g_free0 (_tmp955_); + _vala_ccode_node_unref0 (_tmp950_); + _g_free0 (_tmp948_); + data_unref = _tmp952_; + _tmp953_ = data_unref; + _tmp954_ = block_id; + _tmp955_ = g_strdup_printf ("_data%d_", _tmp954_); + _tmp956_ = _tmp955_; + _tmp957_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp956_); + _tmp958_ = _tmp957_; + vala_ccode_function_call_add_argument (_tmp953_, _tmp958_); + _vala_ccode_node_unref0 (_tmp958_); + _g_free0 (_tmp956_); + _tmp959_ = vala_ccode_base_module_get_ccode (self); + _tmp960_ = _tmp959_; + _tmp961_ = data_unref; + vala_ccode_function_add_expression (_tmp960_, (ValaCCodeExpression*) _tmp961_); + _tmp962_ = vala_ccode_base_module_get_ccode (self); + _tmp963_ = _tmp962_; + _tmp964_ = block_id; + _tmp965_ = g_strdup_printf ("_data%d_", _tmp964_); + _tmp966_ = _tmp965_; + _tmp967_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp966_); + _tmp968_ = _tmp967_; + _tmp969_ = vala_ccode_constant_new ("NULL"); + _tmp970_ = _tmp969_; + vala_ccode_function_add_assignment (_tmp963_, _tmp968_, (ValaCCodeExpression*) _tmp970_); + _vala_ccode_node_unref0 (_tmp970_); + _vala_ccode_node_unref0 (_tmp968_); + _g_free0 (_tmp966_); _vala_ccode_node_unref0 (data_unref); } - _tmp962_ = b; - _tmp963_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp962_); - _tmp964_ = _tmp963_; - if (VALA_IS_BLOCK (_tmp964_)) { - _tmp961_ = TRUE; - } else { - ValaBlock* _tmp965_; - ValaCodeNode* _tmp966_; - ValaCodeNode* _tmp967_; - _tmp965_ = b; - _tmp966_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp965_); - _tmp967_ = _tmp966_; - _tmp961_ = VALA_IS_SWITCH_STATEMENT (_tmp967_); - } - _tmp968_ = _tmp961_; - if (_tmp968_) { - _tmp960_ = TRUE; - } else { - ValaBlock* _tmp969_; - ValaCodeNode* _tmp970_; - ValaCodeNode* _tmp971_; - _tmp969_ = b; - _tmp970_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp969_); - _tmp971_ = _tmp970_; - _tmp960_ = VALA_IS_TRY_STATEMENT (_tmp971_); - } - _tmp972_ = _tmp960_; - if (_tmp972_) { - ValaCCodeFunction* _tmp973_; - ValaCCodeFunction* _tmp974_; - _tmp973_ = vala_ccode_base_module_get_ccode (self); - _tmp974_ = _tmp973_; - vala_ccode_function_close (_tmp974_); + _tmp973_ = b; + _tmp974_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp973_); + _tmp975_ = _tmp974_; + if (VALA_IS_BLOCK (_tmp975_)) { + _tmp972_ = TRUE; + } else { + ValaBlock* _tmp976_; + ValaCodeNode* _tmp977_; + ValaCodeNode* _tmp978_; + _tmp976_ = b; + _tmp977_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp976_); + _tmp978_ = _tmp977_; + _tmp972_ = VALA_IS_SWITCH_STATEMENT (_tmp978_); + } + _tmp979_ = _tmp972_; + if (_tmp979_) { + _tmp971_ = TRUE; + } else { + ValaBlock* _tmp980_; + ValaCodeNode* _tmp981_; + ValaCodeNode* _tmp982_; + _tmp980_ = b; + _tmp981_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp980_); + _tmp982_ = _tmp981_; + _tmp971_ = VALA_IS_TRY_STATEMENT (_tmp982_); + } + _tmp983_ = _tmp971_; + if (_tmp983_) { + ValaCCodeFunction* _tmp984_; + ValaCCodeFunction* _tmp985_; + _tmp984_ = vala_ccode_base_module_get_ccode (self); + _tmp985_ = _tmp984_; + vala_ccode_function_close (_tmp985_); } - _tmp975_ = self->emit_context; - vala_ccode_base_module_emit_context_pop_symbol (_tmp975_); + _tmp986_ = self->emit_context; + vala_ccode_base_module_emit_context_pop_symbol (_tmp986_); _vala_iterable_unref0 (local_vars); } @@ -13888,13 +13898,13 @@ ValaTypeSymbol* _tmp9_; ValaStruct* _tmp10_; ValaStruct* st; - gboolean _tmp11_ = FALSE; - gboolean _tmp12_ = FALSE; - ValaInitializerList* _tmp13_; - ValaCodeNode* _tmp14_; - ValaCodeNode* _tmp15_; - gboolean _tmp19_; - gboolean _tmp23_; + gboolean _tmp18_ = FALSE; + gboolean _tmp19_ = FALSE; + ValaInitializerList* _tmp20_; + ValaCodeNode* _tmp21_; + ValaCodeNode* _tmp22_; + gboolean _tmp26_; + gboolean _tmp30_; _tmp5_ = list; _tmp6_ = vala_expression_get_target_type ((ValaExpression*) _tmp5_); _tmp7_ = _tmp6_; @@ -13902,225 +13912,246 @@ _tmp9_ = _tmp8_; _tmp10_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp9_)); st = _tmp10_; - _tmp13_ = list; - _tmp14_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp13_); - _tmp15_ = _tmp14_; - if (VALA_IS_CONSTANT (_tmp15_)) { - _tmp12_ = TRUE; + while (TRUE) { + ValaStruct* _tmp11_; + ValaStruct* _tmp12_; + ValaStruct* _tmp13_; + ValaStruct* _tmp14_; + ValaStruct* _tmp15_; + ValaStruct* _tmp16_; + ValaStruct* _tmp17_; + _tmp11_ = st; + _tmp12_ = vala_struct_get_base_struct (_tmp11_); + _tmp13_ = _tmp12_; + if (!(_tmp13_ != NULL)) { + break; + } + _tmp14_ = st; + _tmp15_ = vala_struct_get_base_struct (_tmp14_); + _tmp16_ = _tmp15_; + _tmp17_ = _vala_code_node_ref0 (_tmp16_); + _vala_code_node_unref0 (st); + st = _tmp17_; + } + _tmp20_ = list; + _tmp21_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp20_); + _tmp22_ = _tmp21_; + if (VALA_IS_CONSTANT (_tmp22_)) { + _tmp19_ = TRUE; } else { - ValaInitializerList* _tmp16_; - ValaCodeNode* _tmp17_; - ValaCodeNode* _tmp18_; - _tmp16_ = list; - _tmp17_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp16_); - _tmp18_ = _tmp17_; - _tmp12_ = VALA_IS_FIELD (_tmp18_); + ValaInitializerList* _tmp23_; + ValaCodeNode* _tmp24_; + ValaCodeNode* _tmp25_; + _tmp23_ = list; + _tmp24_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp23_); + _tmp25_ = _tmp24_; + _tmp19_ = VALA_IS_FIELD (_tmp25_); } - _tmp19_ = _tmp12_; - if (_tmp19_) { - _tmp11_ = TRUE; + _tmp26_ = _tmp19_; + if (_tmp26_) { + _tmp18_ = TRUE; } else { - ValaInitializerList* _tmp20_; - ValaCodeNode* _tmp21_; - ValaCodeNode* _tmp22_; - _tmp20_ = list; - _tmp21_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp20_); - _tmp22_ = _tmp21_; - _tmp11_ = VALA_IS_INITIALIZER_LIST (_tmp22_); + ValaInitializerList* _tmp27_; + ValaCodeNode* _tmp28_; + ValaCodeNode* _tmp29_; + _tmp27_ = list; + _tmp28_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp27_); + _tmp29_ = _tmp28_; + _tmp18_ = VALA_IS_INITIALIZER_LIST (_tmp29_); } - _tmp23_ = _tmp11_; - if (_tmp23_) { - ValaCCodeInitializerList* _tmp24_; + _tmp30_ = _tmp18_; + if (_tmp30_) { + ValaCCodeInitializerList* _tmp31_; ValaCCodeInitializerList* clist; - ValaStruct* _tmp25_; - ValaList* _tmp26_ = NULL; - ValaList* _tmp27_; - ValaIterator* _tmp28_ = NULL; - ValaIterator* _tmp29_; + ValaStruct* _tmp32_; + ValaList* _tmp33_ = NULL; + ValaList* _tmp34_; + ValaIterator* _tmp35_ = NULL; + ValaIterator* _tmp36_; ValaIterator* field_it; - ValaInitializerList* _tmp85_; - ValaCCodeInitializerList* _tmp86_; - _tmp24_ = vala_ccode_initializer_list_new (); - clist = _tmp24_; - _tmp25_ = st; - _tmp26_ = vala_struct_get_fields (_tmp25_); - _tmp27_ = _tmp26_; - _tmp28_ = vala_iterable_iterator ((ValaIterable*) _tmp27_); - _tmp29_ = _tmp28_; - _vala_iterable_unref0 (_tmp27_); - field_it = _tmp29_; + ValaInitializerList* _tmp92_; + ValaCCodeInitializerList* _tmp93_; + _tmp31_ = vala_ccode_initializer_list_new (); + clist = _tmp31_; + _tmp32_ = st; + _tmp33_ = vala_struct_get_fields (_tmp32_); + _tmp34_ = _tmp33_; + _tmp35_ = vala_iterable_iterator ((ValaIterable*) _tmp34_); + _tmp36_ = _tmp35_; + _vala_iterable_unref0 (_tmp34_); + field_it = _tmp36_; { - ValaInitializerList* _tmp30_; - ValaList* _tmp31_ = NULL; + ValaInitializerList* _tmp37_; + ValaList* _tmp38_ = NULL; ValaList* _expr_list; - ValaList* _tmp32_; - gint _tmp33_; - gint _tmp34_; + ValaList* _tmp39_; + gint _tmp40_; + gint _tmp41_; gint _expr_size; gint _expr_index; - _tmp30_ = list; - _tmp31_ = vala_initializer_list_get_initializers (_tmp30_); - _expr_list = _tmp31_; - _tmp32_ = _expr_list; - _tmp33_ = vala_collection_get_size ((ValaCollection*) _tmp32_); - _tmp34_ = _tmp33_; - _expr_size = _tmp34_; + _tmp37_ = list; + _tmp38_ = vala_initializer_list_get_initializers (_tmp37_); + _expr_list = _tmp38_; + _tmp39_ = _expr_list; + _tmp40_ = vala_collection_get_size ((ValaCollection*) _tmp39_); + _tmp41_ = _tmp40_; + _expr_size = _tmp41_; _expr_index = -1; while (TRUE) { - gint _tmp35_; - gint _tmp36_; - gint _tmp37_; - ValaList* _tmp38_; - gint _tmp39_; - gpointer _tmp40_ = NULL; + gint _tmp42_; + gint _tmp43_; + gint _tmp44_; + ValaList* _tmp45_; + gint _tmp46_; + gpointer _tmp47_ = NULL; ValaExpression* expr; ValaField* field; - ValaExpression* _tmp48_; - ValaCCodeExpression* _tmp49_ = NULL; + ValaExpression* _tmp55_; + ValaCCodeExpression* _tmp56_ = NULL; ValaCCodeExpression* cexpr; - ValaField* _tmp50_; - gchar* _tmp51_ = NULL; + ValaField* _tmp57_; + gchar* _tmp58_ = NULL; gchar* ctype; - const gchar* _tmp52_; - ValaCCodeInitializerList* _tmp56_; - ValaCCodeExpression* _tmp57_; - ValaField* _tmp58_; - ValaDataType* _tmp59_; - ValaDataType* _tmp60_; - ValaArrayType* _tmp61_; + const gchar* _tmp59_; + ValaCCodeInitializerList* _tmp63_; + ValaCCodeExpression* _tmp64_; + ValaField* _tmp65_; + ValaDataType* _tmp66_; + ValaDataType* _tmp67_; + ValaArrayType* _tmp68_; ValaArrayType* array_type; - gboolean _tmp62_ = FALSE; - gboolean _tmp63_ = FALSE; - ValaArrayType* _tmp64_; - gboolean _tmp67_; - gboolean _tmp70_; - _tmp35_ = _expr_index; - _expr_index = _tmp35_ + 1; - _tmp36_ = _expr_index; - _tmp37_ = _expr_size; - if (!(_tmp36_ < _tmp37_)) { + gboolean _tmp69_ = FALSE; + gboolean _tmp70_ = FALSE; + ValaArrayType* _tmp71_; + gboolean _tmp74_; + gboolean _tmp77_; + _tmp42_ = _expr_index; + _expr_index = _tmp42_ + 1; + _tmp43_ = _expr_index; + _tmp44_ = _expr_size; + if (!(_tmp43_ < _tmp44_)) { break; } - _tmp38_ = _expr_list; - _tmp39_ = _expr_index; - _tmp40_ = vala_list_get (_tmp38_, _tmp39_); - expr = (ValaExpression*) _tmp40_; + _tmp45_ = _expr_list; + _tmp46_ = _expr_index; + _tmp47_ = vala_list_get (_tmp45_, _tmp46_); + expr = (ValaExpression*) _tmp47_; field = NULL; while (TRUE) { - ValaField* _tmp41_; - ValaIterator* _tmp42_; - ValaIterator* _tmp43_; - gpointer _tmp44_ = NULL; - ValaField* _tmp45_; - ValaMemberBinding _tmp46_; - ValaMemberBinding _tmp47_; - _tmp41_ = field; - if (!(_tmp41_ == NULL)) { + ValaField* _tmp48_; + ValaIterator* _tmp49_; + ValaIterator* _tmp50_; + gpointer _tmp51_ = NULL; + ValaField* _tmp52_; + ValaMemberBinding _tmp53_; + ValaMemberBinding _tmp54_; + _tmp48_ = field; + if (!(_tmp48_ == NULL)) { break; } - _tmp42_ = field_it; - vala_iterator_next (_tmp42_); - _tmp43_ = field_it; - _tmp44_ = vala_iterator_get (_tmp43_); + _tmp49_ = field_it; + vala_iterator_next (_tmp49_); + _tmp50_ = field_it; + _tmp51_ = vala_iterator_get (_tmp50_); _vala_code_node_unref0 (field); - field = (ValaField*) _tmp44_; - _tmp45_ = field; - _tmp46_ = vala_field_get_binding (_tmp45_); - _tmp47_ = _tmp46_; - if (_tmp47_ != VALA_MEMBER_BINDING_INSTANCE) { + field = (ValaField*) _tmp51_; + _tmp52_ = field; + _tmp53_ = vala_field_get_binding (_tmp52_); + _tmp54_ = _tmp53_; + if (_tmp54_ != VALA_MEMBER_BINDING_INSTANCE) { _vala_code_node_unref0 (field); field = NULL; } } - _tmp48_ = expr; - _tmp49_ = vala_ccode_base_module_get_cvalue (self, _tmp48_); - cexpr = _tmp49_; - _tmp50_ = field; - _tmp51_ = vala_ccode_base_module_get_ccode_type ((ValaCodeNode*) _tmp50_); - ctype = _tmp51_; - _tmp52_ = ctype; - if (_tmp52_ != NULL) { - ValaCCodeExpression* _tmp53_; - const gchar* _tmp54_; - ValaCCodeCastExpression* _tmp55_; - _tmp53_ = cexpr; - _tmp54_ = ctype; - _tmp55_ = vala_ccode_cast_expression_new (_tmp53_, _tmp54_); + _tmp55_ = expr; + _tmp56_ = vala_ccode_base_module_get_cvalue (self, _tmp55_); + cexpr = _tmp56_; + _tmp57_ = field; + _tmp58_ = vala_ccode_base_module_get_ccode_type ((ValaCodeNode*) _tmp57_); + ctype = _tmp58_; + _tmp59_ = ctype; + if (_tmp59_ != NULL) { + ValaCCodeExpression* _tmp60_; + const gchar* _tmp61_; + ValaCCodeCastExpression* _tmp62_; + _tmp60_ = cexpr; + _tmp61_ = ctype; + _tmp62_ = vala_ccode_cast_expression_new (_tmp60_, _tmp61_); _vala_ccode_node_unref0 (cexpr); - cexpr = (ValaCCodeExpression*) _tmp55_; + cexpr = (ValaCCodeExpression*) _tmp62_; } - _tmp56_ = clist; - _tmp57_ = cexpr; - vala_ccode_initializer_list_append (_tmp56_, _tmp57_); - _tmp58_ = field; - _tmp59_ = vala_variable_get_variable_type ((ValaVariable*) _tmp58_); - _tmp60_ = _tmp59_; - _tmp61_ = _vala_code_node_ref0 (VALA_IS_ARRAY_TYPE (_tmp60_) ? ((ValaArrayType*) _tmp60_) : NULL); - array_type = _tmp61_; - _tmp64_ = array_type; - if (_tmp64_ != NULL) { - ValaField* _tmp65_; - gboolean _tmp66_ = FALSE; - _tmp65_ = field; - _tmp66_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp65_); - _tmp63_ = _tmp66_; + _tmp63_ = clist; + _tmp64_ = cexpr; + vala_ccode_initializer_list_append (_tmp63_, _tmp64_); + _tmp65_ = field; + _tmp66_ = vala_variable_get_variable_type ((ValaVariable*) _tmp65_); + _tmp67_ = _tmp66_; + _tmp68_ = _vala_code_node_ref0 (VALA_IS_ARRAY_TYPE (_tmp67_) ? ((ValaArrayType*) _tmp67_) : NULL); + array_type = _tmp68_; + _tmp71_ = array_type; + if (_tmp71_ != NULL) { + ValaField* _tmp72_; + gboolean _tmp73_ = FALSE; + _tmp72_ = field; + _tmp73_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp72_); + _tmp70_ = _tmp73_; } else { - _tmp63_ = FALSE; + _tmp70_ = FALSE; } - _tmp67_ = _tmp63_; - if (_tmp67_) { - ValaField* _tmp68_; - gboolean _tmp69_ = FALSE; - _tmp68_ = field; - _tmp69_ = vala_ccode_base_module_get_ccode_array_null_terminated ((ValaCodeNode*) _tmp68_); - _tmp62_ = !_tmp69_; + _tmp74_ = _tmp70_; + if (_tmp74_) { + ValaField* _tmp75_; + gboolean _tmp76_ = FALSE; + _tmp75_ = field; + _tmp76_ = vala_ccode_base_module_get_ccode_array_null_terminated ((ValaCodeNode*) _tmp75_); + _tmp69_ = !_tmp76_; } else { - _tmp62_ = FALSE; + _tmp69_ = FALSE; } - _tmp70_ = _tmp62_; - if (_tmp70_) { + _tmp77_ = _tmp69_; + if (_tmp77_) { { gint dim; dim = 1; { - gboolean _tmp71_; - _tmp71_ = TRUE; + gboolean _tmp78_; + _tmp78_ = TRUE; while (TRUE) { - gboolean _tmp72_; - gint _tmp74_; - ValaArrayType* _tmp75_; - gint _tmp76_; - gint _tmp77_; - ValaCCodeInitializerList* _tmp78_; - ValaExpression* _tmp79_; - ValaTargetValue* _tmp80_; - ValaTargetValue* _tmp81_; - gint _tmp82_; - ValaCCodeExpression* _tmp83_ = NULL; - ValaCCodeExpression* _tmp84_; - _tmp72_ = _tmp71_; - if (!_tmp72_) { - gint _tmp73_; - _tmp73_ = dim; - dim = _tmp73_ + 1; + gboolean _tmp79_; + gint _tmp81_; + ValaArrayType* _tmp82_; + gint _tmp83_; + gint _tmp84_; + ValaCCodeInitializerList* _tmp85_; + ValaExpression* _tmp86_; + ValaTargetValue* _tmp87_; + ValaTargetValue* _tmp88_; + gint _tmp89_; + ValaCCodeExpression* _tmp90_ = NULL; + ValaCCodeExpression* _tmp91_; + _tmp79_ = _tmp78_; + if (!_tmp79_) { + gint _tmp80_; + _tmp80_ = dim; + dim = _tmp80_ + 1; } - _tmp71_ = FALSE; - _tmp74_ = dim; - _tmp75_ = array_type; - _tmp76_ = vala_array_type_get_rank (_tmp75_); - _tmp77_ = _tmp76_; - if (!(_tmp74_ <= _tmp77_)) { + _tmp78_ = FALSE; + _tmp81_ = dim; + _tmp82_ = array_type; + _tmp83_ = vala_array_type_get_rank (_tmp82_); + _tmp84_ = _tmp83_; + if (!(_tmp81_ <= _tmp84_)) { break; } - _tmp78_ = clist; - _tmp79_ = expr; - _tmp80_ = vala_expression_get_target_value (_tmp79_); - _tmp81_ = _tmp80_; - _tmp82_ = dim; - _tmp83_ = vala_ccode_base_module_get_array_length_cvalue (self, _tmp81_, _tmp82_); - _tmp84_ = _tmp83_; - vala_ccode_initializer_list_append (_tmp78_, _tmp84_); - _vala_ccode_node_unref0 (_tmp84_); + _tmp85_ = clist; + _tmp86_ = expr; + _tmp87_ = vala_expression_get_target_value (_tmp86_); + _tmp88_ = _tmp87_; + _tmp89_ = dim; + _tmp90_ = vala_ccode_base_module_get_array_length_cvalue (self, _tmp88_, _tmp89_); + _tmp91_ = _tmp90_; + vala_ccode_initializer_list_append (_tmp85_, _tmp91_); + _vala_ccode_node_unref0 (_tmp91_); } } } @@ -14133,186 +14164,186 @@ } _vala_iterable_unref0 (_expr_list); } - _tmp85_ = list; - _tmp86_ = clist; - vala_ccode_base_module_set_cvalue (self, (ValaExpression*) _tmp85_, (ValaCCodeExpression*) _tmp86_); + _tmp92_ = list; + _tmp93_ = clist; + vala_ccode_base_module_set_cvalue (self, (ValaExpression*) _tmp92_, (ValaCCodeExpression*) _tmp93_); _vala_iterator_unref0 (field_it); _vala_ccode_node_unref0 (clist); } else { - ValaInitializerList* _tmp87_; - ValaDataType* _tmp88_; - ValaDataType* _tmp89_; - ValaInitializerList* _tmp90_; - ValaTargetValue* _tmp91_ = NULL; + ValaInitializerList* _tmp94_; + ValaDataType* _tmp95_; + ValaDataType* _tmp96_; + ValaInitializerList* _tmp97_; + ValaTargetValue* _tmp98_ = NULL; ValaTargetValue* instance; - ValaStruct* _tmp92_; - ValaList* _tmp93_ = NULL; - ValaList* _tmp94_; - ValaIterator* _tmp95_ = NULL; - ValaIterator* _tmp96_; + ValaStruct* _tmp99_; + ValaList* _tmp100_ = NULL; + ValaList* _tmp101_; + ValaIterator* _tmp102_ = NULL; + ValaIterator* _tmp103_; ValaIterator* field_it; - ValaInitializerList* _tmp120_; - ValaTargetValue* _tmp121_; - _tmp87_ = list; - _tmp88_ = vala_expression_get_value_type ((ValaExpression*) _tmp87_); - _tmp89_ = _tmp88_; - _tmp90_ = list; - _tmp91_ = vala_ccode_base_module_create_temp_value (self, _tmp89_, TRUE, (ValaCodeNode*) _tmp90_, NULL); - instance = _tmp91_; - _tmp92_ = st; - _tmp93_ = vala_struct_get_fields (_tmp92_); - _tmp94_ = _tmp93_; - _tmp95_ = vala_iterable_iterator ((ValaIterable*) _tmp94_); + ValaInitializerList* _tmp127_; + ValaTargetValue* _tmp128_; + _tmp94_ = list; + _tmp95_ = vala_expression_get_value_type ((ValaExpression*) _tmp94_); _tmp96_ = _tmp95_; - _vala_iterable_unref0 (_tmp94_); - field_it = _tmp96_; + _tmp97_ = list; + _tmp98_ = vala_ccode_base_module_create_temp_value (self, _tmp96_, TRUE, (ValaCodeNode*) _tmp97_, NULL); + instance = _tmp98_; + _tmp99_ = st; + _tmp100_ = vala_struct_get_fields (_tmp99_); + _tmp101_ = _tmp100_; + _tmp102_ = vala_iterable_iterator ((ValaIterable*) _tmp101_); + _tmp103_ = _tmp102_; + _vala_iterable_unref0 (_tmp101_); + field_it = _tmp103_; { - ValaInitializerList* _tmp97_; - ValaList* _tmp98_ = NULL; + ValaInitializerList* _tmp104_; + ValaList* _tmp105_ = NULL; ValaList* _expr_list; - ValaList* _tmp99_; - gint _tmp100_; - gint _tmp101_; + ValaList* _tmp106_; + gint _tmp107_; + gint _tmp108_; gint _expr_size; gint _expr_index; - _tmp97_ = list; - _tmp98_ = vala_initializer_list_get_initializers (_tmp97_); - _expr_list = _tmp98_; - _tmp99_ = _expr_list; - _tmp100_ = vala_collection_get_size ((ValaCollection*) _tmp99_); - _tmp101_ = _tmp100_; - _expr_size = _tmp101_; + _tmp104_ = list; + _tmp105_ = vala_initializer_list_get_initializers (_tmp104_); + _expr_list = _tmp105_; + _tmp106_ = _expr_list; + _tmp107_ = vala_collection_get_size ((ValaCollection*) _tmp106_); + _tmp108_ = _tmp107_; + _expr_size = _tmp108_; _expr_index = -1; while (TRUE) { - gint _tmp102_; - gint _tmp103_; - gint _tmp104_; - ValaList* _tmp105_; - gint _tmp106_; - gpointer _tmp107_ = NULL; + gint _tmp109_; + gint _tmp110_; + gint _tmp111_; + ValaList* _tmp112_; + gint _tmp113_; + gpointer _tmp114_ = NULL; ValaExpression* expr; ValaField* field; - ValaField* _tmp115_; - ValaTargetValue* _tmp116_; - ValaExpression* _tmp117_; - ValaTargetValue* _tmp118_; - ValaTargetValue* _tmp119_; - _tmp102_ = _expr_index; - _expr_index = _tmp102_ + 1; - _tmp103_ = _expr_index; - _tmp104_ = _expr_size; - if (!(_tmp103_ < _tmp104_)) { + ValaField* _tmp122_; + ValaTargetValue* _tmp123_; + ValaExpression* _tmp124_; + ValaTargetValue* _tmp125_; + ValaTargetValue* _tmp126_; + _tmp109_ = _expr_index; + _expr_index = _tmp109_ + 1; + _tmp110_ = _expr_index; + _tmp111_ = _expr_size; + if (!(_tmp110_ < _tmp111_)) { break; } - _tmp105_ = _expr_list; - _tmp106_ = _expr_index; - _tmp107_ = vala_list_get (_tmp105_, _tmp106_); - expr = (ValaExpression*) _tmp107_; + _tmp112_ = _expr_list; + _tmp113_ = _expr_index; + _tmp114_ = vala_list_get (_tmp112_, _tmp113_); + expr = (ValaExpression*) _tmp114_; field = NULL; while (TRUE) { - ValaField* _tmp108_; - ValaIterator* _tmp109_; - ValaIterator* _tmp110_; - gpointer _tmp111_ = NULL; - ValaField* _tmp112_; - ValaMemberBinding _tmp113_; - ValaMemberBinding _tmp114_; - _tmp108_ = field; - if (!(_tmp108_ == NULL)) { + ValaField* _tmp115_; + ValaIterator* _tmp116_; + ValaIterator* _tmp117_; + gpointer _tmp118_ = NULL; + ValaField* _tmp119_; + ValaMemberBinding _tmp120_; + ValaMemberBinding _tmp121_; + _tmp115_ = field; + if (!(_tmp115_ == NULL)) { break; } - _tmp109_ = field_it; - vala_iterator_next (_tmp109_); - _tmp110_ = field_it; - _tmp111_ = vala_iterator_get (_tmp110_); + _tmp116_ = field_it; + vala_iterator_next (_tmp116_); + _tmp117_ = field_it; + _tmp118_ = vala_iterator_get (_tmp117_); _vala_code_node_unref0 (field); - field = (ValaField*) _tmp111_; - _tmp112_ = field; - _tmp113_ = vala_field_get_binding (_tmp112_); - _tmp114_ = _tmp113_; - if (_tmp114_ != VALA_MEMBER_BINDING_INSTANCE) { + field = (ValaField*) _tmp118_; + _tmp119_ = field; + _tmp120_ = vala_field_get_binding (_tmp119_); + _tmp121_ = _tmp120_; + if (_tmp121_ != VALA_MEMBER_BINDING_INSTANCE) { _vala_code_node_unref0 (field); field = NULL; } } - _tmp115_ = field; - _tmp116_ = instance; - _tmp117_ = expr; - _tmp118_ = vala_expression_get_target_value (_tmp117_); - _tmp119_ = _tmp118_; - vala_code_generator_store_field ((ValaCodeGenerator*) self, _tmp115_, _tmp116_, _tmp119_); + _tmp122_ = field; + _tmp123_ = instance; + _tmp124_ = expr; + _tmp125_ = vala_expression_get_target_value (_tmp124_); + _tmp126_ = _tmp125_; + vala_code_generator_store_field ((ValaCodeGenerator*) self, _tmp122_, _tmp123_, _tmp126_); _vala_code_node_unref0 (field); _vala_code_node_unref0 (expr); } _vala_iterable_unref0 (_expr_list); } - _tmp120_ = list; - _tmp121_ = instance; - vala_expression_set_target_value ((ValaExpression*) _tmp120_, _tmp121_); + _tmp127_ = list; + _tmp128_ = instance; + vala_expression_set_target_value ((ValaExpression*) _tmp127_, _tmp128_); _vala_iterator_unref0 (field_it); _vala_target_value_unref0 (instance); } _vala_code_node_unref0 (st); } else { - ValaCCodeInitializerList* _tmp122_; + ValaCCodeInitializerList* _tmp129_; ValaCCodeInitializerList* clist; - ValaInitializerList* _tmp138_; - ValaCCodeInitializerList* _tmp139_; - _tmp122_ = vala_ccode_initializer_list_new (); - clist = _tmp122_; + ValaInitializerList* _tmp145_; + ValaCCodeInitializerList* _tmp146_; + _tmp129_ = vala_ccode_initializer_list_new (); + clist = _tmp129_; { - ValaInitializerList* _tmp123_; - ValaList* _tmp124_ = NULL; + ValaInitializerList* _tmp130_; + ValaList* _tmp131_ = NULL; ValaList* _expr_list; - ValaList* _tmp125_; - gint _tmp126_; - gint _tmp127_; + ValaList* _tmp132_; + gint _tmp133_; + gint _tmp134_; gint _expr_size; gint _expr_index; - _tmp123_ = list; - _tmp124_ = vala_initializer_list_get_initializers (_tmp123_); - _expr_list = _tmp124_; - _tmp125_ = _expr_list; - _tmp126_ = vala_collection_get_size ((ValaCollection*) _tmp125_); - _tmp127_ = _tmp126_; - _expr_size = _tmp127_; + _tmp130_ = list; + _tmp131_ = vala_initializer_list_get_initializers (_tmp130_); + _expr_list = _tmp131_; + _tmp132_ = _expr_list; + _tmp133_ = vala_collection_get_size ((ValaCollection*) _tmp132_); + _tmp134_ = _tmp133_; + _expr_size = _tmp134_; _expr_index = -1; while (TRUE) { - gint _tmp128_; - gint _tmp129_; - gint _tmp130_; - ValaList* _tmp131_; - gint _tmp132_; - gpointer _tmp133_ = NULL; + gint _tmp135_; + gint _tmp136_; + gint _tmp137_; + ValaList* _tmp138_; + gint _tmp139_; + gpointer _tmp140_ = NULL; ValaExpression* expr; - ValaCCodeInitializerList* _tmp134_; - ValaExpression* _tmp135_; - ValaCCodeExpression* _tmp136_ = NULL; - ValaCCodeExpression* _tmp137_; - _tmp128_ = _expr_index; - _expr_index = _tmp128_ + 1; - _tmp129_ = _expr_index; - _tmp130_ = _expr_size; - if (!(_tmp129_ < _tmp130_)) { + ValaCCodeInitializerList* _tmp141_; + ValaExpression* _tmp142_; + ValaCCodeExpression* _tmp143_ = NULL; + ValaCCodeExpression* _tmp144_; + _tmp135_ = _expr_index; + _expr_index = _tmp135_ + 1; + _tmp136_ = _expr_index; + _tmp137_ = _expr_size; + if (!(_tmp136_ < _tmp137_)) { break; } - _tmp131_ = _expr_list; - _tmp132_ = _expr_index; - _tmp133_ = vala_list_get (_tmp131_, _tmp132_); - expr = (ValaExpression*) _tmp133_; - _tmp134_ = clist; - _tmp135_ = expr; - _tmp136_ = vala_ccode_base_module_get_cvalue (self, _tmp135_); - _tmp137_ = _tmp136_; - vala_ccode_initializer_list_append (_tmp134_, _tmp137_); - _vala_ccode_node_unref0 (_tmp137_); + _tmp138_ = _expr_list; + _tmp139_ = _expr_index; + _tmp140_ = vala_list_get (_tmp138_, _tmp139_); + expr = (ValaExpression*) _tmp140_; + _tmp141_ = clist; + _tmp142_ = expr; + _tmp143_ = vala_ccode_base_module_get_cvalue (self, _tmp142_); + _tmp144_ = _tmp143_; + vala_ccode_initializer_list_append (_tmp141_, _tmp144_); + _vala_ccode_node_unref0 (_tmp144_); _vala_code_node_unref0 (expr); } _vala_iterable_unref0 (_expr_list); } - _tmp138_ = list; - _tmp139_ = clist; - vala_ccode_base_module_set_cvalue (self, (ValaExpression*) _tmp138_, (ValaCCodeExpression*) _tmp139_); + _tmp145_ = list; + _tmp146_ = clist; + vala_ccode_base_module_set_cvalue (self, (ValaExpression*) _tmp145_, (ValaCCodeExpression*) _tmp146_); _vala_ccode_node_unref0 (clist); } } @@ -20187,25 +20218,25 @@ gboolean _tmp28_ = FALSE; ValaDelegateType* _tmp29_; gboolean _tmp35_; - ValaParameter* _tmp69_; - ValaDataType* _tmp70_; - ValaDataType* _tmp71_; - gboolean _tmp72_ = FALSE; - ValaCCodeFunction* _tmp85_; - ValaCCodeFunction* _tmp86_; - ValaParameter* _tmp87_; - ValaDataType* _tmp88_; - ValaDataType* _tmp89_; - ValaArrayType* _tmp90_; + ValaParameter* _tmp67_; + ValaDataType* _tmp68_; + ValaDataType* _tmp69_; + gboolean _tmp70_ = FALSE; + ValaCCodeFunction* _tmp83_; + ValaCCodeFunction* _tmp84_; + ValaParameter* _tmp85_; + ValaDataType* _tmp86_; + ValaDataType* _tmp87_; + ValaArrayType* _tmp88_; ValaArrayType* array_type; - gboolean _tmp91_ = FALSE; - gboolean _tmp92_ = FALSE; - ValaArrayType* _tmp93_; - gboolean _tmp97_; - gboolean _tmp100_; - ValaMethod* _tmp132_; - ValaMethod* _tmp133_; - gboolean _tmp134_; + gboolean _tmp89_ = FALSE; + gboolean _tmp90_ = FALSE; + ValaArrayType* _tmp91_; + gboolean _tmp95_; + gboolean _tmp98_; + ValaMethod* _tmp130_; + ValaMethod* _tmp131_; + gboolean _tmp132_; g_return_if_fail (self != NULL); g_return_if_fail (param != NULL); _tmp0_ = param; @@ -20267,241 +20298,237 @@ ValaCCodeFunction* _tmp36_; ValaCCodeFunction* _tmp37_; ValaParameter* _tmp38_; - const gchar* _tmp39_; - const gchar* _tmp40_; - gchar* _tmp41_ = NULL; - gchar* _tmp42_; - ValaCCodeExpression* _tmp43_ = NULL; - ValaCCodeExpression* _tmp44_; - ValaCCodeUnaryExpression* _tmp45_; - ValaCCodeUnaryExpression* _tmp46_; - ValaTargetValue* _tmp47_; - ValaCCodeExpression* _tmp48_ = NULL; - ValaCCodeExpression* _tmp49_; - ValaDelegateType* _tmp50_; - gboolean _tmp51_; - gboolean _tmp52_; + gchar* _tmp39_ = NULL; + gchar* _tmp40_; + ValaCCodeExpression* _tmp41_ = NULL; + ValaCCodeExpression* _tmp42_; + ValaCCodeUnaryExpression* _tmp43_; + ValaCCodeUnaryExpression* _tmp44_; + ValaTargetValue* _tmp45_; + ValaCCodeExpression* _tmp46_ = NULL; + ValaCCodeExpression* _tmp47_; + ValaDelegateType* _tmp48_; + gboolean _tmp49_; + gboolean _tmp50_; _tmp36_ = vala_ccode_base_module_get_ccode (self); _tmp37_ = _tmp36_; _tmp38_ = param; - _tmp39_ = vala_symbol_get_name ((ValaSymbol*) _tmp38_); + _tmp39_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp38_); _tmp40_ = _tmp39_; - _tmp41_ = vala_ccode_base_module_get_delegate_target_cname (self, _tmp40_); + _tmp41_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp40_); _tmp42_ = _tmp41_; - _tmp43_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp42_); + _tmp43_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp42_); _tmp44_ = _tmp43_; - _tmp45_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp44_); - _tmp46_ = _tmp45_; - _tmp47_ = value; - _tmp48_ = vala_ccode_base_module_get_delegate_target_cvalue (self, _tmp47_); - _tmp49_ = _tmp48_; - vala_ccode_function_add_assignment (_tmp37_, (ValaCCodeExpression*) _tmp46_, _tmp49_); - _vala_ccode_node_unref0 (_tmp49_); - _vala_ccode_node_unref0 (_tmp46_); + _tmp45_ = value; + _tmp46_ = vala_ccode_base_module_get_delegate_target_cvalue (self, _tmp45_); + _tmp47_ = _tmp46_; + vala_ccode_function_add_assignment (_tmp37_, (ValaCCodeExpression*) _tmp44_, _tmp47_); + _vala_ccode_node_unref0 (_tmp47_); _vala_ccode_node_unref0 (_tmp44_); - _g_free0 (_tmp42_); - _tmp50_ = delegate_type; - _tmp51_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp50_); - _tmp52_ = _tmp51_; - if (_tmp52_) { - ValaCCodeFunction* _tmp53_; - ValaCCodeFunction* _tmp54_; - ValaParameter* _tmp55_; - const gchar* _tmp56_; - const gchar* _tmp57_; - gchar* _tmp58_ = NULL; - gchar* _tmp59_; - ValaCCodeExpression* _tmp60_ = NULL; - ValaCCodeExpression* _tmp61_; - ValaCCodeUnaryExpression* _tmp62_; - ValaCCodeUnaryExpression* _tmp63_; - ValaParameter* _tmp64_; - ValaTargetValue* _tmp65_ = NULL; - ValaTargetValue* _tmp66_; - ValaCCodeExpression* _tmp67_ = NULL; - ValaCCodeExpression* _tmp68_; - _tmp53_ = vala_ccode_base_module_get_ccode (self); - _tmp54_ = _tmp53_; - _tmp55_ = param; - _tmp56_ = vala_symbol_get_name ((ValaSymbol*) _tmp55_); + _vala_ccode_node_unref0 (_tmp42_); + _g_free0 (_tmp40_); + _tmp48_ = delegate_type; + _tmp49_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp48_); + _tmp50_ = _tmp49_; + if (_tmp50_) { + ValaCCodeFunction* _tmp51_; + ValaCCodeFunction* _tmp52_; + ValaParameter* _tmp53_; + const gchar* _tmp54_; + const gchar* _tmp55_; + gchar* _tmp56_ = NULL; + gchar* _tmp57_; + ValaCCodeExpression* _tmp58_ = NULL; + ValaCCodeExpression* _tmp59_; + ValaCCodeUnaryExpression* _tmp60_; + ValaCCodeUnaryExpression* _tmp61_; + ValaParameter* _tmp62_; + ValaTargetValue* _tmp63_ = NULL; + ValaTargetValue* _tmp64_; + ValaCCodeExpression* _tmp65_ = NULL; + ValaCCodeExpression* _tmp66_; + _tmp51_ = vala_ccode_base_module_get_ccode (self); + _tmp52_ = _tmp51_; + _tmp53_ = param; + _tmp54_ = vala_symbol_get_name ((ValaSymbol*) _tmp53_); + _tmp55_ = _tmp54_; + _tmp56_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp55_); _tmp57_ = _tmp56_; - _tmp58_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname (self, _tmp57_); + _tmp58_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp57_); _tmp59_ = _tmp58_; - _tmp60_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp59_); + _tmp60_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp59_); _tmp61_ = _tmp60_; - _tmp62_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp61_); - _tmp63_ = _tmp62_; - _tmp64_ = param; - _tmp65_ = vala_ccode_base_module_get_parameter_cvalue (self, _tmp64_); + _tmp62_ = param; + _tmp63_ = vala_ccode_base_module_get_parameter_cvalue (self, _tmp62_); + _tmp64_ = _tmp63_; + _tmp65_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cvalue (self, _tmp64_); _tmp66_ = _tmp65_; - _tmp67_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cvalue (self, _tmp66_); - _tmp68_ = _tmp67_; - vala_ccode_function_add_assignment (_tmp54_, (ValaCCodeExpression*) _tmp63_, _tmp68_); - _vala_ccode_node_unref0 (_tmp68_); - _vala_target_value_unref0 (_tmp66_); - _vala_ccode_node_unref0 (_tmp63_); + vala_ccode_function_add_assignment (_tmp52_, (ValaCCodeExpression*) _tmp61_, _tmp66_); + _vala_ccode_node_unref0 (_tmp66_); + _vala_target_value_unref0 (_tmp64_); _vala_ccode_node_unref0 (_tmp61_); - _g_free0 (_tmp59_); + _vala_ccode_node_unref0 (_tmp59_); + _g_free0 (_tmp57_); } } - _tmp69_ = param; - _tmp70_ = vala_variable_get_variable_type ((ValaVariable*) _tmp69_); - _tmp71_ = _tmp70_; - _tmp72_ = vala_data_type_is_disposable (_tmp71_); - if (_tmp72_) { - ValaCCodeFunction* _tmp73_; - ValaCCodeFunction* _tmp74_; - ValaMethod* _tmp75_; - ValaMethod* _tmp76_; - gboolean _tmp77_; - ValaCCodeFunction* _tmp78_; - ValaCCodeFunction* _tmp79_; - ValaParameter* _tmp80_; - ValaCCodeExpression* _tmp81_ = NULL; - ValaCCodeExpression* _tmp82_; - ValaMethod* _tmp83_; - ValaMethod* _tmp84_; - _tmp73_ = vala_ccode_base_module_get_ccode (self); + _tmp67_ = param; + _tmp68_ = vala_variable_get_variable_type ((ValaVariable*) _tmp67_); + _tmp69_ = _tmp68_; + _tmp70_ = vala_data_type_is_disposable (_tmp69_); + if (_tmp70_) { + ValaCCodeFunction* _tmp71_; + ValaCCodeFunction* _tmp72_; + ValaMethod* _tmp73_; + ValaMethod* _tmp74_; + gboolean _tmp75_; + ValaCCodeFunction* _tmp76_; + ValaCCodeFunction* _tmp77_; + ValaParameter* _tmp78_; + ValaCCodeExpression* _tmp79_ = NULL; + ValaCCodeExpression* _tmp80_; + ValaMethod* _tmp81_; + ValaMethod* _tmp82_; + _tmp71_ = vala_ccode_base_module_get_ccode (self); + _tmp72_ = _tmp71_; + vala_ccode_function_add_else (_tmp72_); + _tmp73_ = vala_ccode_base_module_get_current_method (self); _tmp74_ = _tmp73_; - vala_ccode_function_add_else (_tmp74_); - _tmp75_ = vala_ccode_base_module_get_current_method (self); - _tmp76_ = _tmp75_; - _tmp77_ = old_coroutine; - vala_method_set_coroutine (_tmp76_, _tmp77_); - _tmp78_ = vala_ccode_base_module_get_ccode (self); - _tmp79_ = _tmp78_; - _tmp80_ = param; - _tmp81_ = vala_ccode_base_module_destroy_parameter (self, _tmp80_); + _tmp75_ = old_coroutine; + vala_method_set_coroutine (_tmp74_, _tmp75_); + _tmp76_ = vala_ccode_base_module_get_ccode (self); + _tmp77_ = _tmp76_; + _tmp78_ = param; + _tmp79_ = vala_ccode_base_module_destroy_parameter (self, _tmp78_); + _tmp80_ = _tmp79_; + vala_ccode_function_add_expression (_tmp77_, _tmp80_); + _vala_ccode_node_unref0 (_tmp80_); + _tmp81_ = vala_ccode_base_module_get_current_method (self); _tmp82_ = _tmp81_; - vala_ccode_function_add_expression (_tmp79_, _tmp82_); - _vala_ccode_node_unref0 (_tmp82_); - _tmp83_ = vala_ccode_base_module_get_current_method (self); - _tmp84_ = _tmp83_; - vala_method_set_coroutine (_tmp84_, FALSE); + vala_method_set_coroutine (_tmp82_, FALSE); } - _tmp85_ = vala_ccode_base_module_get_ccode (self); - _tmp86_ = _tmp85_; - vala_ccode_function_close (_tmp86_); - _tmp87_ = param; - _tmp88_ = vala_variable_get_variable_type ((ValaVariable*) _tmp87_); - _tmp89_ = _tmp88_; - _tmp90_ = _vala_code_node_ref0 (VALA_IS_ARRAY_TYPE (_tmp89_) ? ((ValaArrayType*) _tmp89_) : NULL); - array_type = _tmp90_; - _tmp93_ = array_type; - if (_tmp93_ != NULL) { - ValaArrayType* _tmp94_; - gboolean _tmp95_; - gboolean _tmp96_; - _tmp94_ = array_type; - _tmp95_ = vala_array_type_get_fixed_length (_tmp94_); - _tmp96_ = _tmp95_; - _tmp92_ = !_tmp96_; - } else { - _tmp92_ = FALSE; - } - _tmp97_ = _tmp92_; - if (_tmp97_) { - ValaParameter* _tmp98_; - gboolean _tmp99_ = FALSE; - _tmp98_ = param; - _tmp99_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp98_); - _tmp91_ = _tmp99_; + _tmp83_ = vala_ccode_base_module_get_ccode (self); + _tmp84_ = _tmp83_; + vala_ccode_function_close (_tmp84_); + _tmp85_ = param; + _tmp86_ = vala_variable_get_variable_type ((ValaVariable*) _tmp85_); + _tmp87_ = _tmp86_; + _tmp88_ = _vala_code_node_ref0 (VALA_IS_ARRAY_TYPE (_tmp87_) ? ((ValaArrayType*) _tmp87_) : NULL); + array_type = _tmp88_; + _tmp91_ = array_type; + if (_tmp91_ != NULL) { + ValaArrayType* _tmp92_; + gboolean _tmp93_; + gboolean _tmp94_; + _tmp92_ = array_type; + _tmp93_ = vala_array_type_get_fixed_length (_tmp92_); + _tmp94_ = _tmp93_; + _tmp90_ = !_tmp94_; } else { - _tmp91_ = FALSE; + _tmp90_ = FALSE; } - _tmp100_ = _tmp91_; - if (_tmp100_) { + _tmp95_ = _tmp90_; + if (_tmp95_) { + ValaParameter* _tmp96_; + gboolean _tmp97_ = FALSE; + _tmp96_ = param; + _tmp97_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp96_); + _tmp89_ = _tmp97_; + } else { + _tmp89_ = FALSE; + } + _tmp98_ = _tmp89_; + if (_tmp98_) { { gint dim; dim = 1; { - gboolean _tmp101_; - _tmp101_ = TRUE; + gboolean _tmp99_; + _tmp99_ = TRUE; while (TRUE) { - gboolean _tmp102_; + gboolean _tmp100_; + gint _tmp102_; + ValaArrayType* _tmp103_; gint _tmp104_; - ValaArrayType* _tmp105_; - gint _tmp106_; - gint _tmp107_; - ValaCCodeFunction* _tmp108_; - ValaCCodeFunction* _tmp109_; - ValaParameter* _tmp110_; - gint _tmp111_; - gchar* _tmp112_ = NULL; - gchar* _tmp113_; - ValaCCodeExpression* _tmp114_ = NULL; - ValaCCodeExpression* _tmp115_; - ValaCCodeFunction* _tmp116_; - ValaCCodeFunction* _tmp117_; - ValaParameter* _tmp118_; - gint _tmp119_; - gchar* _tmp120_ = NULL; - gchar* _tmp121_; - ValaCCodeExpression* _tmp122_ = NULL; - ValaCCodeExpression* _tmp123_; - ValaCCodeUnaryExpression* _tmp124_; - ValaCCodeUnaryExpression* _tmp125_; - ValaTargetValue* _tmp126_; - gint _tmp127_; - ValaCCodeExpression* _tmp128_ = NULL; - ValaCCodeExpression* _tmp129_; - ValaCCodeFunction* _tmp130_; - ValaCCodeFunction* _tmp131_; - _tmp102_ = _tmp101_; - if (!_tmp102_) { - gint _tmp103_; - _tmp103_ = dim; - dim = _tmp103_ + 1; - } - _tmp101_ = FALSE; - _tmp104_ = dim; - _tmp105_ = array_type; - _tmp106_ = vala_array_type_get_rank (_tmp105_); - _tmp107_ = _tmp106_; - if (!(_tmp104_ <= _tmp107_)) { + gint _tmp105_; + ValaCCodeFunction* _tmp106_; + ValaCCodeFunction* _tmp107_; + ValaParameter* _tmp108_; + gint _tmp109_; + gchar* _tmp110_ = NULL; + gchar* _tmp111_; + ValaCCodeExpression* _tmp112_ = NULL; + ValaCCodeExpression* _tmp113_; + ValaCCodeFunction* _tmp114_; + ValaCCodeFunction* _tmp115_; + ValaParameter* _tmp116_; + gint _tmp117_; + gchar* _tmp118_ = NULL; + gchar* _tmp119_; + ValaCCodeExpression* _tmp120_ = NULL; + ValaCCodeExpression* _tmp121_; + ValaCCodeUnaryExpression* _tmp122_; + ValaCCodeUnaryExpression* _tmp123_; + ValaTargetValue* _tmp124_; + gint _tmp125_; + ValaCCodeExpression* _tmp126_ = NULL; + ValaCCodeExpression* _tmp127_; + ValaCCodeFunction* _tmp128_; + ValaCCodeFunction* _tmp129_; + _tmp100_ = _tmp99_; + if (!_tmp100_) { + gint _tmp101_; + _tmp101_ = dim; + dim = _tmp101_ + 1; + } + _tmp99_ = FALSE; + _tmp102_ = dim; + _tmp103_ = array_type; + _tmp104_ = vala_array_type_get_rank (_tmp103_); + _tmp105_ = _tmp104_; + if (!(_tmp102_ <= _tmp105_)) { break; } - _tmp108_ = vala_ccode_base_module_get_ccode (self); - _tmp109_ = _tmp108_; - _tmp110_ = param; - _tmp111_ = dim; - _tmp112_ = vala_ccode_base_module_get_parameter_array_length_cname (self, _tmp110_, _tmp111_); + _tmp106_ = vala_ccode_base_module_get_ccode (self); + _tmp107_ = _tmp106_; + _tmp108_ = param; + _tmp109_ = dim; + _tmp110_ = vala_ccode_base_module_get_parameter_array_length_cname (self, _tmp108_, _tmp109_); + _tmp111_ = _tmp110_; + _tmp112_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp111_); _tmp113_ = _tmp112_; - _tmp114_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp113_); + vala_ccode_function_open_if (_tmp107_, _tmp113_); + _vala_ccode_node_unref0 (_tmp113_); + _g_free0 (_tmp111_); + _tmp114_ = vala_ccode_base_module_get_ccode (self); _tmp115_ = _tmp114_; - vala_ccode_function_open_if (_tmp109_, _tmp115_); - _vala_ccode_node_unref0 (_tmp115_); - _g_free0 (_tmp113_); - _tmp116_ = vala_ccode_base_module_get_ccode (self); - _tmp117_ = _tmp116_; - _tmp118_ = param; - _tmp119_ = dim; - _tmp120_ = vala_ccode_base_module_get_parameter_array_length_cname (self, _tmp118_, _tmp119_); + _tmp116_ = param; + _tmp117_ = dim; + _tmp118_ = vala_ccode_base_module_get_parameter_array_length_cname (self, _tmp116_, _tmp117_); + _tmp119_ = _tmp118_; + _tmp120_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp119_); _tmp121_ = _tmp120_; - _tmp122_ = vala_ccode_base_module_get_variable_cexpression (self, _tmp121_); + _tmp122_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp121_); _tmp123_ = _tmp122_; - _tmp124_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp123_); - _tmp125_ = _tmp124_; - _tmp126_ = value; - _tmp127_ = dim; - _tmp128_ = vala_ccode_base_module_get_array_length_cvalue (self, _tmp126_, _tmp127_); - _tmp129_ = _tmp128_; - vala_ccode_function_add_assignment (_tmp117_, (ValaCCodeExpression*) _tmp125_, _tmp129_); - _vala_ccode_node_unref0 (_tmp129_); - _vala_ccode_node_unref0 (_tmp125_); + _tmp124_ = value; + _tmp125_ = dim; + _tmp126_ = vala_ccode_base_module_get_array_length_cvalue (self, _tmp124_, _tmp125_); + _tmp127_ = _tmp126_; + vala_ccode_function_add_assignment (_tmp115_, (ValaCCodeExpression*) _tmp123_, _tmp127_); + _vala_ccode_node_unref0 (_tmp127_); _vala_ccode_node_unref0 (_tmp123_); - _g_free0 (_tmp121_); - _tmp130_ = vala_ccode_base_module_get_ccode (self); - _tmp131_ = _tmp130_; - vala_ccode_function_close (_tmp131_); + _vala_ccode_node_unref0 (_tmp121_); + _g_free0 (_tmp119_); + _tmp128_ = vala_ccode_base_module_get_ccode (self); + _tmp129_ = _tmp128_; + vala_ccode_function_close (_tmp129_); } } } } - _tmp132_ = vala_ccode_base_module_get_current_method (self); - _tmp133_ = _tmp132_; - _tmp134_ = old_coroutine; - vala_method_set_coroutine (_tmp133_, _tmp134_); + _tmp130_ = vala_ccode_base_module_get_current_method (self); + _tmp131_ = _tmp130_; + _tmp132_ = old_coroutine; + vala_method_set_coroutine (_tmp131_, _tmp132_); _vala_code_node_unref0 (array_type); _vala_target_value_unref0 (value); _vala_code_node_unref0 (delegate_type); @@ -36411,6 +36438,29 @@ } +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable) { + gchar* result = NULL; + ValaVariable* _tmp0_; + ValaCCodeAttribute* _tmp1_ = NULL; + ValaCCodeAttribute* _tmp2_; + const gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + g_return_val_if_fail (variable != NULL, NULL); + _tmp0_ = variable; + _tmp1_ = vala_ccode_base_module_get_ccode_attribute ((ValaCodeNode*) _tmp0_); + _tmp2_ = _tmp1_; + _tmp3_ = vala_ccode_attribute_get_delegate_target_name (_tmp2_); + _tmp4_ = _tmp3_; + _tmp5_ = g_strdup (_tmp4_); + _tmp6_ = _tmp5_; + _vala_attribute_cache_unref0 (_tmp2_); + result = _tmp6_; + return result; +} + + gdouble vala_ccode_base_module_get_ccode_pos (ValaParameter* param) { gdouble result = 0.0; ValaParameter* _tmp0_; diff -Nru vala-0.16-0.15.1/codegen/valaccodebasemodule.vala vala-0.16-0.15.2/codegen/valaccodebasemodule.vala --- vala-0.16-0.15.1/codegen/valaccodebasemodule.vala 2012-01-24 14:59:30.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodebasemodule.vala 2012-02-09 18:32:59.000000000 +0000 @@ -976,7 +976,7 @@ // create field to store delegate target cdecl = new CCodeDeclaration ("gpointer"); - cdecl.add_declarator (new CCodeVariableDeclarator (get_delegate_target_cname (get_ccode_name (f)))); + cdecl.add_declarator (new CCodeVariableDeclarator (get_ccode_delegate_target_name (f))); if (f.is_private_symbol ()) { cdecl.modifiers = CCodeModifiers.STATIC; } else { @@ -1168,7 +1168,7 @@ // create field to store delegate target var target_def = new CCodeDeclaration ("gpointer"); - target_def.add_declarator (new CCodeVariableDeclarator (get_delegate_target_cname (get_ccode_name (f)), new CCodeConstant ("NULL"))); + target_def.add_declarator (new CCodeVariableDeclarator (get_ccode_delegate_target_name (f), new CCodeConstant ("NULL"))); if (!f.is_private_symbol ()) { target_def.modifiers = CCodeModifiers.EXTERN; } else { @@ -1742,7 +1742,7 @@ data.add_field ("gint", get_parameter_array_length_cname (param, dim)); } } else if (deleg_type != null && deleg_type.delegate_symbol.has_target) { - data.add_field ("gpointer", get_delegate_target_cname (get_variable_cname (param.name))); + data.add_field ("gpointer", get_ccode_delegate_target_name (param)); if (param.variable_type.value_owned) { data.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (get_variable_cname (param.name))); // reference transfer for delegates @@ -1910,11 +1910,12 @@ cfile.add_function (ref_fun); var unref_fun = new CCodeFunction ("block%d_data_unref".printf (block_id), "void"); - unref_fun.add_parameter (new CCodeParameter ("_data%d_".printf (block_id), struct_name + "*")); + unref_fun.add_parameter (new CCodeParameter ("_userdata_", "void *")); unref_fun.modifiers = CCodeModifiers.STATIC; push_function (unref_fun); + ccode.add_declaration (struct_name + "*", new CCodeVariableDeclarator ("_data%d_".printf (block_id), new CCodeCastExpression (new CCodeIdentifier ("_userdata_"), struct_name + "*"))); ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_atomic_int_dec_and_test")); ccall.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeMemberAccess.pointer (new CCodeIdentifier ("_data%d_".printf (block_id)), "_ref_count_"))); ccode.open_if (ccall); @@ -2312,6 +2313,9 @@ if (list.target_type.data_type is Struct) { /* initializer is used as struct initializer */ var st = (Struct) list.target_type.data_type; + while (st.base_struct != null) { + st = st.base_struct; + } if (list.parent_node is Constant || list.parent_node is Field || list.parent_node is InitializerList) { var clist = new CCodeInitializerList (); @@ -3370,7 +3374,7 @@ ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, get_variable_cexpression (param.name)), get_cvalue_ (value)); if (delegate_type != null && delegate_type.delegate_symbol.has_target) { - ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, get_variable_cexpression (get_delegate_target_cname (param.name))), get_delegate_target_cvalue (value)); + ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, get_variable_cexpression (get_ccode_delegate_target_name (param))), get_delegate_target_cvalue (value)); if (delegate_type.value_owned) { ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, get_variable_cexpression (get_delegate_target_destroy_notify_cname (param.name))), get_delegate_target_destroy_notify_cvalue (get_parameter_cvalue (param))); } @@ -5911,6 +5915,10 @@ return get_ccode_attribute(node).delegate_target; } + public static string get_ccode_delegate_target_name (Variable variable) { + return get_ccode_attribute(variable).delegate_target_name; + } + public static double get_ccode_pos (Parameter param) { return get_ccode_attribute(param).pos; } diff -Nru vala-0.16-0.15.1/codegen/valaccodedelegatemodule.c vala-0.16-0.15.2/codegen/valaccodedelegatemodule.c --- vala-0.16-0.15.1/codegen/valaccodedelegatemodule.c 2012-01-26 21:08:06.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodedelegatemodule.c 2012-02-25 16:21:58.000000000 +0000 @@ -441,6 +441,7 @@ gdouble vala_ccode_base_module_get_ccode_delegate_target_pos (ValaCodeNode* node); gdouble vala_ccode_base_module_get_ccode_pos (ValaParameter* param); gboolean vala_ccode_base_module_get_ccode_array_null_terminated (ValaCodeNode* node); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); ValaCCodeFunction* vala_ccode_base_module_get_ccode (ValaCCodeBaseModule* self); gint vala_ccode_base_module_get_block_id (ValaCCodeBaseModule* self, ValaBlock* b); ValaBlock* vala_ccode_base_module_get_current_closure_block (ValaCCodeBaseModule* self); @@ -1447,48 +1448,48 @@ ValaMemberBinding _tmp245_; gboolean _tmp249_; gboolean first; + gboolean _tmp435_ = FALSE; + ValaMethod* _tmp436_; gboolean _tmp437_ = FALSE; - ValaMethod* _tmp438_; - gboolean _tmp439_ = FALSE; - gboolean _tmp443_; - ValaMethod* _tmp509_; - ValaList* _tmp510_ = NULL; - ValaList* _tmp511_; - gint _tmp512_; - gint _tmp513_; - gboolean _tmp514_; - ValaMethod* _tmp519_; - gchar* _tmp520_ = NULL; - gchar* _tmp521_; - ValaCCodeIdentifier* _tmp522_; - ValaCCodeIdentifier* _tmp523_; - ValaCCodeFunctionCall* _tmp524_; - ValaCCodeFunctionCall* _tmp525_; + gboolean _tmp441_; + ValaMethod* _tmp507_; + ValaList* _tmp508_ = NULL; + ValaList* _tmp509_; + gint _tmp510_; + gint _tmp511_; + gboolean _tmp512_; + ValaMethod* _tmp517_; + gchar* _tmp518_ = NULL; + gchar* _tmp519_; + ValaCCodeIdentifier* _tmp520_; + ValaCCodeIdentifier* _tmp521_; + ValaCCodeFunctionCall* _tmp522_; + ValaCCodeFunctionCall* _tmp523_; ValaCCodeFunctionCall* ccall; - ValaMethod* _tmp552_; - gboolean _tmp553_; - gboolean _tmp554_; - gboolean _tmp561_ = FALSE; - ValaMethod* _tmp562_; - ValaDataType* _tmp563_; - ValaDataType* _tmp564_; - gboolean _tmp569_; - gboolean _tmp579_ = FALSE; - gboolean _tmp580_ = FALSE; - ValaDelegate* _tmp581_; - gboolean _tmp582_; - gboolean _tmp583_; - gboolean _tmp587_; - gboolean _tmp591_; - gboolean _tmp640_ = FALSE; - ValaMethod* _tmp641_; - ValaDataType* _tmp642_; - ValaDataType* _tmp643_; - gboolean _tmp648_; + ValaMethod* _tmp550_; + gboolean _tmp551_; + gboolean _tmp552_; + gboolean _tmp559_ = FALSE; + ValaMethod* _tmp560_; + ValaDataType* _tmp561_; + ValaDataType* _tmp562_; + gboolean _tmp567_; + gboolean _tmp577_ = FALSE; + gboolean _tmp578_ = FALSE; + ValaDelegate* _tmp579_; + gboolean _tmp580_; + gboolean _tmp581_; + gboolean _tmp585_; + gboolean _tmp589_; + gboolean _tmp638_ = FALSE; + ValaMethod* _tmp639_; + ValaDataType* _tmp640_; + ValaDataType* _tmp641_; + gboolean _tmp646_; + ValaCCodeFile* _tmp651_; + ValaCCodeFunction* _tmp652_; ValaCCodeFile* _tmp653_; ValaCCodeFunction* _tmp654_; - ValaCCodeFile* _tmp655_; - ValaCCodeFunction* _tmp656_; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (m != NULL, NULL); g_return_val_if_fail (dt != NULL, NULL); @@ -2270,7 +2271,7 @@ ValaParameter* _tmp332_; gboolean _tmp333_ = FALSE; gboolean _tmp337_; - gint _tmp436_; + gint _tmp434_; _tmp287_ = _param_index; _param_index = _tmp287_ + 1; _tmp288_ = _param_index; @@ -2560,79 +2561,75 @@ gint _tmp404_; gpointer _tmp405_ = NULL; ValaParameter* _tmp406_; - const gchar* _tmp407_; - const gchar* _tmp408_; - gchar* _tmp409_ = NULL; - gchar* _tmp410_; - ValaCCodeIdentifier* _tmp411_; - ValaCCodeIdentifier* _tmp412_; + gchar* _tmp407_ = NULL; + gchar* _tmp408_; + ValaCCodeIdentifier* _tmp409_; + ValaCCodeIdentifier* _tmp410_; ValaCCodeIdentifier* ctarget; - ValaHashMap* _tmp413_; - ValaParameter* _tmp414_; - gdouble _tmp415_ = 0.0; - gint _tmp416_ = 0; - ValaCCodeIdentifier* _tmp417_; - ValaDelegateType* _tmp418_; - gboolean _tmp419_; - gboolean _tmp420_; + ValaHashMap* _tmp411_; + ValaParameter* _tmp412_; + gdouble _tmp413_ = 0.0; + gint _tmp414_ = 0; + ValaCCodeIdentifier* _tmp415_; + ValaDelegateType* _tmp416_; + gboolean _tmp417_; + gboolean _tmp418_; _tmp403_ = d_params; _tmp404_ = i; _tmp405_ = vala_list_get (_tmp403_, _tmp404_); _tmp406_ = (ValaParameter*) _tmp405_; - _tmp407_ = vala_symbol_get_name ((ValaSymbol*) _tmp406_); + _tmp407_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp406_); _tmp408_ = _tmp407_; - _tmp409_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp408_); + _tmp409_ = vala_ccode_identifier_new (_tmp408_); _tmp410_ = _tmp409_; - _tmp411_ = vala_ccode_identifier_new (_tmp410_); - _tmp412_ = _tmp411_; - _g_free0 (_tmp410_); + _g_free0 (_tmp408_); _vala_code_node_unref0 (_tmp406_); - ctarget = _tmp412_; - _tmp413_ = carg_map; - _tmp414_ = param; - _tmp415_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp414_); - _tmp416_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp415_, FALSE); - _tmp417_ = ctarget; - vala_map_set ((ValaMap*) _tmp413_, GINT_TO_POINTER (_tmp416_), (ValaCCodeExpression*) _tmp417_); - _tmp418_ = deleg_type; - _tmp419_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp418_); - _tmp420_ = _tmp419_; - if (_tmp420_) { - ValaList* _tmp421_; - gint _tmp422_; - gpointer _tmp423_ = NULL; - ValaParameter* _tmp424_; - const gchar* _tmp425_; - const gchar* _tmp426_; - gchar* _tmp427_ = NULL; - gchar* _tmp428_; - ValaCCodeIdentifier* _tmp429_; - ValaCCodeIdentifier* _tmp430_; + ctarget = _tmp410_; + _tmp411_ = carg_map; + _tmp412_ = param; + _tmp413_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp412_); + _tmp414_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp413_, FALSE); + _tmp415_ = ctarget; + vala_map_set ((ValaMap*) _tmp411_, GINT_TO_POINTER (_tmp414_), (ValaCCodeExpression*) _tmp415_); + _tmp416_ = deleg_type; + _tmp417_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp416_); + _tmp418_ = _tmp417_; + if (_tmp418_) { + ValaList* _tmp419_; + gint _tmp420_; + gpointer _tmp421_ = NULL; + ValaParameter* _tmp422_; + const gchar* _tmp423_; + const gchar* _tmp424_; + gchar* _tmp425_ = NULL; + gchar* _tmp426_; + ValaCCodeIdentifier* _tmp427_; + ValaCCodeIdentifier* _tmp428_; ValaCCodeIdentifier* ctarget_destroy_notify; - ValaHashMap* _tmp431_; - ValaMethod* _tmp432_; - gdouble _tmp433_ = 0.0; - gint _tmp434_ = 0; - ValaCCodeIdentifier* _tmp435_; - _tmp421_ = d_params; - _tmp422_ = i; - _tmp423_ = vala_list_get (_tmp421_, _tmp422_); - _tmp424_ = (ValaParameter*) _tmp423_; - _tmp425_ = vala_symbol_get_name ((ValaSymbol*) _tmp424_); + ValaHashMap* _tmp429_; + ValaMethod* _tmp430_; + gdouble _tmp431_ = 0.0; + gint _tmp432_ = 0; + ValaCCodeIdentifier* _tmp433_; + _tmp419_ = d_params; + _tmp420_ = i; + _tmp421_ = vala_list_get (_tmp419_, _tmp420_); + _tmp422_ = (ValaParameter*) _tmp421_; + _tmp423_ = vala_symbol_get_name ((ValaSymbol*) _tmp422_); + _tmp424_ = _tmp423_; + _tmp425_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp424_); _tmp426_ = _tmp425_; - _tmp427_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp426_); + _tmp427_ = vala_ccode_identifier_new (_tmp426_); _tmp428_ = _tmp427_; - _tmp429_ = vala_ccode_identifier_new (_tmp428_); - _tmp430_ = _tmp429_; - _g_free0 (_tmp428_); - _vala_code_node_unref0 (_tmp424_); - ctarget_destroy_notify = _tmp430_; - _tmp431_ = carg_map; - _tmp432_ = m; - _tmp433_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp432_); - _tmp434_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp433_ + 0.01, FALSE); - _tmp435_ = ctarget_destroy_notify; - vala_map_set ((ValaMap*) _tmp431_, GINT_TO_POINTER (_tmp434_), (ValaCCodeExpression*) _tmp435_); + _g_free0 (_tmp426_); + _vala_code_node_unref0 (_tmp422_); + ctarget_destroy_notify = _tmp428_; + _tmp429_ = carg_map; + _tmp430_ = m; + _tmp431_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp430_); + _tmp432_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp431_ + 0.01, FALSE); + _tmp433_ = ctarget_destroy_notify; + vala_map_set ((ValaMap*) _tmp429_, GINT_TO_POINTER (_tmp432_), (ValaCCodeExpression*) _tmp433_); _vala_ccode_node_unref0 (ctarget_destroy_notify); } _vala_ccode_node_unref0 (ctarget); @@ -2640,587 +2637,587 @@ _vala_code_node_unref0 (deleg_type); } } - _tmp436_ = i; - i = _tmp436_ + 1; + _tmp434_ = i; + i = _tmp434_ + 1; _vala_ccode_node_unref0 (arg); _vala_code_node_unref0 (param); } _vala_iterable_unref0 (_param_list); } - _tmp438_ = m; - _tmp439_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp438_); - if (_tmp439_) { - ValaMethod* _tmp440_; - ValaDataType* _tmp441_; - ValaDataType* _tmp442_; - _tmp440_ = m; - _tmp441_ = vala_method_get_return_type (_tmp440_); - _tmp442_ = _tmp441_; - _tmp437_ = VALA_IS_ARRAY_TYPE (_tmp442_); + _tmp436_ = m; + _tmp437_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp436_); + if (_tmp437_) { + ValaMethod* _tmp438_; + ValaDataType* _tmp439_; + ValaDataType* _tmp440_; + _tmp438_ = m; + _tmp439_ = vala_method_get_return_type (_tmp438_); + _tmp440_ = _tmp439_; + _tmp435_ = VALA_IS_ARRAY_TYPE (_tmp440_); } else { - _tmp437_ = FALSE; + _tmp435_ = FALSE; } - _tmp443_ = _tmp437_; - if (_tmp443_) { - ValaMethod* _tmp444_; - ValaDataType* _tmp445_; - ValaDataType* _tmp446_; - ValaArrayType* _tmp447_; + _tmp441_ = _tmp435_; + if (_tmp441_) { + ValaMethod* _tmp442_; + ValaDataType* _tmp443_; + ValaDataType* _tmp444_; + ValaArrayType* _tmp445_; ValaArrayType* array_type; - _tmp444_ = m; - _tmp445_ = vala_method_get_return_type (_tmp444_); - _tmp446_ = _tmp445_; - _tmp447_ = _vala_code_node_ref0 (VALA_ARRAY_TYPE (_tmp446_)); - array_type = _tmp447_; + _tmp442_ = m; + _tmp443_ = vala_method_get_return_type (_tmp442_); + _tmp444_ = _tmp443_; + _tmp445_ = _vala_code_node_ref0 (VALA_ARRAY_TYPE (_tmp444_)); + array_type = _tmp445_; { gint dim; dim = 1; { - gboolean _tmp448_; - _tmp448_ = TRUE; + gboolean _tmp446_; + _tmp446_ = TRUE; while (TRUE) { - gboolean _tmp449_; + gboolean _tmp447_; + gint _tmp449_; + ValaArrayType* _tmp450_; gint _tmp451_; - ValaArrayType* _tmp452_; - gint _tmp453_; - gint _tmp454_; + gint _tmp452_; ValaCCodeExpression* clength = NULL; - ValaDelegate* _tmp455_; - gboolean _tmp456_ = FALSE; - ValaHashMap* _tmp462_; - ValaMethod* _tmp463_; - gdouble _tmp464_ = 0.0; - gint _tmp465_; - gint _tmp466_ = 0; - ValaCCodeExpression* _tmp467_; - _tmp449_ = _tmp448_; - if (!_tmp449_) { - gint _tmp450_; - _tmp450_ = dim; - dim = _tmp450_ + 1; + ValaDelegate* _tmp453_; + gboolean _tmp454_ = FALSE; + ValaHashMap* _tmp460_; + ValaMethod* _tmp461_; + gdouble _tmp462_ = 0.0; + gint _tmp463_; + gint _tmp464_ = 0; + ValaCCodeExpression* _tmp465_; + _tmp447_ = _tmp446_; + if (!_tmp447_) { + gint _tmp448_; + _tmp448_ = dim; + dim = _tmp448_ + 1; } - _tmp448_ = FALSE; - _tmp451_ = dim; - _tmp452_ = array_type; - _tmp453_ = vala_array_type_get_rank (_tmp452_); - _tmp454_ = _tmp453_; - if (!(_tmp451_ <= _tmp454_)) { + _tmp446_ = FALSE; + _tmp449_ = dim; + _tmp450_ = array_type; + _tmp451_ = vala_array_type_get_rank (_tmp450_); + _tmp452_ = _tmp451_; + if (!(_tmp449_ <= _tmp452_)) { break; } - _tmp455_ = d; - _tmp456_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp455_); - if (!_tmp456_) { - ValaCCodeConstant* _tmp457_; - _tmp457_ = vala_ccode_constant_new ("NULL"); + _tmp453_ = d; + _tmp454_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp453_); + if (!_tmp454_) { + ValaCCodeConstant* _tmp455_; + _tmp455_ = vala_ccode_constant_new ("NULL"); _vala_ccode_node_unref0 (clength); - clength = (ValaCCodeExpression*) _tmp457_; + clength = (ValaCCodeExpression*) _tmp455_; } else { - gint _tmp458_; - gchar* _tmp459_ = NULL; - gchar* _tmp460_; - ValaCCodeIdentifier* _tmp461_; - _tmp458_ = dim; - _tmp459_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, "result", _tmp458_); - _tmp460_ = _tmp459_; - _tmp461_ = vala_ccode_identifier_new (_tmp460_); + gint _tmp456_; + gchar* _tmp457_ = NULL; + gchar* _tmp458_; + ValaCCodeIdentifier* _tmp459_; + _tmp456_ = dim; + _tmp457_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, "result", _tmp456_); + _tmp458_ = _tmp457_; + _tmp459_ = vala_ccode_identifier_new (_tmp458_); _vala_ccode_node_unref0 (clength); - clength = (ValaCCodeExpression*) _tmp461_; - _g_free0 (_tmp460_); + clength = (ValaCCodeExpression*) _tmp459_; + _g_free0 (_tmp458_); } - _tmp462_ = carg_map; - _tmp463_ = m; - _tmp464_ = vala_ccode_base_module_get_ccode_array_length_pos ((ValaCodeNode*) _tmp463_); - _tmp465_ = dim; - _tmp466_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp464_ + (0.01 * _tmp465_), FALSE); - _tmp467_ = clength; - vala_map_set ((ValaMap*) _tmp462_, GINT_TO_POINTER (_tmp466_), _tmp467_); + _tmp460_ = carg_map; + _tmp461_ = m; + _tmp462_ = vala_ccode_base_module_get_ccode_array_length_pos ((ValaCodeNode*) _tmp461_); + _tmp463_ = dim; + _tmp464_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp462_ + (0.01 * _tmp463_), FALSE); + _tmp465_ = clength; + vala_map_set ((ValaMap*) _tmp460_, GINT_TO_POINTER (_tmp464_), _tmp465_); _vala_ccode_node_unref0 (clength); } } } _vala_code_node_unref0 (array_type); } else { - ValaMethod* _tmp468_; - ValaDataType* _tmp469_; - ValaDataType* _tmp470_; - _tmp468_ = m; - _tmp469_ = vala_method_get_return_type (_tmp468_); - _tmp470_ = _tmp469_; - if (VALA_IS_DELEGATE_TYPE (_tmp470_)) { - ValaMethod* _tmp471_; - ValaDataType* _tmp472_; - ValaDataType* _tmp473_; - ValaDelegateType* _tmp474_; + ValaMethod* _tmp466_; + ValaDataType* _tmp467_; + ValaDataType* _tmp468_; + _tmp466_ = m; + _tmp467_ = vala_method_get_return_type (_tmp466_); + _tmp468_ = _tmp467_; + if (VALA_IS_DELEGATE_TYPE (_tmp468_)) { + ValaMethod* _tmp469_; + ValaDataType* _tmp470_; + ValaDataType* _tmp471_; + ValaDelegateType* _tmp472_; ValaDelegateType* deleg_type; - ValaDelegateType* _tmp475_; - ValaDelegate* _tmp476_; - ValaDelegate* _tmp477_; - gboolean _tmp478_; - gboolean _tmp479_; - _tmp471_ = m; - _tmp472_ = vala_method_get_return_type (_tmp471_); - _tmp473_ = _tmp472_; - _tmp474_ = _vala_code_node_ref0 (VALA_DELEGATE_TYPE (_tmp473_)); - deleg_type = _tmp474_; - _tmp475_ = deleg_type; - _tmp476_ = vala_delegate_type_get_delegate_symbol (_tmp475_); + ValaDelegateType* _tmp473_; + ValaDelegate* _tmp474_; + ValaDelegate* _tmp475_; + gboolean _tmp476_; + gboolean _tmp477_; + _tmp469_ = m; + _tmp470_ = vala_method_get_return_type (_tmp469_); + _tmp471_ = _tmp470_; + _tmp472_ = _vala_code_node_ref0 (VALA_DELEGATE_TYPE (_tmp471_)); + deleg_type = _tmp472_; + _tmp473_ = deleg_type; + _tmp474_ = vala_delegate_type_get_delegate_symbol (_tmp473_); + _tmp475_ = _tmp474_; + _tmp476_ = vala_delegate_get_has_target (_tmp475_); _tmp477_ = _tmp476_; - _tmp478_ = vala_delegate_get_has_target (_tmp477_); - _tmp479_ = _tmp478_; - if (_tmp479_) { - gchar* _tmp480_ = NULL; - gchar* _tmp481_; - ValaCCodeIdentifier* _tmp482_; - ValaCCodeIdentifier* _tmp483_; + if (_tmp477_) { + gchar* _tmp478_ = NULL; + gchar* _tmp479_; + ValaCCodeIdentifier* _tmp480_; + ValaCCodeIdentifier* _tmp481_; ValaCCodeIdentifier* ctarget; - ValaHashMap* _tmp484_; - ValaMethod* _tmp485_; - gdouble _tmp486_ = 0.0; - gint _tmp487_ = 0; - ValaCCodeIdentifier* _tmp488_; - ValaDelegateType* _tmp489_; - gboolean _tmp490_; - gboolean _tmp491_; - _tmp480_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, "result"); + ValaHashMap* _tmp482_; + ValaMethod* _tmp483_; + gdouble _tmp484_ = 0.0; + gint _tmp485_ = 0; + ValaCCodeIdentifier* _tmp486_; + ValaDelegateType* _tmp487_; + gboolean _tmp488_; + gboolean _tmp489_; + _tmp478_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, "result"); + _tmp479_ = _tmp478_; + _tmp480_ = vala_ccode_identifier_new (_tmp479_); _tmp481_ = _tmp480_; - _tmp482_ = vala_ccode_identifier_new (_tmp481_); - _tmp483_ = _tmp482_; - _g_free0 (_tmp481_); - ctarget = _tmp483_; - _tmp484_ = carg_map; - _tmp485_ = m; - _tmp486_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp485_); - _tmp487_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp486_, FALSE); - _tmp488_ = ctarget; - vala_map_set ((ValaMap*) _tmp484_, GINT_TO_POINTER (_tmp487_), (ValaCCodeExpression*) _tmp488_); - _tmp489_ = deleg_type; - _tmp490_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp489_); - _tmp491_ = _tmp490_; - if (_tmp491_) { - gchar* _tmp492_ = NULL; - gchar* _tmp493_; - ValaCCodeIdentifier* _tmp494_; - ValaCCodeIdentifier* _tmp495_; + _g_free0 (_tmp479_); + ctarget = _tmp481_; + _tmp482_ = carg_map; + _tmp483_ = m; + _tmp484_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp483_); + _tmp485_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp484_, FALSE); + _tmp486_ = ctarget; + vala_map_set ((ValaMap*) _tmp482_, GINT_TO_POINTER (_tmp485_), (ValaCCodeExpression*) _tmp486_); + _tmp487_ = deleg_type; + _tmp488_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp487_); + _tmp489_ = _tmp488_; + if (_tmp489_) { + gchar* _tmp490_ = NULL; + gchar* _tmp491_; + ValaCCodeIdentifier* _tmp492_; + ValaCCodeIdentifier* _tmp493_; ValaCCodeIdentifier* ctarget_destroy_notify; - ValaHashMap* _tmp496_; - ValaMethod* _tmp497_; - gdouble _tmp498_ = 0.0; - gint _tmp499_ = 0; - ValaCCodeIdentifier* _tmp500_; - _tmp492_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, "result"); + ValaHashMap* _tmp494_; + ValaMethod* _tmp495_; + gdouble _tmp496_ = 0.0; + gint _tmp497_ = 0; + ValaCCodeIdentifier* _tmp498_; + _tmp490_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, "result"); + _tmp491_ = _tmp490_; + _tmp492_ = vala_ccode_identifier_new (_tmp491_); _tmp493_ = _tmp492_; - _tmp494_ = vala_ccode_identifier_new (_tmp493_); - _tmp495_ = _tmp494_; - _g_free0 (_tmp493_); - ctarget_destroy_notify = _tmp495_; - _tmp496_ = carg_map; - _tmp497_ = m; - _tmp498_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp497_); - _tmp499_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp498_ + 0.01, FALSE); - _tmp500_ = ctarget_destroy_notify; - vala_map_set ((ValaMap*) _tmp496_, GINT_TO_POINTER (_tmp499_), (ValaCCodeExpression*) _tmp500_); + _g_free0 (_tmp491_); + ctarget_destroy_notify = _tmp493_; + _tmp494_ = carg_map; + _tmp495_ = m; + _tmp496_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp495_); + _tmp497_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp496_ + 0.01, FALSE); + _tmp498_ = ctarget_destroy_notify; + vala_map_set ((ValaMap*) _tmp494_, GINT_TO_POINTER (_tmp497_), (ValaCCodeExpression*) _tmp498_); _vala_ccode_node_unref0 (ctarget_destroy_notify); } _vala_ccode_node_unref0 (ctarget); } _vala_code_node_unref0 (deleg_type); } else { - ValaMethod* _tmp501_; - ValaDataType* _tmp502_; - ValaDataType* _tmp503_; - gboolean _tmp504_ = FALSE; - _tmp501_ = m; - _tmp502_ = vala_method_get_return_type (_tmp501_); - _tmp503_ = _tmp502_; - _tmp504_ = vala_data_type_is_real_non_null_struct_type (_tmp503_); - if (_tmp504_) { - ValaHashMap* _tmp505_; - gint _tmp506_ = 0; - ValaCCodeIdentifier* _tmp507_; - ValaCCodeIdentifier* _tmp508_; - _tmp505_ = carg_map; - _tmp506_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, (gdouble) (-3), FALSE); - _tmp507_ = vala_ccode_identifier_new ("result"); - _tmp508_ = _tmp507_; - vala_map_set ((ValaMap*) _tmp505_, GINT_TO_POINTER (_tmp506_), (ValaCCodeExpression*) _tmp508_); - _vala_ccode_node_unref0 (_tmp508_); + ValaMethod* _tmp499_; + ValaDataType* _tmp500_; + ValaDataType* _tmp501_; + gboolean _tmp502_ = FALSE; + _tmp499_ = m; + _tmp500_ = vala_method_get_return_type (_tmp499_); + _tmp501_ = _tmp500_; + _tmp502_ = vala_data_type_is_real_non_null_struct_type (_tmp501_); + if (_tmp502_) { + ValaHashMap* _tmp503_; + gint _tmp504_ = 0; + ValaCCodeIdentifier* _tmp505_; + ValaCCodeIdentifier* _tmp506_; + _tmp503_ = carg_map; + _tmp504_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, (gdouble) (-3), FALSE); + _tmp505_ = vala_ccode_identifier_new ("result"); + _tmp506_ = _tmp505_; + vala_map_set ((ValaMap*) _tmp503_, GINT_TO_POINTER (_tmp504_), (ValaCCodeExpression*) _tmp506_); + _vala_ccode_node_unref0 (_tmp506_); } } } - _tmp509_ = m; - _tmp510_ = vala_code_node_get_error_types ((ValaCodeNode*) _tmp509_); + _tmp507_ = m; + _tmp508_ = vala_code_node_get_error_types ((ValaCodeNode*) _tmp507_); + _tmp509_ = _tmp508_; + _tmp510_ = vala_collection_get_size ((ValaCollection*) _tmp509_); _tmp511_ = _tmp510_; - _tmp512_ = vala_collection_get_size ((ValaCollection*) _tmp511_); - _tmp513_ = _tmp512_; - _tmp514_ = _tmp513_ > 0; - _vala_iterable_unref0 (_tmp511_); - if (_tmp514_) { - ValaHashMap* _tmp515_; - gint _tmp516_ = 0; - ValaCCodeIdentifier* _tmp517_; - ValaCCodeIdentifier* _tmp518_; - _tmp515_ = carg_map; - _tmp516_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, (gdouble) (-1), FALSE); - _tmp517_ = vala_ccode_identifier_new ("error"); - _tmp518_ = _tmp517_; - vala_map_set ((ValaMap*) _tmp515_, GINT_TO_POINTER (_tmp516_), (ValaCCodeExpression*) _tmp518_); - _vala_ccode_node_unref0 (_tmp518_); - } - _tmp519_ = m; - _tmp520_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp519_); + _tmp512_ = _tmp511_ > 0; + _vala_iterable_unref0 (_tmp509_); + if (_tmp512_) { + ValaHashMap* _tmp513_; + gint _tmp514_ = 0; + ValaCCodeIdentifier* _tmp515_; + ValaCCodeIdentifier* _tmp516_; + _tmp513_ = carg_map; + _tmp514_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, (gdouble) (-1), FALSE); + _tmp515_ = vala_ccode_identifier_new ("error"); + _tmp516_ = _tmp515_; + vala_map_set ((ValaMap*) _tmp513_, GINT_TO_POINTER (_tmp514_), (ValaCCodeExpression*) _tmp516_); + _vala_ccode_node_unref0 (_tmp516_); + } + _tmp517_ = m; + _tmp518_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp517_); + _tmp519_ = _tmp518_; + _tmp520_ = vala_ccode_identifier_new (_tmp519_); _tmp521_ = _tmp520_; - _tmp522_ = vala_ccode_identifier_new (_tmp521_); + _tmp522_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp521_); _tmp523_ = _tmp522_; - _tmp524_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp523_); - _tmp525_ = _tmp524_; - _vala_ccode_node_unref0 (_tmp523_); - _g_free0 (_tmp521_); - ccall = _tmp525_; + _vala_ccode_node_unref0 (_tmp521_); + _g_free0 (_tmp519_); + ccall = _tmp523_; last_pos = -1; while (TRUE) { - gint _tmp545_; - ValaCCodeFunctionCall* _tmp546_; - ValaHashMap* _tmp547_; - gint _tmp548_; - gpointer _tmp549_ = NULL; - ValaCCodeExpression* _tmp550_; - gint _tmp551_; + gint _tmp543_; + ValaCCodeFunctionCall* _tmp544_; + ValaHashMap* _tmp545_; + gint _tmp546_; + gpointer _tmp547_ = NULL; + ValaCCodeExpression* _tmp548_; + gint _tmp549_; min_pos = -1; { - ValaHashMap* _tmp526_; - ValaSet* _tmp527_ = NULL; - ValaSet* _tmp528_; - ValaIterator* _tmp529_ = NULL; - ValaIterator* _tmp530_; + ValaHashMap* _tmp524_; + ValaSet* _tmp525_ = NULL; + ValaSet* _tmp526_; + ValaIterator* _tmp527_ = NULL; + ValaIterator* _tmp528_; ValaIterator* _pos_it; - _tmp526_ = carg_map; - _tmp527_ = vala_map_get_keys ((ValaMap*) _tmp526_); + _tmp524_ = carg_map; + _tmp525_ = vala_map_get_keys ((ValaMap*) _tmp524_); + _tmp526_ = _tmp525_; + _tmp527_ = vala_iterable_iterator ((ValaIterable*) _tmp526_); _tmp528_ = _tmp527_; - _tmp529_ = vala_iterable_iterator ((ValaIterable*) _tmp528_); - _tmp530_ = _tmp529_; - _vala_iterable_unref0 (_tmp528_); - _pos_it = _tmp530_; + _vala_iterable_unref0 (_tmp526_); + _pos_it = _tmp528_; while (TRUE) { + ValaIterator* _tmp529_; + gboolean _tmp530_ = FALSE; ValaIterator* _tmp531_; - gboolean _tmp532_ = FALSE; - ValaIterator* _tmp533_; - gpointer _tmp534_ = NULL; + gpointer _tmp532_ = NULL; gint pos; - gboolean _tmp535_ = FALSE; - gint _tmp536_; - gint _tmp537_; - gboolean _tmp543_; - _tmp531_ = _pos_it; - _tmp532_ = vala_iterator_next (_tmp531_); - if (!_tmp532_) { + gboolean _tmp533_ = FALSE; + gint _tmp534_; + gint _tmp535_; + gboolean _tmp541_; + _tmp529_ = _pos_it; + _tmp530_ = vala_iterator_next (_tmp529_); + if (!_tmp530_) { break; } - _tmp533_ = _pos_it; - _tmp534_ = vala_iterator_get (_tmp533_); - pos = GPOINTER_TO_INT (_tmp534_); - _tmp536_ = pos; - _tmp537_ = last_pos; - if (_tmp536_ > _tmp537_) { - gboolean _tmp538_ = FALSE; - gint _tmp539_; - gboolean _tmp542_; - _tmp539_ = min_pos; - if (_tmp539_ == (-1)) { - _tmp538_ = TRUE; + _tmp531_ = _pos_it; + _tmp532_ = vala_iterator_get (_tmp531_); + pos = GPOINTER_TO_INT (_tmp532_); + _tmp534_ = pos; + _tmp535_ = last_pos; + if (_tmp534_ > _tmp535_) { + gboolean _tmp536_ = FALSE; + gint _tmp537_; + gboolean _tmp540_; + _tmp537_ = min_pos; + if (_tmp537_ == (-1)) { + _tmp536_ = TRUE; } else { - gint _tmp540_; - gint _tmp541_; - _tmp540_ = pos; - _tmp541_ = min_pos; - _tmp538_ = _tmp540_ < _tmp541_; + gint _tmp538_; + gint _tmp539_; + _tmp538_ = pos; + _tmp539_ = min_pos; + _tmp536_ = _tmp538_ < _tmp539_; } - _tmp542_ = _tmp538_; - _tmp535_ = _tmp542_; + _tmp540_ = _tmp536_; + _tmp533_ = _tmp540_; } else { - _tmp535_ = FALSE; + _tmp533_ = FALSE; } - _tmp543_ = _tmp535_; - if (_tmp543_) { - gint _tmp544_; - _tmp544_ = pos; - min_pos = _tmp544_; + _tmp541_ = _tmp533_; + if (_tmp541_) { + gint _tmp542_; + _tmp542_ = pos; + min_pos = _tmp542_; } } _vala_iterator_unref0 (_pos_it); } - _tmp545_ = min_pos; - if (_tmp545_ == (-1)) { + _tmp543_ = min_pos; + if (_tmp543_ == (-1)) { break; } - _tmp546_ = ccall; - _tmp547_ = carg_map; - _tmp548_ = min_pos; - _tmp549_ = vala_map_get ((ValaMap*) _tmp547_, GINT_TO_POINTER (_tmp548_)); - _tmp550_ = (ValaCCodeExpression*) _tmp549_; - vala_ccode_function_call_add_argument (_tmp546_, _tmp550_); - _vala_ccode_node_unref0 (_tmp550_); - _tmp551_ = min_pos; - last_pos = _tmp551_; - } - _tmp552_ = m; - _tmp553_ = vala_method_get_coroutine (_tmp552_); - _tmp554_ = _tmp553_; - if (_tmp554_) { - ValaCCodeFunctionCall* _tmp555_; - ValaCCodeConstant* _tmp556_; + _tmp544_ = ccall; + _tmp545_ = carg_map; + _tmp546_ = min_pos; + _tmp547_ = vala_map_get ((ValaMap*) _tmp545_, GINT_TO_POINTER (_tmp546_)); + _tmp548_ = (ValaCCodeExpression*) _tmp547_; + vala_ccode_function_call_add_argument (_tmp544_, _tmp548_); + _vala_ccode_node_unref0 (_tmp548_); + _tmp549_ = min_pos; + last_pos = _tmp549_; + } + _tmp550_ = m; + _tmp551_ = vala_method_get_coroutine (_tmp550_); + _tmp552_ = _tmp551_; + if (_tmp552_) { + ValaCCodeFunctionCall* _tmp553_; + ValaCCodeConstant* _tmp554_; + ValaCCodeConstant* _tmp555_; + ValaCCodeFunctionCall* _tmp556_; ValaCCodeConstant* _tmp557_; - ValaCCodeFunctionCall* _tmp558_; - ValaCCodeConstant* _tmp559_; - ValaCCodeConstant* _tmp560_; - _tmp555_ = ccall; - _tmp556_ = vala_ccode_constant_new ("NULL"); - _tmp557_ = _tmp556_; - vala_ccode_function_call_add_argument (_tmp555_, (ValaCCodeExpression*) _tmp557_); - _vala_ccode_node_unref0 (_tmp557_); - _tmp558_ = ccall; - _tmp559_ = vala_ccode_constant_new ("NULL"); - _tmp560_ = _tmp559_; - vala_ccode_function_call_add_argument (_tmp558_, (ValaCCodeExpression*) _tmp560_); - _vala_ccode_node_unref0 (_tmp560_); - } - _tmp562_ = m; - _tmp563_ = vala_method_get_return_type (_tmp562_); - _tmp564_ = _tmp563_; - if (VALA_IS_VOID_TYPE (_tmp564_)) { - _tmp561_ = TRUE; + ValaCCodeConstant* _tmp558_; + _tmp553_ = ccall; + _tmp554_ = vala_ccode_constant_new ("NULL"); + _tmp555_ = _tmp554_; + vala_ccode_function_call_add_argument (_tmp553_, (ValaCCodeExpression*) _tmp555_); + _vala_ccode_node_unref0 (_tmp555_); + _tmp556_ = ccall; + _tmp557_ = vala_ccode_constant_new ("NULL"); + _tmp558_ = _tmp557_; + vala_ccode_function_call_add_argument (_tmp556_, (ValaCCodeExpression*) _tmp558_); + _vala_ccode_node_unref0 (_tmp558_); + } + _tmp560_ = m; + _tmp561_ = vala_method_get_return_type (_tmp560_); + _tmp562_ = _tmp561_; + if (VALA_IS_VOID_TYPE (_tmp562_)) { + _tmp559_ = TRUE; } else { - ValaMethod* _tmp565_; - ValaDataType* _tmp566_; - ValaDataType* _tmp567_; - gboolean _tmp568_ = FALSE; - _tmp565_ = m; - _tmp566_ = vala_method_get_return_type (_tmp565_); - _tmp567_ = _tmp566_; - _tmp568_ = vala_data_type_is_real_non_null_struct_type (_tmp567_); - _tmp561_ = _tmp568_; - } - _tmp569_ = _tmp561_; - if (_tmp569_) { - ValaCCodeFunction* _tmp570_; - ValaCCodeFunction* _tmp571_; - ValaCCodeFunctionCall* _tmp572_; - _tmp570_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp571_ = _tmp570_; - _tmp572_ = ccall; - vala_ccode_function_add_expression (_tmp571_, (ValaCCodeExpression*) _tmp572_); + ValaMethod* _tmp563_; + ValaDataType* _tmp564_; + ValaDataType* _tmp565_; + gboolean _tmp566_ = FALSE; + _tmp563_ = m; + _tmp564_ = vala_method_get_return_type (_tmp563_); + _tmp565_ = _tmp564_; + _tmp566_ = vala_data_type_is_real_non_null_struct_type (_tmp565_); + _tmp559_ = _tmp566_; + } + _tmp567_ = _tmp559_; + if (_tmp567_) { + ValaCCodeFunction* _tmp568_; + ValaCCodeFunction* _tmp569_; + ValaCCodeFunctionCall* _tmp570_; + _tmp568_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp569_ = _tmp568_; + _tmp570_ = ccall; + vala_ccode_function_add_expression (_tmp569_, (ValaCCodeExpression*) _tmp570_); } else { - ValaCCodeFunction* _tmp573_; - ValaCCodeFunction* _tmp574_; - const gchar* _tmp575_; - ValaCCodeFunctionCall* _tmp576_; - ValaCCodeVariableDeclarator* _tmp577_; - ValaCCodeVariableDeclarator* _tmp578_; - _tmp573_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp574_ = _tmp573_; - _tmp575_ = return_type_cname; - _tmp576_ = ccall; - _tmp577_ = vala_ccode_variable_declarator_new ("result", (ValaCCodeExpression*) _tmp576_, NULL); - _tmp578_ = _tmp577_; - vala_ccode_function_add_declaration (_tmp574_, _tmp575_, (ValaCCodeDeclarator*) _tmp578_, 0); - _vala_ccode_node_unref0 (_tmp578_); - } - _tmp581_ = d; - _tmp582_ = vala_delegate_get_has_target (_tmp581_); - _tmp583_ = _tmp582_; - if (_tmp583_) { - ValaDelegateType* _tmp584_; - gboolean _tmp585_; - gboolean _tmp586_; - _tmp584_ = dt; - _tmp585_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp584_); - _tmp586_ = _tmp585_; - _tmp580_ = !_tmp586_; + ValaCCodeFunction* _tmp571_; + ValaCCodeFunction* _tmp572_; + const gchar* _tmp573_; + ValaCCodeFunctionCall* _tmp574_; + ValaCCodeVariableDeclarator* _tmp575_; + ValaCCodeVariableDeclarator* _tmp576_; + _tmp571_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp572_ = _tmp571_; + _tmp573_ = return_type_cname; + _tmp574_ = ccall; + _tmp575_ = vala_ccode_variable_declarator_new ("result", (ValaCCodeExpression*) _tmp574_, NULL); + _tmp576_ = _tmp575_; + vala_ccode_function_add_declaration (_tmp572_, _tmp573_, (ValaCCodeDeclarator*) _tmp576_, 0); + _vala_ccode_node_unref0 (_tmp576_); + } + _tmp579_ = d; + _tmp580_ = vala_delegate_get_has_target (_tmp579_); + _tmp581_ = _tmp580_; + if (_tmp581_) { + ValaDelegateType* _tmp582_; + gboolean _tmp583_; + gboolean _tmp584_; + _tmp582_ = dt; + _tmp583_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp582_); + _tmp584_ = _tmp583_; + _tmp578_ = !_tmp584_; } else { - _tmp580_ = FALSE; + _tmp578_ = FALSE; } - _tmp587_ = _tmp580_; - if (_tmp587_) { - ValaDelegateType* _tmp588_; - gboolean _tmp589_; - gboolean _tmp590_; - _tmp588_ = dt; - _tmp589_ = vala_delegate_type_get_is_called_once (_tmp588_); - _tmp590_ = _tmp589_; - _tmp579_ = _tmp590_; + _tmp585_ = _tmp578_; + if (_tmp585_) { + ValaDelegateType* _tmp586_; + gboolean _tmp587_; + gboolean _tmp588_; + _tmp586_ = dt; + _tmp587_ = vala_delegate_type_get_is_called_once (_tmp586_); + _tmp588_ = _tmp587_; + _tmp577_ = _tmp588_; } else { - _tmp579_ = FALSE; + _tmp577_ = FALSE; } - _tmp591_ = _tmp579_; - if (_tmp591_) { + _tmp589_ = _tmp577_; + if (_tmp589_) { ValaCCodeExpression* destroy_notify; - ValaMethod* _tmp592_; - gboolean _tmp593_; - gboolean _tmp594_; - ValaCCodeExpression* _tmp631_; + ValaMethod* _tmp590_; + gboolean _tmp591_; + gboolean _tmp592_; + ValaCCodeExpression* _tmp629_; destroy_notify = NULL; - _tmp592_ = m; - _tmp593_ = vala_method_get_closure (_tmp592_); - _tmp594_ = _tmp593_; - if (_tmp594_) { - ValaBlock* _tmp595_; - ValaBlock* _tmp596_; - gint _tmp597_ = 0; + _tmp590_ = m; + _tmp591_ = vala_method_get_closure (_tmp590_); + _tmp592_ = _tmp591_; + if (_tmp592_) { + ValaBlock* _tmp593_; + ValaBlock* _tmp594_; + gint _tmp595_ = 0; gint block_id; - gint _tmp598_; - gchar* _tmp599_ = NULL; - gchar* _tmp600_; - ValaCCodeIdentifier* _tmp601_; - _tmp595_ = vala_ccode_base_module_get_current_closure_block ((ValaCCodeBaseModule*) self); - _tmp596_ = _tmp595_; - _tmp597_ = vala_ccode_base_module_get_block_id ((ValaCCodeBaseModule*) self, _tmp596_); - block_id = _tmp597_; - _tmp598_ = block_id; - _tmp599_ = g_strdup_printf ("block%d_data_unref", _tmp598_); - _tmp600_ = _tmp599_; - _tmp601_ = vala_ccode_identifier_new (_tmp600_); + gint _tmp596_; + gchar* _tmp597_ = NULL; + gchar* _tmp598_; + ValaCCodeIdentifier* _tmp599_; + _tmp593_ = vala_ccode_base_module_get_current_closure_block ((ValaCCodeBaseModule*) self); + _tmp594_ = _tmp593_; + _tmp595_ = vala_ccode_base_module_get_block_id ((ValaCCodeBaseModule*) self, _tmp594_); + block_id = _tmp595_; + _tmp596_ = block_id; + _tmp597_ = g_strdup_printf ("block%d_data_unref", _tmp596_); + _tmp598_ = _tmp597_; + _tmp599_ = vala_ccode_identifier_new (_tmp598_); _vala_ccode_node_unref0 (destroy_notify); - destroy_notify = (ValaCCodeExpression*) _tmp601_; - _g_free0 (_tmp600_); + destroy_notify = (ValaCCodeExpression*) _tmp599_; + _g_free0 (_tmp598_); } else { + gboolean _tmp600_ = FALSE; + gboolean _tmp601_ = FALSE; gboolean _tmp602_ = FALSE; - gboolean _tmp603_ = FALSE; - gboolean _tmp604_ = FALSE; - ValaDataType* _tmp605_ = NULL; - ValaDataType* _tmp606_; - gboolean _tmp607_; - gboolean _tmp611_; - gboolean _tmp615_; - gboolean _tmp624_; - _tmp605_ = vala_ccode_base_module_get_this_type ((ValaCCodeBaseModule*) self); - _tmp606_ = _tmp605_; - _tmp607_ = _tmp606_ != NULL; - _vala_code_node_unref0 (_tmp606_); - if (_tmp607_) { - ValaMethod* _tmp608_; - ValaMemberBinding _tmp609_; - ValaMemberBinding _tmp610_; - _tmp608_ = m; - _tmp609_ = vala_method_get_binding (_tmp608_); - _tmp610_ = _tmp609_; - _tmp604_ = _tmp610_ != VALA_MEMBER_BINDING_STATIC; + ValaDataType* _tmp603_ = NULL; + ValaDataType* _tmp604_; + gboolean _tmp605_; + gboolean _tmp609_; + gboolean _tmp613_; + gboolean _tmp622_; + _tmp603_ = vala_ccode_base_module_get_this_type ((ValaCCodeBaseModule*) self); + _tmp604_ = _tmp603_; + _tmp605_ = _tmp604_ != NULL; + _vala_code_node_unref0 (_tmp604_); + if (_tmp605_) { + ValaMethod* _tmp606_; + ValaMemberBinding _tmp607_; + ValaMemberBinding _tmp608_; + _tmp606_ = m; + _tmp607_ = vala_method_get_binding (_tmp606_); + _tmp608_ = _tmp607_; + _tmp602_ = _tmp608_ != VALA_MEMBER_BINDING_STATIC; } else { - _tmp604_ = FALSE; + _tmp602_ = FALSE; } - _tmp611_ = _tmp604_; - if (_tmp611_) { - ValaMethod* _tmp612_; - gboolean _tmp613_; - gboolean _tmp614_; - _tmp612_ = m; - _tmp613_ = vala_method_get_is_async_callback (_tmp612_); - _tmp614_ = _tmp613_; - _tmp603_ = !_tmp614_; + _tmp609_ = _tmp602_; + if (_tmp609_) { + ValaMethod* _tmp610_; + gboolean _tmp611_; + gboolean _tmp612_; + _tmp610_ = m; + _tmp611_ = vala_method_get_is_async_callback (_tmp610_); + _tmp612_ = _tmp611_; + _tmp601_ = !_tmp612_; } else { - _tmp603_ = FALSE; + _tmp601_ = FALSE; } - _tmp615_ = _tmp603_; - if (_tmp615_) { - ValaMethod* _tmp616_; - ValaParameter* _tmp617_; - ValaParameter* _tmp618_; - ValaDataType* _tmp619_; - ValaDataType* _tmp620_; - ValaTypeSymbol* _tmp621_; - ValaTypeSymbol* _tmp622_; - gboolean _tmp623_ = FALSE; - _tmp616_ = m; - _tmp617_ = vala_method_get_this_parameter (_tmp616_); + _tmp613_ = _tmp601_; + if (_tmp613_) { + ValaMethod* _tmp614_; + ValaParameter* _tmp615_; + ValaParameter* _tmp616_; + ValaDataType* _tmp617_; + ValaDataType* _tmp618_; + ValaTypeSymbol* _tmp619_; + ValaTypeSymbol* _tmp620_; + gboolean _tmp621_ = FALSE; + _tmp614_ = m; + _tmp615_ = vala_method_get_this_parameter (_tmp614_); + _tmp616_ = _tmp615_; + _tmp617_ = vala_variable_get_variable_type ((ValaVariable*) _tmp616_); _tmp618_ = _tmp617_; - _tmp619_ = vala_variable_get_variable_type ((ValaVariable*) _tmp618_); + _tmp619_ = vala_data_type_get_data_type (_tmp618_); _tmp620_ = _tmp619_; - _tmp621_ = vala_data_type_get_data_type (_tmp620_); - _tmp622_ = _tmp621_; - _tmp623_ = vala_ccode_base_module_is_reference_counting (_tmp622_); - _tmp602_ = _tmp623_; + _tmp621_ = vala_ccode_base_module_is_reference_counting (_tmp620_); + _tmp600_ = _tmp621_; } else { - _tmp602_ = FALSE; + _tmp600_ = FALSE; } - _tmp624_ = _tmp602_; - if (_tmp624_) { - ValaMethod* _tmp625_; - ValaParameter* _tmp626_; - ValaParameter* _tmp627_; - ValaDataType* _tmp628_; - ValaDataType* _tmp629_; - ValaCCodeExpression* _tmp630_ = NULL; - _tmp625_ = m; - _tmp626_ = vala_method_get_this_parameter (_tmp625_); + _tmp622_ = _tmp600_; + if (_tmp622_) { + ValaMethod* _tmp623_; + ValaParameter* _tmp624_; + ValaParameter* _tmp625_; + ValaDataType* _tmp626_; + ValaDataType* _tmp627_; + ValaCCodeExpression* _tmp628_ = NULL; + _tmp623_ = m; + _tmp624_ = vala_method_get_this_parameter (_tmp623_); + _tmp625_ = _tmp624_; + _tmp626_ = vala_variable_get_variable_type ((ValaVariable*) _tmp625_); _tmp627_ = _tmp626_; - _tmp628_ = vala_variable_get_variable_type ((ValaVariable*) _tmp627_); - _tmp629_ = _tmp628_; - _tmp630_ = vala_ccode_base_module_get_destroy_func_expression ((ValaCCodeBaseModule*) self, _tmp629_, FALSE); + _tmp628_ = vala_ccode_base_module_get_destroy_func_expression ((ValaCCodeBaseModule*) self, _tmp627_, FALSE); _vala_ccode_node_unref0 (destroy_notify); - destroy_notify = _tmp630_; + destroy_notify = _tmp628_; } } - _tmp631_ = destroy_notify; - if (_tmp631_ != NULL) { - ValaCCodeExpression* _tmp632_; - ValaCCodeFunctionCall* _tmp633_; + _tmp629_ = destroy_notify; + if (_tmp629_ != NULL) { + ValaCCodeExpression* _tmp630_; + ValaCCodeFunctionCall* _tmp631_; ValaCCodeFunctionCall* unref_call; - ValaCCodeFunctionCall* _tmp634_; - ValaCCodeIdentifier* _tmp635_; - ValaCCodeIdentifier* _tmp636_; - ValaCCodeFunction* _tmp637_; - ValaCCodeFunction* _tmp638_; - ValaCCodeFunctionCall* _tmp639_; - _tmp632_ = destroy_notify; - _tmp633_ = vala_ccode_function_call_new (_tmp632_); - unref_call = _tmp633_; - _tmp634_ = unref_call; - _tmp635_ = vala_ccode_identifier_new ("self"); + ValaCCodeFunctionCall* _tmp632_; + ValaCCodeIdentifier* _tmp633_; + ValaCCodeIdentifier* _tmp634_; + ValaCCodeFunction* _tmp635_; + ValaCCodeFunction* _tmp636_; + ValaCCodeFunctionCall* _tmp637_; + _tmp630_ = destroy_notify; + _tmp631_ = vala_ccode_function_call_new (_tmp630_); + unref_call = _tmp631_; + _tmp632_ = unref_call; + _tmp633_ = vala_ccode_identifier_new ("self"); + _tmp634_ = _tmp633_; + vala_ccode_function_call_add_argument (_tmp632_, (ValaCCodeExpression*) _tmp634_); + _vala_ccode_node_unref0 (_tmp634_); + _tmp635_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); _tmp636_ = _tmp635_; - vala_ccode_function_call_add_argument (_tmp634_, (ValaCCodeExpression*) _tmp636_); - _vala_ccode_node_unref0 (_tmp636_); - _tmp637_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp638_ = _tmp637_; - _tmp639_ = unref_call; - vala_ccode_function_add_expression (_tmp638_, (ValaCCodeExpression*) _tmp639_); + _tmp637_ = unref_call; + vala_ccode_function_add_expression (_tmp636_, (ValaCCodeExpression*) _tmp637_); _vala_ccode_node_unref0 (unref_call); } _vala_ccode_node_unref0 (destroy_notify); } - _tmp641_ = m; - _tmp642_ = vala_method_get_return_type (_tmp641_); - _tmp643_ = _tmp642_; - if (VALA_IS_VOID_TYPE (_tmp643_)) { - _tmp640_ = TRUE; + _tmp639_ = m; + _tmp640_ = vala_method_get_return_type (_tmp639_); + _tmp641_ = _tmp640_; + if (VALA_IS_VOID_TYPE (_tmp641_)) { + _tmp638_ = TRUE; } else { - ValaMethod* _tmp644_; - ValaDataType* _tmp645_; - ValaDataType* _tmp646_; - gboolean _tmp647_ = FALSE; - _tmp644_ = m; - _tmp645_ = vala_method_get_return_type (_tmp644_); - _tmp646_ = _tmp645_; - _tmp647_ = vala_data_type_is_real_non_null_struct_type (_tmp646_); - _tmp640_ = _tmp647_; - } - _tmp648_ = _tmp640_; - if (!_tmp648_) { - ValaCCodeFunction* _tmp649_; - ValaCCodeFunction* _tmp650_; - ValaCCodeIdentifier* _tmp651_; - ValaCCodeIdentifier* _tmp652_; - _tmp649_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + ValaMethod* _tmp642_; + ValaDataType* _tmp643_; + ValaDataType* _tmp644_; + gboolean _tmp645_ = FALSE; + _tmp642_ = m; + _tmp643_ = vala_method_get_return_type (_tmp642_); + _tmp644_ = _tmp643_; + _tmp645_ = vala_data_type_is_real_non_null_struct_type (_tmp644_); + _tmp638_ = _tmp645_; + } + _tmp646_ = _tmp638_; + if (!_tmp646_) { + ValaCCodeFunction* _tmp647_; + ValaCCodeFunction* _tmp648_; + ValaCCodeIdentifier* _tmp649_; + ValaCCodeIdentifier* _tmp650_; + _tmp647_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp648_ = _tmp647_; + _tmp649_ = vala_ccode_identifier_new ("result"); _tmp650_ = _tmp649_; - _tmp651_ = vala_ccode_identifier_new ("result"); - _tmp652_ = _tmp651_; - vala_ccode_function_add_return (_tmp650_, (ValaCCodeExpression*) _tmp652_); - _vala_ccode_node_unref0 (_tmp652_); + vala_ccode_function_add_return (_tmp648_, (ValaCCodeExpression*) _tmp650_); + _vala_ccode_node_unref0 (_tmp650_); } vala_ccode_base_module_pop_function ((ValaCCodeBaseModule*) self); + _tmp651_ = ((ValaCCodeBaseModule*) self)->cfile; + _tmp652_ = function; + vala_ccode_file_add_function_declaration (_tmp651_, _tmp652_); _tmp653_ = ((ValaCCodeBaseModule*) self)->cfile; _tmp654_ = function; - vala_ccode_file_add_function_declaration (_tmp653_, _tmp654_); - _tmp655_ = ((ValaCCodeBaseModule*) self)->cfile; - _tmp656_ = function; - vala_ccode_file_add_function (_tmp655_, _tmp656_); + vala_ccode_file_add_function (_tmp653_, _tmp654_); result = wrapper_name; _vala_ccode_node_unref0 (ccall); _vala_map_unref0 (carg_map); @@ -3457,127 +3454,118 @@ _tmp82_ = _tmp81_; if (_tmp82_) { ValaParameter* _tmp83_; - const gchar* _tmp84_; - const gchar* _tmp85_; - gchar* _tmp86_ = NULL; - gchar* _tmp87_; - gchar* _tmp88_ = NULL; - gchar* _tmp89_; - const gchar* _tmp90_; - ValaCCodeParameter* _tmp91_; - ValaCCodeParameter* _tmp92_; + gchar* _tmp84_ = NULL; + gchar* _tmp85_; + const gchar* _tmp86_; + ValaCCodeParameter* _tmp87_; + ValaCCodeParameter* _tmp88_; ValaCCodeParameter* cparam; - ValaMap* _tmp93_; - ValaParameter* _tmp94_; - gdouble _tmp95_ = 0.0; - gint _tmp96_ = 0; - ValaCCodeParameter* _tmp97_; - ValaMap* _tmp98_; - ValaDelegateType* _tmp108_; - gboolean _tmp109_; - gboolean _tmp110_; + ValaMap* _tmp89_; + ValaParameter* _tmp90_; + gdouble _tmp91_ = 0.0; + gint _tmp92_ = 0; + ValaCCodeParameter* _tmp93_; + ValaMap* _tmp94_; + ValaDelegateType* _tmp104_; + gboolean _tmp105_; + gboolean _tmp106_; _tmp83_ = param; - _tmp84_ = vala_symbol_get_name ((ValaSymbol*) _tmp83_); + _tmp84_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp83_); _tmp85_ = _tmp84_; - _tmp86_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp85_); - _tmp87_ = _tmp86_; - _tmp88_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp87_); - _tmp89_ = _tmp88_; - _tmp90_ = target_ctypename; - _tmp91_ = vala_ccode_parameter_new (_tmp89_, _tmp90_); - _tmp92_ = _tmp91_; - _g_free0 (_tmp89_); - _g_free0 (_tmp87_); - cparam = _tmp92_; - _tmp93_ = cparam_map; - _tmp94_ = param; - _tmp95_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp94_); - _tmp96_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp95_, FALSE); - _tmp97_ = cparam; - vala_map_set (_tmp93_, GINT_TO_POINTER (_tmp96_), _tmp97_); - _tmp98_ = carg_map; - if (_tmp98_ != NULL) { - ValaMap* _tmp99_; - ValaParameter* _tmp100_; - gdouble _tmp101_ = 0.0; - gint _tmp102_ = 0; - ValaCCodeParameter* _tmp103_; - const gchar* _tmp104_; - const gchar* _tmp105_; - ValaCCodeExpression* _tmp106_ = NULL; - ValaCCodeExpression* _tmp107_; - _tmp99_ = carg_map; - _tmp100_ = param; - _tmp101_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp100_); - _tmp102_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp101_, FALSE); - _tmp103_ = cparam; - _tmp104_ = vala_ccode_parameter_get_name (_tmp103_); - _tmp105_ = _tmp104_; - _tmp106_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp105_); - _tmp107_ = _tmp106_; - vala_map_set (_tmp99_, GINT_TO_POINTER (_tmp102_), _tmp107_); - _vala_ccode_node_unref0 (_tmp107_); - } - _tmp108_ = deleg_type; - _tmp109_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp108_); - _tmp110_ = _tmp109_; - if (_tmp110_) { - ValaParameter* _tmp111_; - const gchar* _tmp112_; - const gchar* _tmp113_; - gchar* _tmp114_ = NULL; - gchar* _tmp115_; - gchar* _tmp116_ = NULL; - gchar* _tmp117_; - const gchar* _tmp118_; - ValaCCodeParameter* _tmp119_; - ValaMap* _tmp120_; - ValaParameter* _tmp121_; - gdouble _tmp122_ = 0.0; - gint _tmp123_ = 0; - ValaCCodeParameter* _tmp124_; - ValaMap* _tmp125_; - _tmp111_ = param; - _tmp112_ = vala_symbol_get_name ((ValaSymbol*) _tmp111_); + _tmp86_ = target_ctypename; + _tmp87_ = vala_ccode_parameter_new (_tmp85_, _tmp86_); + _tmp88_ = _tmp87_; + _g_free0 (_tmp85_); + cparam = _tmp88_; + _tmp89_ = cparam_map; + _tmp90_ = param; + _tmp91_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp90_); + _tmp92_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp91_, FALSE); + _tmp93_ = cparam; + vala_map_set (_tmp89_, GINT_TO_POINTER (_tmp92_), _tmp93_); + _tmp94_ = carg_map; + if (_tmp94_ != NULL) { + ValaMap* _tmp95_; + ValaParameter* _tmp96_; + gdouble _tmp97_ = 0.0; + gint _tmp98_ = 0; + ValaCCodeParameter* _tmp99_; + const gchar* _tmp100_; + const gchar* _tmp101_; + ValaCCodeExpression* _tmp102_ = NULL; + ValaCCodeExpression* _tmp103_; + _tmp95_ = carg_map; + _tmp96_ = param; + _tmp97_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp96_); + _tmp98_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp97_, FALSE); + _tmp99_ = cparam; + _tmp100_ = vala_ccode_parameter_get_name (_tmp99_); + _tmp101_ = _tmp100_; + _tmp102_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp101_); + _tmp103_ = _tmp102_; + vala_map_set (_tmp95_, GINT_TO_POINTER (_tmp98_), _tmp103_); + _vala_ccode_node_unref0 (_tmp103_); + } + _tmp104_ = deleg_type; + _tmp105_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp104_); + _tmp106_ = _tmp105_; + if (_tmp106_) { + ValaParameter* _tmp107_; + const gchar* _tmp108_; + const gchar* _tmp109_; + gchar* _tmp110_ = NULL; + gchar* _tmp111_; + gchar* _tmp112_ = NULL; + gchar* _tmp113_; + const gchar* _tmp114_; + ValaCCodeParameter* _tmp115_; + ValaMap* _tmp116_; + ValaParameter* _tmp117_; + gdouble _tmp118_ = 0.0; + gint _tmp119_ = 0; + ValaCCodeParameter* _tmp120_; + ValaMap* _tmp121_; + _tmp107_ = param; + _tmp108_ = vala_symbol_get_name ((ValaSymbol*) _tmp107_); + _tmp109_ = _tmp108_; + _tmp110_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp109_); + _tmp111_ = _tmp110_; + _tmp112_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp111_); _tmp113_ = _tmp112_; - _tmp114_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp113_); - _tmp115_ = _tmp114_; - _tmp116_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp115_); - _tmp117_ = _tmp116_; - _tmp118_ = target_destroy_notify_ctypename; - _tmp119_ = vala_ccode_parameter_new (_tmp117_, _tmp118_); + _tmp114_ = target_destroy_notify_ctypename; + _tmp115_ = vala_ccode_parameter_new (_tmp113_, _tmp114_); _vala_ccode_node_unref0 (cparam); - cparam = _tmp119_; - _g_free0 (_tmp117_); - _g_free0 (_tmp115_); - _tmp120_ = cparam_map; - _tmp121_ = param; - _tmp122_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp121_); - _tmp123_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp122_ + 0.01, FALSE); - _tmp124_ = cparam; - vala_map_set (_tmp120_, GINT_TO_POINTER (_tmp123_), _tmp124_); - _tmp125_ = carg_map; - if (_tmp125_ != NULL) { - ValaMap* _tmp126_; - ValaParameter* _tmp127_; - gdouble _tmp128_ = 0.0; - gint _tmp129_ = 0; - ValaCCodeParameter* _tmp130_; - const gchar* _tmp131_; - const gchar* _tmp132_; - ValaCCodeExpression* _tmp133_ = NULL; - ValaCCodeExpression* _tmp134_; - _tmp126_ = carg_map; - _tmp127_ = param; - _tmp128_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp127_); - _tmp129_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp128_ + 0.01, FALSE); - _tmp130_ = cparam; - _tmp131_ = vala_ccode_parameter_get_name (_tmp130_); - _tmp132_ = _tmp131_; - _tmp133_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp132_); - _tmp134_ = _tmp133_; - vala_map_set (_tmp126_, GINT_TO_POINTER (_tmp129_), _tmp134_); - _vala_ccode_node_unref0 (_tmp134_); + cparam = _tmp115_; + _g_free0 (_tmp113_); + _g_free0 (_tmp111_); + _tmp116_ = cparam_map; + _tmp117_ = param; + _tmp118_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp117_); + _tmp119_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp118_ + 0.01, FALSE); + _tmp120_ = cparam; + vala_map_set (_tmp116_, GINT_TO_POINTER (_tmp119_), _tmp120_); + _tmp121_ = carg_map; + if (_tmp121_ != NULL) { + ValaMap* _tmp122_; + ValaParameter* _tmp123_; + gdouble _tmp124_ = 0.0; + gint _tmp125_ = 0; + ValaCCodeParameter* _tmp126_; + const gchar* _tmp127_; + const gchar* _tmp128_; + ValaCCodeExpression* _tmp129_ = NULL; + ValaCCodeExpression* _tmp130_; + _tmp122_ = carg_map; + _tmp123_ = param; + _tmp124_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp123_); + _tmp125_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp124_ + 0.01, FALSE); + _tmp126_ = cparam; + _tmp127_ = vala_ccode_parameter_get_name (_tmp126_); + _tmp128_ = _tmp127_; + _tmp129_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp128_); + _tmp130_ = _tmp129_; + vala_map_set (_tmp122_, GINT_TO_POINTER (_tmp125_), _tmp130_); + _vala_ccode_node_unref0 (_tmp130_); } } _vala_ccode_node_unref0 (cparam); @@ -3585,71 +3573,62 @@ _vala_code_node_unref0 (d); _vala_code_node_unref0 (deleg_type); } else { - ValaParameter* _tmp135_; - ValaDataType* _tmp136_; - ValaDataType* _tmp137_; - _tmp135_ = param; - _tmp136_ = vala_variable_get_variable_type ((ValaVariable*) _tmp135_); - _tmp137_ = _tmp136_; - if (VALA_IS_METHOD_TYPE (_tmp137_)) { - ValaParameter* _tmp138_; - const gchar* _tmp139_; - const gchar* _tmp140_; - gchar* _tmp141_ = NULL; - gchar* _tmp142_; - gchar* _tmp143_ = NULL; - gchar* _tmp144_; - const gchar* _tmp145_; - ValaCCodeParameter* _tmp146_; - ValaCCodeParameter* _tmp147_; + ValaParameter* _tmp131_; + ValaDataType* _tmp132_; + ValaDataType* _tmp133_; + _tmp131_ = param; + _tmp132_ = vala_variable_get_variable_type ((ValaVariable*) _tmp131_); + _tmp133_ = _tmp132_; + if (VALA_IS_METHOD_TYPE (_tmp133_)) { + ValaParameter* _tmp134_; + gchar* _tmp135_ = NULL; + gchar* _tmp136_; + const gchar* _tmp137_; + ValaCCodeParameter* _tmp138_; + ValaCCodeParameter* _tmp139_; ValaCCodeParameter* cparam; - ValaMap* _tmp148_; - ValaParameter* _tmp149_; - gdouble _tmp150_ = 0.0; - gint _tmp151_ = 0; - ValaCCodeParameter* _tmp152_; - ValaMap* _tmp153_; - _tmp138_ = param; - _tmp139_ = vala_symbol_get_name ((ValaSymbol*) _tmp138_); - _tmp140_ = _tmp139_; - _tmp141_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp140_); - _tmp142_ = _tmp141_; - _tmp143_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp142_); - _tmp144_ = _tmp143_; - _tmp145_ = target_ctypename; - _tmp146_ = vala_ccode_parameter_new (_tmp144_, _tmp145_); - _tmp147_ = _tmp146_; - _g_free0 (_tmp144_); - _g_free0 (_tmp142_); - cparam = _tmp147_; - _tmp148_ = cparam_map; - _tmp149_ = param; - _tmp150_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp149_); - _tmp151_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp150_, FALSE); - _tmp152_ = cparam; - vala_map_set (_tmp148_, GINT_TO_POINTER (_tmp151_), _tmp152_); - _tmp153_ = carg_map; - if (_tmp153_ != NULL) { - ValaMap* _tmp154_; - ValaParameter* _tmp155_; - gdouble _tmp156_ = 0.0; - gint _tmp157_ = 0; - ValaCCodeParameter* _tmp158_; - const gchar* _tmp159_; - const gchar* _tmp160_; - ValaCCodeExpression* _tmp161_ = NULL; - ValaCCodeExpression* _tmp162_; - _tmp154_ = carg_map; - _tmp155_ = param; - _tmp156_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp155_); - _tmp157_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp156_, FALSE); - _tmp158_ = cparam; - _tmp159_ = vala_ccode_parameter_get_name (_tmp158_); - _tmp160_ = _tmp159_; - _tmp161_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp160_); - _tmp162_ = _tmp161_; - vala_map_set (_tmp154_, GINT_TO_POINTER (_tmp157_), _tmp162_); - _vala_ccode_node_unref0 (_tmp162_); + ValaMap* _tmp140_; + ValaParameter* _tmp141_; + gdouble _tmp142_ = 0.0; + gint _tmp143_ = 0; + ValaCCodeParameter* _tmp144_; + ValaMap* _tmp145_; + _tmp134_ = param; + _tmp135_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp134_); + _tmp136_ = _tmp135_; + _tmp137_ = target_ctypename; + _tmp138_ = vala_ccode_parameter_new (_tmp136_, _tmp137_); + _tmp139_ = _tmp138_; + _g_free0 (_tmp136_); + cparam = _tmp139_; + _tmp140_ = cparam_map; + _tmp141_ = param; + _tmp142_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp141_); + _tmp143_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp142_, FALSE); + _tmp144_ = cparam; + vala_map_set (_tmp140_, GINT_TO_POINTER (_tmp143_), _tmp144_); + _tmp145_ = carg_map; + if (_tmp145_ != NULL) { + ValaMap* _tmp146_; + ValaParameter* _tmp147_; + gdouble _tmp148_ = 0.0; + gint _tmp149_ = 0; + ValaCCodeParameter* _tmp150_; + const gchar* _tmp151_; + const gchar* _tmp152_; + ValaCCodeExpression* _tmp153_ = NULL; + ValaCCodeExpression* _tmp154_; + _tmp146_ = carg_map; + _tmp147_ = param; + _tmp148_ = vala_ccode_base_module_get_ccode_delegate_target_pos ((ValaCodeNode*) _tmp147_); + _tmp149_ = vala_ccode_base_module_get_param_pos ((ValaCCodeBaseModule*) self, _tmp148_, FALSE); + _tmp150_ = cparam; + _tmp151_ = vala_ccode_parameter_get_name (_tmp150_); + _tmp152_ = _tmp151_; + _tmp153_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp152_); + _tmp154_ = _tmp153_; + vala_map_set (_tmp146_, GINT_TO_POINTER (_tmp149_), _tmp154_); + _vala_ccode_node_unref0 (_tmp154_); } _vala_ccode_node_unref0 (cparam); } diff -Nru vala-0.16-0.15.1/codegen/valaccodedelegatemodule.vala vala-0.16-0.15.2/codegen/valaccodedelegatemodule.vala --- vala-0.16-0.15.1/codegen/valaccodedelegatemodule.vala 2011-09-14 17:06:29.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodedelegatemodule.vala 2012-02-09 18:32:59.000000000 +0000 @@ -339,7 +339,7 @@ var deleg_type = (DelegateType) param.variable_type; if (deleg_type.delegate_symbol.has_target) { - var ctarget = new CCodeIdentifier (get_delegate_target_cname (d_params.get (i).name)); + var ctarget = new CCodeIdentifier (get_ccode_delegate_target_name (d_params.get (i))); carg_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), ctarget); if (deleg_type.value_owned) { var ctarget_destroy_notify = new CCodeIdentifier (get_delegate_target_destroy_notify_cname (d_params.get (i).name)); @@ -473,7 +473,7 @@ generate_delegate_declaration (d, decl_space); if (d.has_target) { - var cparam = new CCodeParameter (get_delegate_target_cname (get_variable_cname (param.name)), target_ctypename); + var cparam = new CCodeParameter (get_ccode_delegate_target_name (param), target_ctypename); cparam_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), cparam); if (carg_map != null) { carg_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), get_variable_cexpression (cparam.name)); @@ -487,7 +487,7 @@ } } } else if (param.variable_type is MethodType) { - var cparam = new CCodeParameter (get_delegate_target_cname (get_variable_cname (param.name)), target_ctypename); + var cparam = new CCodeParameter (get_ccode_delegate_target_name (param), target_ctypename); cparam_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), cparam); if (carg_map != null) { carg_map.set (get_param_pos (get_ccode_delegate_target_pos (param)), get_variable_cexpression (cparam.name)); diff -Nru vala-0.16-0.15.1/codegen/valaccodememberaccessmodule.c vala-0.16-0.15.2/codegen/valaccodememberaccessmodule.c --- vala-0.16-0.15.1/codegen/valaccodememberaccessmodule.c 2012-01-26 21:08:06.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodememberaccessmodule.c 2012-02-25 16:21:58.000000000 +0000 @@ -384,6 +384,7 @@ gchar* vala_ccode_base_module_get_ccode_type (ValaCodeNode* node); gchar* vala_ccode_base_module_get_variable_cname (ValaCCodeBaseModule* self, const gchar* name); gchar* vala_ccode_base_module_get_parameter_array_length_cname (ValaCCodeBaseModule* self, ValaParameter* param, gint dim); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); ValaPropertyAccessor* vala_ccode_base_module_get_current_property_accessor (ValaCCodeBaseModule* self); static ValaTargetValue* vala_ccode_member_access_module_real_get_field_cvalue (ValaCCodeBaseModule* base, ValaField* field, ValaTargetValue* instance); ValaDataType* vala_ccode_base_module_get_data_type_for_symbol (ValaTypeSymbol* sym); @@ -758,8 +759,8 @@ ValaMemberAccess* _tmp130_; ValaCCodeFunctionCall* _tmp131_; ValaMethod* _tmp132_; - const gchar* _tmp133_; - const gchar* _tmp134_; + gchar* _tmp133_ = NULL; + gchar* _tmp134_; ValaCCodeMemberAccess* _tmp135_; ValaCCodeMemberAccess* _tmp136_; _tmp113_ = m; @@ -788,12 +789,13 @@ _tmp130_ = expr; _tmp131_ = vclass; _tmp132_ = m; - _tmp133_ = vala_symbol_get_name ((ValaSymbol*) _tmp132_); + _tmp133_ = vala_ccode_base_module_get_ccode_vfunc_name (_tmp132_); _tmp134_ = _tmp133_; _tmp135_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp131_, _tmp134_); _tmp136_ = _tmp135_; vala_ccode_base_module_set_cvalue ((ValaCCodeBaseModule*) self, (ValaExpression*) _tmp130_, (ValaCCodeExpression*) _tmp136_); _vala_ccode_node_unref0 (_tmp136_); + _g_free0 (_tmp134_); _vala_ccode_node_unref0 (vclass); _vala_code_node_unref0 (base_class); } else { @@ -1601,19 +1603,19 @@ ValaMemberAccess* _tmp465_; ValaExpression* _tmp466_; ValaExpression* _tmp467_; - ValaMemberAccess* _tmp772_; - ValaTargetValue* _tmp773_; - ValaTargetValue* _tmp774_; - ValaMemberAccess* _tmp775_; - ValaDataType* _tmp776_; - ValaDataType* _tmp777_; - ValaMemberAccess* _tmp778_; ValaMemberAccess* _tmp779_; ValaTargetValue* _tmp780_; ValaTargetValue* _tmp781_; ValaMemberAccess* _tmp782_; - ValaTargetValue* _tmp783_ = NULL; - ValaTargetValue* _tmp784_; + ValaDataType* _tmp783_; + ValaDataType* _tmp784_; + ValaMemberAccess* _tmp785_; + ValaMemberAccess* _tmp786_; + ValaTargetValue* _tmp787_; + ValaTargetValue* _tmp788_; + ValaMemberAccess* _tmp789_; + ValaTargetValue* _tmp790_ = NULL; + ValaTargetValue* _tmp791_; _tmp445_ = expr; _tmp446_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp445_); _tmp447_ = _tmp446_; @@ -2349,26 +2351,30 @@ ValaMemberAccess* _tmp751_; ValaDataType* _tmp752_; ValaDataType* _tmp753_; - ValaLocalVariable* _tmp754_ = NULL; + gboolean _tmp754_ = FALSE; + ValaMemberAccess* _tmp758_; + ValaDataType* _tmp759_; + ValaDataType* _tmp760_; + ValaLocalVariable* _tmp761_ = NULL; ValaLocalVariable* temp_var; - ValaLocalVariable* _tmp755_; - const gchar* _tmp756_; - const gchar* _tmp757_; - ValaCCodeExpression* _tmp758_ = NULL; + ValaLocalVariable* _tmp762_; + const gchar* _tmp763_; + const gchar* _tmp764_; + ValaCCodeExpression* _tmp765_ = NULL; ValaCCodeExpression* ctemp; - ValaLocalVariable* _tmp759_; - ValaCCodeFunctionCall* _tmp760_; - ValaCCodeExpression* _tmp761_; - ValaCCodeUnaryExpression* _tmp762_; - ValaCCodeUnaryExpression* _tmp763_; - ValaCCodeFunctionCall* _tmp764_; - ValaCCodeConstant* _tmp765_; - ValaCCodeConstant* _tmp766_; - ValaCCodeFunction* _tmp767_; - ValaCCodeFunction* _tmp768_; - ValaCCodeFunctionCall* _tmp769_; - ValaMemberAccess* _tmp770_; - ValaCCodeExpression* _tmp771_; + ValaLocalVariable* _tmp766_; + ValaCCodeFunctionCall* _tmp767_; + ValaCCodeExpression* _tmp768_; + ValaCCodeUnaryExpression* _tmp769_; + ValaCCodeUnaryExpression* _tmp770_; + ValaCCodeFunctionCall* _tmp771_; + ValaCCodeConstant* _tmp772_; + ValaCCodeConstant* _tmp773_; + ValaCCodeFunction* _tmp774_; + ValaCCodeFunction* _tmp775_; + ValaCCodeFunctionCall* _tmp776_; + ValaMemberAccess* _tmp777_; + ValaCCodeExpression* _tmp778_; _tmp715_ = vala_ccode_identifier_new ("g_object_get"); _tmp716_ = _tmp715_; _tmp717_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp716_); @@ -2444,297 +2450,310 @@ _tmp751_ = expr; _tmp752_ = vala_expression_get_value_type ((ValaExpression*) _tmp751_); _tmp753_ = _tmp752_; - _tmp754_ = vala_ccode_base_module_get_temp_variable ((ValaCCodeBaseModule*) self, _tmp753_, TRUE, NULL, TRUE); - temp_var = _tmp754_; - _tmp755_ = temp_var; - _tmp756_ = vala_symbol_get_name ((ValaSymbol*) _tmp755_); - _tmp757_ = _tmp756_; - _tmp758_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp757_); - ctemp = _tmp758_; - _tmp759_ = temp_var; - vala_ccode_base_module_emit_temp_var ((ValaCCodeBaseModule*) self, _tmp759_); - _tmp760_ = ccall; - _tmp761_ = ctemp; - _tmp762_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_ADDRESS_OF, _tmp761_); - _tmp763_ = _tmp762_; - vala_ccode_function_call_add_argument (_tmp760_, (ValaCCodeExpression*) _tmp763_); - _vala_ccode_node_unref0 (_tmp763_); - _tmp764_ = ccall; - _tmp765_ = vala_ccode_constant_new ("NULL"); - _tmp766_ = _tmp765_; - vala_ccode_function_call_add_argument (_tmp764_, (ValaCCodeExpression*) _tmp766_); - _vala_ccode_node_unref0 (_tmp766_); - _tmp767_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp768_ = _tmp767_; - _tmp769_ = ccall; - vala_ccode_function_add_expression (_tmp768_, (ValaCCodeExpression*) _tmp769_); - _tmp770_ = expr; - _tmp771_ = ctemp; - vala_ccode_base_module_set_cvalue ((ValaCCodeBaseModule*) self, (ValaExpression*) _tmp770_, _tmp771_); + _tmp754_ = vala_data_type_is_real_struct_type (_tmp753_); + if (_tmp754_) { + ValaMemberAccess* _tmp755_; + ValaDataType* _tmp756_; + ValaDataType* _tmp757_; + _tmp755_ = expr; + _tmp756_ = vala_expression_get_value_type ((ValaExpression*) _tmp755_); + _tmp757_ = _tmp756_; + vala_data_type_set_nullable (_tmp757_, TRUE); + } + _tmp758_ = expr; + _tmp759_ = vala_expression_get_value_type ((ValaExpression*) _tmp758_); + _tmp760_ = _tmp759_; + _tmp761_ = vala_ccode_base_module_get_temp_variable ((ValaCCodeBaseModule*) self, _tmp760_, TRUE, NULL, TRUE); + temp_var = _tmp761_; + _tmp762_ = temp_var; + _tmp763_ = vala_symbol_get_name ((ValaSymbol*) _tmp762_); + _tmp764_ = _tmp763_; + _tmp765_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp764_); + ctemp = _tmp765_; + _tmp766_ = temp_var; + vala_ccode_base_module_emit_temp_var ((ValaCCodeBaseModule*) self, _tmp766_); + _tmp767_ = ccall; + _tmp768_ = ctemp; + _tmp769_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_ADDRESS_OF, _tmp768_); + _tmp770_ = _tmp769_; + vala_ccode_function_call_add_argument (_tmp767_, (ValaCCodeExpression*) _tmp770_); + _vala_ccode_node_unref0 (_tmp770_); + _tmp771_ = ccall; + _tmp772_ = vala_ccode_constant_new ("NULL"); + _tmp773_ = _tmp772_; + vala_ccode_function_call_add_argument (_tmp771_, (ValaCCodeExpression*) _tmp773_); + _vala_ccode_node_unref0 (_tmp773_); + _tmp774_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp775_ = _tmp774_; + _tmp776_ = ccall; + vala_ccode_function_add_expression (_tmp775_, (ValaCCodeExpression*) _tmp776_); + _tmp777_ = expr; + _tmp778_ = ctemp; + vala_ccode_base_module_set_cvalue ((ValaCCodeBaseModule*) self, (ValaExpression*) _tmp777_, _tmp778_); _vala_ccode_node_unref0 (ctemp); _vala_code_node_unref0 (temp_var); _vala_ccode_node_unref0 (ccall); } } } - _tmp772_ = expr; - _tmp773_ = vala_expression_get_target_value ((ValaExpression*) _tmp772_); - _tmp774_ = _tmp773_; - _tmp775_ = expr; - _tmp776_ = vala_expression_get_value_type ((ValaExpression*) _tmp775_); - _tmp777_ = _tmp776_; - vala_target_value_set_value_type (_tmp774_, _tmp777_); - _tmp778_ = expr; _tmp779_ = expr; _tmp780_ = vala_expression_get_target_value ((ValaExpression*) _tmp779_); _tmp781_ = _tmp780_; _tmp782_ = expr; - _tmp783_ = vala_ccode_base_module_store_temp_value ((ValaCCodeBaseModule*) self, _tmp781_, (ValaCodeNode*) _tmp782_, NULL); + _tmp783_ = vala_expression_get_value_type ((ValaExpression*) _tmp782_); _tmp784_ = _tmp783_; - vala_expression_set_target_value ((ValaExpression*) _tmp778_, _tmp784_); - _vala_target_value_unref0 (_tmp784_); + vala_target_value_set_value_type (_tmp781_, _tmp784_); + _tmp785_ = expr; + _tmp786_ = expr; + _tmp787_ = vala_expression_get_target_value ((ValaExpression*) _tmp786_); + _tmp788_ = _tmp787_; + _tmp789_ = expr; + _tmp790_ = vala_ccode_base_module_store_temp_value ((ValaCCodeBaseModule*) self, _tmp788_, (ValaCodeNode*) _tmp789_, NULL); + _tmp791_ = _tmp790_; + vala_expression_set_target_value ((ValaExpression*) _tmp785_, _tmp791_); + _vala_target_value_unref0 (_tmp791_); _vala_code_node_unref0 (prop); } else { - ValaMemberAccess* _tmp785_; - ValaSymbol* _tmp786_; - ValaSymbol* _tmp787_; - _tmp785_ = expr; - _tmp786_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp785_); - _tmp787_ = _tmp786_; - if (VALA_IS_LOCAL_VARIABLE (_tmp787_)) { - ValaMemberAccess* _tmp788_; - ValaSymbol* _tmp789_; - ValaSymbol* _tmp790_; - ValaLocalVariable* _tmp791_; + ValaMemberAccess* _tmp792_; + ValaSymbol* _tmp793_; + ValaSymbol* _tmp794_; + _tmp792_ = expr; + _tmp793_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp792_); + _tmp794_ = _tmp793_; + if (VALA_IS_LOCAL_VARIABLE (_tmp794_)) { + ValaMemberAccess* _tmp795_; + ValaSymbol* _tmp796_; + ValaSymbol* _tmp797_; + ValaLocalVariable* _tmp798_; ValaLocalVariable* local; - gboolean _tmp792_ = FALSE; - gboolean _tmp793_ = FALSE; - gboolean _tmp794_ = FALSE; - gboolean _tmp795_ = FALSE; - gboolean _tmp796_ = FALSE; - ValaMemberAccess* _tmp797_; - ValaCodeNode* _tmp798_; - ValaCodeNode* _tmp799_; - gboolean _tmp804_; - gboolean _tmp810_; - gboolean _tmp814_; + gboolean _tmp799_ = FALSE; + gboolean _tmp800_ = FALSE; + gboolean _tmp801_ = FALSE; + gboolean _tmp802_ = FALSE; + gboolean _tmp803_ = FALSE; + ValaMemberAccess* _tmp804_; + ValaCodeNode* _tmp805_; + ValaCodeNode* _tmp806_; + gboolean _tmp811_; gboolean _tmp817_; - gboolean _tmp828_; - _tmp788_ = expr; - _tmp789_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp788_); - _tmp790_ = _tmp789_; - _tmp791_ = _vala_code_node_ref0 (VALA_LOCAL_VARIABLE (_tmp790_)); - local = _tmp791_; - _tmp797_ = expr; - _tmp798_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp797_); - _tmp799_ = _tmp798_; - if (VALA_IS_RETURN_STATEMENT (_tmp799_)) { - ValaDataType* _tmp800_; - ValaDataType* _tmp801_; - gboolean _tmp802_; - gboolean _tmp803_; - _tmp800_ = vala_ccode_base_module_get_current_return_type ((ValaCCodeBaseModule*) self); - _tmp801_ = _tmp800_; - _tmp802_ = vala_data_type_get_value_owned (_tmp801_); - _tmp803_ = _tmp802_; - _tmp796_ = _tmp803_; - } else { - _tmp796_ = FALSE; - } - _tmp804_ = _tmp796_; - if (_tmp804_) { - ValaLocalVariable* _tmp805_; - ValaDataType* _tmp806_; + gboolean _tmp821_; + gboolean _tmp824_; + gboolean _tmp835_; + _tmp795_ = expr; + _tmp796_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp795_); + _tmp797_ = _tmp796_; + _tmp798_ = _vala_code_node_ref0 (VALA_LOCAL_VARIABLE (_tmp797_)); + local = _tmp798_; + _tmp804_ = expr; + _tmp805_ = vala_code_node_get_parent_node ((ValaCodeNode*) _tmp804_); + _tmp806_ = _tmp805_; + if (VALA_IS_RETURN_STATEMENT (_tmp806_)) { ValaDataType* _tmp807_; - gboolean _tmp808_; + ValaDataType* _tmp808_; gboolean _tmp809_; - _tmp805_ = local; - _tmp806_ = vala_variable_get_variable_type ((ValaVariable*) _tmp805_); - _tmp807_ = _tmp806_; - _tmp808_ = vala_data_type_get_value_owned (_tmp807_); - _tmp809_ = _tmp808_; - _tmp795_ = _tmp809_; + gboolean _tmp810_; + _tmp807_ = vala_ccode_base_module_get_current_return_type ((ValaCCodeBaseModule*) self); + _tmp808_ = _tmp807_; + _tmp809_ = vala_data_type_get_value_owned (_tmp808_); + _tmp810_ = _tmp809_; + _tmp803_ = _tmp810_; } else { - _tmp795_ = FALSE; + _tmp803_ = FALSE; } - _tmp810_ = _tmp795_; - if (_tmp810_) { - ValaLocalVariable* _tmp811_; - gboolean _tmp812_; - gboolean _tmp813_; - _tmp811_ = local; - _tmp812_ = vala_local_variable_get_captured (_tmp811_); - _tmp813_ = _tmp812_; - _tmp794_ = !_tmp813_; + _tmp811_ = _tmp803_; + if (_tmp811_) { + ValaLocalVariable* _tmp812_; + ValaDataType* _tmp813_; + ValaDataType* _tmp814_; + gboolean _tmp815_; + gboolean _tmp816_; + _tmp812_ = local; + _tmp813_ = vala_variable_get_variable_type ((ValaVariable*) _tmp812_); + _tmp814_ = _tmp813_; + _tmp815_ = vala_data_type_get_value_owned (_tmp814_); + _tmp816_ = _tmp815_; + _tmp802_ = _tmp816_; } else { - _tmp794_ = FALSE; + _tmp802_ = FALSE; } - _tmp814_ = _tmp794_; - if (_tmp814_) { - ValaLocalVariable* _tmp815_; - gboolean _tmp816_ = FALSE; - _tmp815_ = local; - _tmp816_ = vala_ccode_base_module_variable_accessible_in_finally ((ValaCCodeBaseModule*) self, _tmp815_); - _tmp793_ = !_tmp816_; + _tmp817_ = _tmp802_; + if (_tmp817_) { + ValaLocalVariable* _tmp818_; + gboolean _tmp819_; + gboolean _tmp820_; + _tmp818_ = local; + _tmp819_ = vala_local_variable_get_captured (_tmp818_); + _tmp820_ = _tmp819_; + _tmp801_ = !_tmp820_; } else { - _tmp793_ = FALSE; + _tmp801_ = FALSE; } - _tmp817_ = _tmp793_; - if (_tmp817_) { - gboolean _tmp818_ = FALSE; - ValaLocalVariable* _tmp819_; - ValaDataType* _tmp820_; - ValaDataType* _tmp821_; - gboolean _tmp827_; - _tmp819_ = local; - _tmp820_ = vala_variable_get_variable_type ((ValaVariable*) _tmp819_); - _tmp821_ = _tmp820_; - if (VALA_IS_ARRAY_TYPE (_tmp821_)) { - ValaLocalVariable* _tmp822_; - ValaDataType* _tmp823_; - ValaDataType* _tmp824_; - gboolean _tmp825_; - gboolean _tmp826_; - _tmp822_ = local; - _tmp823_ = vala_variable_get_variable_type ((ValaVariable*) _tmp822_); - _tmp824_ = _tmp823_; - _tmp825_ = vala_array_type_get_inline_allocated (VALA_ARRAY_TYPE (_tmp824_)); - _tmp826_ = _tmp825_; - _tmp818_ = _tmp826_; + _tmp821_ = _tmp801_; + if (_tmp821_) { + ValaLocalVariable* _tmp822_; + gboolean _tmp823_ = FALSE; + _tmp822_ = local; + _tmp823_ = vala_ccode_base_module_variable_accessible_in_finally ((ValaCCodeBaseModule*) self, _tmp822_); + _tmp800_ = !_tmp823_; + } else { + _tmp800_ = FALSE; + } + _tmp824_ = _tmp800_; + if (_tmp824_) { + gboolean _tmp825_ = FALSE; + ValaLocalVariable* _tmp826_; + ValaDataType* _tmp827_; + ValaDataType* _tmp828_; + gboolean _tmp834_; + _tmp826_ = local; + _tmp827_ = vala_variable_get_variable_type ((ValaVariable*) _tmp826_); + _tmp828_ = _tmp827_; + if (VALA_IS_ARRAY_TYPE (_tmp828_)) { + ValaLocalVariable* _tmp829_; + ValaDataType* _tmp830_; + ValaDataType* _tmp831_; + gboolean _tmp832_; + gboolean _tmp833_; + _tmp829_ = local; + _tmp830_ = vala_variable_get_variable_type ((ValaVariable*) _tmp829_); + _tmp831_ = _tmp830_; + _tmp832_ = vala_array_type_get_inline_allocated (VALA_ARRAY_TYPE (_tmp831_)); + _tmp833_ = _tmp832_; + _tmp825_ = _tmp833_; } else { - _tmp818_ = FALSE; + _tmp825_ = FALSE; } - _tmp827_ = _tmp818_; - _tmp792_ = !_tmp827_; + _tmp834_ = _tmp825_; + _tmp799_ = !_tmp834_; } else { - _tmp792_ = FALSE; + _tmp799_ = FALSE; } - _tmp828_ = _tmp792_; - if (_tmp828_) { - ValaMemberAccess* _tmp829_; - ValaDataType* _tmp830_; - ValaDataType* _tmp831_; - ValaLocalVariable* _tmp832_; - ValaLocalVariable* _tmp833_; - ValaTargetValue* _tmp834_ = NULL; + _tmp835_ = _tmp799_; + if (_tmp835_) { + ValaMemberAccess* _tmp836_; + ValaDataType* _tmp837_; + ValaDataType* _tmp838_; + ValaLocalVariable* _tmp839_; + ValaLocalVariable* _tmp840_; + ValaTargetValue* _tmp841_ = NULL; ValaGLibValue* glib_value; - ValaMemberAccess* _tmp835_; - ValaGLibValue* _tmp836_; - ValaGLibValue* _tmp837_; - ValaCCodeExpression* _tmp838_; - ValaGLibValue* _tmp841_; - ValaCCodeExpression* _tmp842_; - _tmp829_ = expr; - _tmp830_ = vala_expression_get_value_type ((ValaExpression*) _tmp829_); - _tmp831_ = _tmp830_; - vala_data_type_set_value_owned (_tmp831_, TRUE); - _tmp832_ = local; - vala_symbol_set_active ((ValaSymbol*) _tmp832_, FALSE); - _tmp833_ = local; - _tmp834_ = vala_ccode_base_module_get_local_cvalue ((ValaCCodeBaseModule*) self, _tmp833_); - glib_value = VALA_GLIB_VALUE (_tmp834_); - _tmp835_ = expr; - _tmp836_ = glib_value; - vala_expression_set_target_value ((ValaExpression*) _tmp835_, (ValaTargetValue*) _tmp836_); - _tmp837_ = glib_value; - _tmp838_ = _tmp837_->delegate_target_cvalue; - if (_tmp838_ == NULL) { - ValaGLibValue* _tmp839_; - ValaCCodeConstant* _tmp840_; - _tmp839_ = glib_value; - _tmp840_ = vala_ccode_constant_new ("NULL"); - _vala_ccode_node_unref0 (_tmp839_->delegate_target_cvalue); - _tmp839_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp840_; + ValaMemberAccess* _tmp842_; + ValaGLibValue* _tmp843_; + ValaGLibValue* _tmp844_; + ValaCCodeExpression* _tmp845_; + ValaGLibValue* _tmp848_; + ValaCCodeExpression* _tmp849_; + _tmp836_ = expr; + _tmp837_ = vala_expression_get_value_type ((ValaExpression*) _tmp836_); + _tmp838_ = _tmp837_; + vala_data_type_set_value_owned (_tmp838_, TRUE); + _tmp839_ = local; + vala_symbol_set_active ((ValaSymbol*) _tmp839_, FALSE); + _tmp840_ = local; + _tmp841_ = vala_ccode_base_module_get_local_cvalue ((ValaCCodeBaseModule*) self, _tmp840_); + glib_value = VALA_GLIB_VALUE (_tmp841_); + _tmp842_ = expr; + _tmp843_ = glib_value; + vala_expression_set_target_value ((ValaExpression*) _tmp842_, (ValaTargetValue*) _tmp843_); + _tmp844_ = glib_value; + _tmp845_ = _tmp844_->delegate_target_cvalue; + if (_tmp845_ == NULL) { + ValaGLibValue* _tmp846_; + ValaCCodeConstant* _tmp847_; + _tmp846_ = glib_value; + _tmp847_ = vala_ccode_constant_new ("NULL"); + _vala_ccode_node_unref0 (_tmp846_->delegate_target_cvalue); + _tmp846_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp847_; } - _tmp841_ = glib_value; - _tmp842_ = _tmp841_->delegate_target_destroy_notify_cvalue; - if (_tmp842_ == NULL) { - ValaGLibValue* _tmp843_; - ValaCCodeConstant* _tmp844_; - _tmp843_ = glib_value; - _tmp844_ = vala_ccode_constant_new ("NULL"); - _vala_ccode_node_unref0 (_tmp843_->delegate_target_destroy_notify_cvalue); - _tmp843_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp844_; + _tmp848_ = glib_value; + _tmp849_ = _tmp848_->delegate_target_destroy_notify_cvalue; + if (_tmp849_ == NULL) { + ValaGLibValue* _tmp850_; + ValaCCodeConstant* _tmp851_; + _tmp850_ = glib_value; + _tmp851_ = vala_ccode_constant_new ("NULL"); + _vala_ccode_node_unref0 (_tmp850_->delegate_target_destroy_notify_cvalue); + _tmp850_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp851_; } _vala_target_value_unref0 (glib_value); } else { - ValaMemberAccess* _tmp845_; - gboolean _tmp846_; - gboolean _tmp847_; - _tmp845_ = expr; - _tmp846_ = vala_expression_get_lvalue ((ValaExpression*) _tmp845_); - _tmp847_ = _tmp846_; - if (_tmp847_) { - ValaMemberAccess* _tmp848_; - ValaLocalVariable* _tmp849_; - ValaTargetValue* _tmp850_ = NULL; - ValaTargetValue* _tmp851_; - _tmp848_ = expr; - _tmp849_ = local; - _tmp850_ = vala_ccode_base_module_get_local_cvalue ((ValaCCodeBaseModule*) self, _tmp849_); - _tmp851_ = _tmp850_; - vala_expression_set_target_value ((ValaExpression*) _tmp848_, _tmp851_); - _vala_target_value_unref0 (_tmp851_); + ValaMemberAccess* _tmp852_; + gboolean _tmp853_; + gboolean _tmp854_; + _tmp852_ = expr; + _tmp853_ = vala_expression_get_lvalue ((ValaExpression*) _tmp852_); + _tmp854_ = _tmp853_; + if (_tmp854_) { + ValaMemberAccess* _tmp855_; + ValaLocalVariable* _tmp856_; + ValaTargetValue* _tmp857_ = NULL; + ValaTargetValue* _tmp858_; + _tmp855_ = expr; + _tmp856_ = local; + _tmp857_ = vala_ccode_base_module_get_local_cvalue ((ValaCCodeBaseModule*) self, _tmp856_); + _tmp858_ = _tmp857_; + vala_expression_set_target_value ((ValaExpression*) _tmp855_, _tmp858_); + _vala_target_value_unref0 (_tmp858_); } else { - ValaMemberAccess* _tmp852_; - ValaLocalVariable* _tmp853_; - ValaTargetValue* _tmp854_ = NULL; - ValaTargetValue* _tmp855_; - _tmp852_ = expr; - _tmp853_ = local; - _tmp854_ = vala_code_generator_load_local ((ValaCodeGenerator*) self, _tmp853_); - _tmp855_ = _tmp854_; - vala_expression_set_target_value ((ValaExpression*) _tmp852_, _tmp855_); - _vala_target_value_unref0 (_tmp855_); + ValaMemberAccess* _tmp859_; + ValaLocalVariable* _tmp860_; + ValaTargetValue* _tmp861_ = NULL; + ValaTargetValue* _tmp862_; + _tmp859_ = expr; + _tmp860_ = local; + _tmp861_ = vala_code_generator_load_local ((ValaCodeGenerator*) self, _tmp860_); + _tmp862_ = _tmp861_; + vala_expression_set_target_value ((ValaExpression*) _tmp859_, _tmp862_); + _vala_target_value_unref0 (_tmp862_); } } _vala_code_node_unref0 (local); } else { - ValaMemberAccess* _tmp856_; - ValaSymbol* _tmp857_; - ValaSymbol* _tmp858_; - _tmp856_ = expr; - _tmp857_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp856_); - _tmp858_ = _tmp857_; - if (VALA_IS_PARAMETER (_tmp858_)) { - ValaMemberAccess* _tmp859_; - ValaSymbol* _tmp860_; - ValaSymbol* _tmp861_; - ValaParameter* _tmp862_; + ValaMemberAccess* _tmp863_; + ValaSymbol* _tmp864_; + ValaSymbol* _tmp865_; + _tmp863_ = expr; + _tmp864_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp863_); + _tmp865_ = _tmp864_; + if (VALA_IS_PARAMETER (_tmp865_)) { + ValaMemberAccess* _tmp866_; + ValaSymbol* _tmp867_; + ValaSymbol* _tmp868_; + ValaParameter* _tmp869_; ValaParameter* param; - ValaMemberAccess* _tmp863_; - gboolean _tmp864_; - gboolean _tmp865_; - _tmp859_ = expr; - _tmp860_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp859_); - _tmp861_ = _tmp860_; - _tmp862_ = _vala_code_node_ref0 (VALA_PARAMETER (_tmp861_)); - param = _tmp862_; - _tmp863_ = expr; - _tmp864_ = vala_expression_get_lvalue ((ValaExpression*) _tmp863_); - _tmp865_ = _tmp864_; - if (_tmp865_) { - ValaMemberAccess* _tmp866_; - ValaParameter* _tmp867_; - ValaTargetValue* _tmp868_ = NULL; - ValaTargetValue* _tmp869_; - _tmp866_ = expr; - _tmp867_ = param; - _tmp868_ = vala_ccode_base_module_get_parameter_cvalue ((ValaCCodeBaseModule*) self, _tmp867_); - _tmp869_ = _tmp868_; - vala_expression_set_target_value ((ValaExpression*) _tmp866_, _tmp869_); - _vala_target_value_unref0 (_tmp869_); + ValaMemberAccess* _tmp870_; + gboolean _tmp871_; + gboolean _tmp872_; + _tmp866_ = expr; + _tmp867_ = vala_expression_get_symbol_reference ((ValaExpression*) _tmp866_); + _tmp868_ = _tmp867_; + _tmp869_ = _vala_code_node_ref0 (VALA_PARAMETER (_tmp868_)); + param = _tmp869_; + _tmp870_ = expr; + _tmp871_ = vala_expression_get_lvalue ((ValaExpression*) _tmp870_); + _tmp872_ = _tmp871_; + if (_tmp872_) { + ValaMemberAccess* _tmp873_; + ValaParameter* _tmp874_; + ValaTargetValue* _tmp875_ = NULL; + ValaTargetValue* _tmp876_; + _tmp873_ = expr; + _tmp874_ = param; + _tmp875_ = vala_ccode_base_module_get_parameter_cvalue ((ValaCCodeBaseModule*) self, _tmp874_); + _tmp876_ = _tmp875_; + vala_expression_set_target_value ((ValaExpression*) _tmp873_, _tmp876_); + _vala_target_value_unref0 (_tmp876_); } else { - ValaMemberAccess* _tmp870_; - ValaParameter* _tmp871_; - ValaTargetValue* _tmp872_ = NULL; - ValaTargetValue* _tmp873_; - _tmp870_ = expr; - _tmp871_ = param; - _tmp872_ = vala_code_generator_load_parameter ((ValaCodeGenerator*) self, _tmp871_); - _tmp873_ = _tmp872_; - vala_expression_set_target_value ((ValaExpression*) _tmp870_, _tmp873_); - _vala_target_value_unref0 (_tmp873_); + ValaMemberAccess* _tmp877_; + ValaParameter* _tmp878_; + ValaTargetValue* _tmp879_ = NULL; + ValaTargetValue* _tmp880_; + _tmp877_ = expr; + _tmp878_ = param; + _tmp879_ = vala_code_generator_load_parameter ((ValaCodeGenerator*) self, _tmp878_); + _tmp880_ = _tmp879_; + vala_expression_set_target_value ((ValaExpression*) _tmp877_, _tmp880_); + _vala_target_value_unref0 (_tmp880_); } _vala_code_node_unref0 (param); } @@ -3573,11 +3592,11 @@ ValaParameter* _tmp78_; gboolean _tmp79_; gboolean _tmp80_; - gboolean _tmp333_ = FALSE; - ValaParameter* _tmp334_; - gboolean _tmp335_; - gboolean _tmp336_; - gboolean _tmp338_; + gboolean _tmp327_ = FALSE; + ValaParameter* _tmp328_; + gboolean _tmp329_; + gboolean _tmp330_; + gboolean _tmp332_; _tmp74_ = param; _tmp75_ = vala_symbol_get_name ((ValaSymbol*) _tmp74_); _tmp76_ = _tmp75_; @@ -3751,18 +3770,14 @@ ValaCCodeExpression* _tmp143_ = NULL; ValaCCodeExpression* _tmp144_; ValaParameter* _tmp145_; - const gchar* _tmp146_; - const gchar* _tmp147_; - gchar* _tmp148_ = NULL; - gchar* _tmp149_; - gchar* _tmp150_ = NULL; - gchar* _tmp151_; - ValaCCodeMemberAccess* _tmp152_; - ValaGLibValue* _tmp153_; - ValaDataType* _tmp154_; - ValaDataType* _tmp155_; - gboolean _tmp156_; - gboolean _tmp157_; + gchar* _tmp146_ = NULL; + gchar* _tmp147_; + ValaCCodeMemberAccess* _tmp148_; + ValaGLibValue* _tmp149_; + ValaDataType* _tmp150_; + ValaDataType* _tmp151_; + gboolean _tmp152_; + gboolean _tmp153_; _tmp138_ = _result_; _tmp139_ = block; _tmp140_ = vala_ccode_base_module_get_block_id ((ValaCCodeBaseModule*) self, _tmp139_); @@ -3771,319 +3786,325 @@ _tmp143_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp142_); _tmp144_ = _tmp143_; _tmp145_ = param; - _tmp146_ = vala_symbol_get_name ((ValaSymbol*) _tmp145_); + _tmp146_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp145_); _tmp147_ = _tmp146_; - _tmp148_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp147_); - _tmp149_ = _tmp148_; - _tmp150_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp149_); - _tmp151_ = _tmp150_; - _tmp152_ = vala_ccode_member_access_new_pointer (_tmp144_, _tmp151_); + _tmp148_ = vala_ccode_member_access_new_pointer (_tmp144_, _tmp147_); _vala_ccode_node_unref0 (_tmp138_->delegate_target_cvalue); - _tmp138_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp152_; - _g_free0 (_tmp151_); - _g_free0 (_tmp149_); + _tmp138_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp148_; + _g_free0 (_tmp147_); _vala_ccode_node_unref0 (_tmp144_); _g_free0 (_tmp142_); - _tmp153_ = _result_; - _tmp154_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp153_); - _tmp155_ = _tmp154_; - _tmp156_ = vala_data_type_get_value_owned (_tmp155_); - _tmp157_ = _tmp156_; - if (_tmp157_) { - ValaGLibValue* _tmp158_; - ValaBlock* _tmp159_; - gint _tmp160_ = 0; - gchar* _tmp161_ = NULL; - gchar* _tmp162_; - ValaCCodeExpression* _tmp163_ = NULL; - ValaCCodeExpression* _tmp164_; - ValaParameter* _tmp165_; - const gchar* _tmp166_; - const gchar* _tmp167_; - gchar* _tmp168_ = NULL; - gchar* _tmp169_; - gchar* _tmp170_ = NULL; - gchar* _tmp171_; - ValaCCodeMemberAccess* _tmp172_; - _tmp158_ = _result_; - _tmp159_ = block; - _tmp160_ = vala_ccode_base_module_get_block_id ((ValaCCodeBaseModule*) self, _tmp159_); - _tmp161_ = g_strdup_printf ("_data%d_", _tmp160_); - _tmp162_ = _tmp161_; - _tmp163_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp162_); - _tmp164_ = _tmp163_; - _tmp165_ = param; - _tmp166_ = vala_symbol_get_name ((ValaSymbol*) _tmp165_); + _tmp149_ = _result_; + _tmp150_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp149_); + _tmp151_ = _tmp150_; + _tmp152_ = vala_data_type_get_value_owned (_tmp151_); + _tmp153_ = _tmp152_; + if (_tmp153_) { + ValaGLibValue* _tmp154_; + ValaBlock* _tmp155_; + gint _tmp156_ = 0; + gchar* _tmp157_ = NULL; + gchar* _tmp158_; + ValaCCodeExpression* _tmp159_ = NULL; + ValaCCodeExpression* _tmp160_; + ValaParameter* _tmp161_; + const gchar* _tmp162_; + const gchar* _tmp163_; + gchar* _tmp164_ = NULL; + gchar* _tmp165_; + gchar* _tmp166_ = NULL; + gchar* _tmp167_; + ValaCCodeMemberAccess* _tmp168_; + _tmp154_ = _result_; + _tmp155_ = block; + _tmp156_ = vala_ccode_base_module_get_block_id ((ValaCCodeBaseModule*) self, _tmp155_); + _tmp157_ = g_strdup_printf ("_data%d_", _tmp156_); + _tmp158_ = _tmp157_; + _tmp159_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp158_); + _tmp160_ = _tmp159_; + _tmp161_ = param; + _tmp162_ = vala_symbol_get_name ((ValaSymbol*) _tmp161_); + _tmp163_ = _tmp162_; + _tmp164_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp163_); + _tmp165_ = _tmp164_; + _tmp166_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp165_); _tmp167_ = _tmp166_; - _tmp168_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp167_); - _tmp169_ = _tmp168_; - _tmp170_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp169_); - _tmp171_ = _tmp170_; - _tmp172_ = vala_ccode_member_access_new_pointer (_tmp164_, _tmp171_); - _vala_ccode_node_unref0 (_tmp158_->delegate_target_destroy_notify_cvalue); - _tmp158_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp172_; - _g_free0 (_tmp171_); - _g_free0 (_tmp169_); - _vala_ccode_node_unref0 (_tmp164_); - _g_free0 (_tmp162_); + _tmp168_ = vala_ccode_member_access_new_pointer (_tmp160_, _tmp167_); + _vala_ccode_node_unref0 (_tmp154_->delegate_target_destroy_notify_cvalue); + _tmp154_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp168_; + _g_free0 (_tmp167_); + _g_free0 (_tmp165_); + _vala_ccode_node_unref0 (_tmp160_); + _g_free0 (_tmp158_); } } } _vala_code_node_unref0 (block); } else { - gboolean _tmp173_ = FALSE; - _tmp173_ = vala_ccode_base_module_is_in_coroutine ((ValaCCodeBaseModule*) self); - if (_tmp173_) { - ValaGLibValue* _tmp174_; - ValaParameter* _tmp175_; - const gchar* _tmp176_; - const gchar* _tmp177_; - ValaCCodeExpression* _tmp178_ = NULL; - gboolean _tmp179_ = FALSE; - ValaDelegateType* _tmp180_; - gboolean _tmp186_; - _tmp174_ = _result_; - _tmp175_ = param; - _tmp176_ = vala_symbol_get_name ((ValaSymbol*) _tmp175_); - _tmp177_ = _tmp176_; - _tmp178_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp177_); - _vala_ccode_node_unref0 (_tmp174_->cvalue); - _tmp174_->cvalue = _tmp178_; - _tmp180_ = delegate_type; - if (_tmp180_ != NULL) { - ValaDelegateType* _tmp181_; - ValaDelegate* _tmp182_; - ValaDelegate* _tmp183_; - gboolean _tmp184_; - gboolean _tmp185_; - _tmp181_ = delegate_type; - _tmp182_ = vala_delegate_type_get_delegate_symbol (_tmp181_); - _tmp183_ = _tmp182_; - _tmp184_ = vala_delegate_get_has_target (_tmp183_); - _tmp185_ = _tmp184_; - _tmp179_ = _tmp185_; + gboolean _tmp169_ = FALSE; + _tmp169_ = vala_ccode_base_module_is_in_coroutine ((ValaCCodeBaseModule*) self); + if (_tmp169_) { + ValaGLibValue* _tmp170_; + ValaParameter* _tmp171_; + const gchar* _tmp172_; + const gchar* _tmp173_; + ValaCCodeExpression* _tmp174_ = NULL; + gboolean _tmp175_ = FALSE; + ValaDelegateType* _tmp176_; + gboolean _tmp182_; + _tmp170_ = _result_; + _tmp171_ = param; + _tmp172_ = vala_symbol_get_name ((ValaSymbol*) _tmp171_); + _tmp173_ = _tmp172_; + _tmp174_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp173_); + _vala_ccode_node_unref0 (_tmp170_->cvalue); + _tmp170_->cvalue = _tmp174_; + _tmp176_ = delegate_type; + if (_tmp176_ != NULL) { + ValaDelegateType* _tmp177_; + ValaDelegate* _tmp178_; + ValaDelegate* _tmp179_; + gboolean _tmp180_; + gboolean _tmp181_; + _tmp177_ = delegate_type; + _tmp178_ = vala_delegate_type_get_delegate_symbol (_tmp177_); + _tmp179_ = _tmp178_; + _tmp180_ = vala_delegate_get_has_target (_tmp179_); + _tmp181_ = _tmp180_; + _tmp175_ = _tmp181_; } else { - _tmp179_ = FALSE; + _tmp175_ = FALSE; } - _tmp186_ = _tmp179_; - if (_tmp186_) { - ValaGLibValue* _tmp187_; - ValaCCodeIdentifier* _tmp188_; - ValaCCodeIdentifier* _tmp189_; - ValaParameter* _tmp190_; - const gchar* _tmp191_; - const gchar* _tmp192_; - gchar* _tmp193_ = NULL; - gchar* _tmp194_; - gchar* _tmp195_ = NULL; - gchar* _tmp196_; - ValaCCodeMemberAccess* _tmp197_; - ValaDelegateType* _tmp198_; - gboolean _tmp199_; - gboolean _tmp200_; - _tmp187_ = _result_; - _tmp188_ = vala_ccode_identifier_new ("_data_"); - _tmp189_ = _tmp188_; - _tmp190_ = param; - _tmp191_ = vala_symbol_get_name ((ValaSymbol*) _tmp190_); + _tmp182_ = _tmp175_; + if (_tmp182_) { + ValaGLibValue* _tmp183_; + ValaCCodeIdentifier* _tmp184_; + ValaCCodeIdentifier* _tmp185_; + ValaParameter* _tmp186_; + gchar* _tmp187_ = NULL; + gchar* _tmp188_; + ValaCCodeMemberAccess* _tmp189_; + ValaDelegateType* _tmp190_; + gboolean _tmp191_; + gboolean _tmp192_; + _tmp183_ = _result_; + _tmp184_ = vala_ccode_identifier_new ("_data_"); + _tmp185_ = _tmp184_; + _tmp186_ = param; + _tmp187_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp186_); + _tmp188_ = _tmp187_; + _tmp189_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp185_, _tmp188_); + _vala_ccode_node_unref0 (_tmp183_->delegate_target_cvalue); + _tmp183_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp189_; + _g_free0 (_tmp188_); + _vala_ccode_node_unref0 (_tmp185_); + _tmp190_ = delegate_type; + _tmp191_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp190_); _tmp192_ = _tmp191_; - _tmp193_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp192_); - _tmp194_ = _tmp193_; - _tmp195_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp194_); - _tmp196_ = _tmp195_; - _tmp197_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp189_, _tmp196_); - _vala_ccode_node_unref0 (_tmp187_->delegate_target_cvalue); - _tmp187_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp197_; - _g_free0 (_tmp196_); - _g_free0 (_tmp194_); - _vala_ccode_node_unref0 (_tmp189_); - _tmp198_ = delegate_type; - _tmp199_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp198_); - _tmp200_ = _tmp199_; - if (_tmp200_) { - ValaGLibValue* _tmp201_; - ValaCCodeIdentifier* _tmp202_; - ValaCCodeIdentifier* _tmp203_; - ValaParameter* _tmp204_; - const gchar* _tmp205_; - const gchar* _tmp206_; - gchar* _tmp207_ = NULL; - gchar* _tmp208_; - gchar* _tmp209_ = NULL; - gchar* _tmp210_; - ValaCCodeMemberAccess* _tmp211_; - _tmp201_ = _result_; - _tmp202_ = vala_ccode_identifier_new ("_data_"); - _tmp203_ = _tmp202_; - _tmp204_ = param; - _tmp205_ = vala_symbol_get_name ((ValaSymbol*) _tmp204_); - _tmp206_ = _tmp205_; - _tmp207_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp206_); - _tmp208_ = _tmp207_; - _tmp209_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp208_); - _tmp210_ = _tmp209_; - _tmp211_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp203_, _tmp210_); - _vala_ccode_node_unref0 (_tmp201_->delegate_target_destroy_notify_cvalue); - _tmp201_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp211_; - _g_free0 (_tmp210_); - _g_free0 (_tmp208_); - _vala_ccode_node_unref0 (_tmp203_); + if (_tmp192_) { + ValaGLibValue* _tmp193_; + ValaCCodeIdentifier* _tmp194_; + ValaCCodeIdentifier* _tmp195_; + ValaParameter* _tmp196_; + const gchar* _tmp197_; + const gchar* _tmp198_; + gchar* _tmp199_ = NULL; + gchar* _tmp200_; + gchar* _tmp201_ = NULL; + gchar* _tmp202_; + ValaCCodeMemberAccess* _tmp203_; + _tmp193_ = _result_; + _tmp194_ = vala_ccode_identifier_new ("_data_"); + _tmp195_ = _tmp194_; + _tmp196_ = param; + _tmp197_ = vala_symbol_get_name ((ValaSymbol*) _tmp196_); + _tmp198_ = _tmp197_; + _tmp199_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp198_); + _tmp200_ = _tmp199_; + _tmp201_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp200_); + _tmp202_ = _tmp201_; + _tmp203_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp195_, _tmp202_); + _vala_ccode_node_unref0 (_tmp193_->delegate_target_destroy_notify_cvalue); + _tmp193_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp203_; + _g_free0 (_tmp202_); + _g_free0 (_tmp200_); + _vala_ccode_node_unref0 (_tmp195_); } } } else { - ValaGLibValue* _tmp212_; - ValaDataType* _tmp213_; - ValaDataType* _tmp214_; - ValaTypeSymbol* _tmp215_; - ValaTypeSymbol* _tmp216_; - ValaStruct* _tmp217_; + ValaGLibValue* _tmp204_; + ValaDataType* _tmp205_; + ValaDataType* _tmp206_; + ValaTypeSymbol* _tmp207_; + ValaTypeSymbol* _tmp208_; + ValaStruct* _tmp209_; ValaStruct* type_as_struct; - ValaParameter* _tmp218_; - ValaParameterDirection _tmp219_; - ValaParameterDirection _tmp220_; - gboolean _tmp223_ = FALSE; - ValaParameter* _tmp224_; - ValaParameterDirection _tmp225_; - ValaParameterDirection _tmp226_; - gboolean _tmp244_; - gboolean _tmp293_ = FALSE; - ValaDelegateType* _tmp294_; - gboolean _tmp300_; - _tmp212_ = _result_; - _tmp213_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp212_); - _tmp214_ = _tmp213_; - _tmp215_ = vala_data_type_get_data_type (_tmp214_); - _tmp216_ = _tmp215_; - _tmp217_ = _vala_code_node_ref0 (VALA_IS_STRUCT (_tmp216_) ? ((ValaStruct*) _tmp216_) : NULL); - type_as_struct = _tmp217_; - _tmp218_ = param; - _tmp219_ = vala_parameter_get_direction (_tmp218_); - _tmp220_ = _tmp219_; - if (_tmp220_ == VALA_PARAMETER_DIRECTION_OUT) { - const gchar* _tmp221_; - gchar* _tmp222_; - _tmp221_ = name; - _tmp222_ = g_strconcat ("_vala_", _tmp221_, NULL); + ValaParameter* _tmp210_; + ValaParameterDirection _tmp211_; + ValaParameterDirection _tmp212_; + gboolean _tmp215_ = FALSE; + ValaParameter* _tmp216_; + ValaParameterDirection _tmp217_; + ValaParameterDirection _tmp218_; + gboolean _tmp236_; + gboolean _tmp285_ = FALSE; + ValaDelegateType* _tmp286_; + gboolean _tmp292_; + _tmp204_ = _result_; + _tmp205_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp204_); + _tmp206_ = _tmp205_; + _tmp207_ = vala_data_type_get_data_type (_tmp206_); + _tmp208_ = _tmp207_; + _tmp209_ = _vala_code_node_ref0 (VALA_IS_STRUCT (_tmp208_) ? ((ValaStruct*) _tmp208_) : NULL); + type_as_struct = _tmp209_; + _tmp210_ = param; + _tmp211_ = vala_parameter_get_direction (_tmp210_); + _tmp212_ = _tmp211_; + if (_tmp212_ == VALA_PARAMETER_DIRECTION_OUT) { + const gchar* _tmp213_; + gchar* _tmp214_; + _tmp213_ = name; + _tmp214_ = g_strconcat ("_vala_", _tmp213_, NULL); _g_free0 (name); - name = _tmp222_; + name = _tmp214_; } - _tmp224_ = param; - _tmp225_ = vala_parameter_get_direction (_tmp224_); - _tmp226_ = _tmp225_; - if (_tmp226_ == VALA_PARAMETER_DIRECTION_REF) { - _tmp223_ = TRUE; + _tmp216_ = param; + _tmp217_ = vala_parameter_get_direction (_tmp216_); + _tmp218_ = _tmp217_; + if (_tmp218_ == VALA_PARAMETER_DIRECTION_REF) { + _tmp215_ = TRUE; } else { - gboolean _tmp227_ = FALSE; - gboolean _tmp228_ = FALSE; - gboolean _tmp229_ = FALSE; - ValaParameter* _tmp230_; - ValaParameterDirection _tmp231_; - ValaParameterDirection _tmp232_; - gboolean _tmp234_; - gboolean _tmp237_; - gboolean _tmp243_; - _tmp230_ = param; - _tmp231_ = vala_parameter_get_direction (_tmp230_); - _tmp232_ = _tmp231_; - if (_tmp232_ == VALA_PARAMETER_DIRECTION_IN) { - ValaStruct* _tmp233_; - _tmp233_ = type_as_struct; - _tmp229_ = _tmp233_ != NULL; + gboolean _tmp219_ = FALSE; + gboolean _tmp220_ = FALSE; + gboolean _tmp221_ = FALSE; + ValaParameter* _tmp222_; + ValaParameterDirection _tmp223_; + ValaParameterDirection _tmp224_; + gboolean _tmp226_; + gboolean _tmp229_; + gboolean _tmp235_; + _tmp222_ = param; + _tmp223_ = vala_parameter_get_direction (_tmp222_); + _tmp224_ = _tmp223_; + if (_tmp224_ == VALA_PARAMETER_DIRECTION_IN) { + ValaStruct* _tmp225_; + _tmp225_ = type_as_struct; + _tmp221_ = _tmp225_ != NULL; } else { - _tmp229_ = FALSE; + _tmp221_ = FALSE; } - _tmp234_ = _tmp229_; - if (_tmp234_) { - ValaStruct* _tmp235_; - gboolean _tmp236_ = FALSE; - _tmp235_ = type_as_struct; - _tmp236_ = vala_struct_is_simple_type (_tmp235_); - _tmp228_ = !_tmp236_; + _tmp226_ = _tmp221_; + if (_tmp226_) { + ValaStruct* _tmp227_; + gboolean _tmp228_ = FALSE; + _tmp227_ = type_as_struct; + _tmp228_ = vala_struct_is_simple_type (_tmp227_); + _tmp220_ = !_tmp228_; } else { - _tmp228_ = FALSE; + _tmp220_ = FALSE; } - _tmp237_ = _tmp228_; - if (_tmp237_) { - ValaGLibValue* _tmp238_; - ValaDataType* _tmp239_; - ValaDataType* _tmp240_; - gboolean _tmp241_; - gboolean _tmp242_; - _tmp238_ = _result_; - _tmp239_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp238_); - _tmp240_ = _tmp239_; - _tmp241_ = vala_data_type_get_nullable (_tmp240_); - _tmp242_ = _tmp241_; - _tmp227_ = !_tmp242_; + _tmp229_ = _tmp220_; + if (_tmp229_) { + ValaGLibValue* _tmp230_; + ValaDataType* _tmp231_; + ValaDataType* _tmp232_; + gboolean _tmp233_; + gboolean _tmp234_; + _tmp230_ = _result_; + _tmp231_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp230_); + _tmp232_ = _tmp231_; + _tmp233_ = vala_data_type_get_nullable (_tmp232_); + _tmp234_ = _tmp233_; + _tmp219_ = !_tmp234_; } else { - _tmp227_ = FALSE; + _tmp219_ = FALSE; } - _tmp243_ = _tmp227_; - _tmp223_ = _tmp243_; + _tmp235_ = _tmp219_; + _tmp215_ = _tmp235_; } - _tmp244_ = _tmp223_; - if (_tmp244_) { - ValaGLibValue* _tmp245_; - const gchar* _tmp246_; - gchar* _tmp247_ = NULL; - gchar* _tmp248_; - ValaCCodeIdentifier* _tmp249_; - ValaCCodeIdentifier* _tmp250_; - ValaCCodeUnaryExpression* _tmp251_; - _tmp245_ = _result_; - _tmp246_ = name; - _tmp247_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp246_); - _tmp248_ = _tmp247_; - _tmp249_ = vala_ccode_identifier_new (_tmp248_); - _tmp250_ = _tmp249_; - _tmp251_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, (ValaCCodeExpression*) _tmp250_); - _vala_ccode_node_unref0 (_tmp245_->cvalue); - _tmp245_->cvalue = (ValaCCodeExpression*) _tmp251_; - _vala_ccode_node_unref0 (_tmp250_); - _g_free0 (_tmp248_); + _tmp236_ = _tmp215_; + if (_tmp236_) { + ValaGLibValue* _tmp237_; + const gchar* _tmp238_; + gchar* _tmp239_ = NULL; + gchar* _tmp240_; + ValaCCodeIdentifier* _tmp241_; + ValaCCodeIdentifier* _tmp242_; + ValaCCodeUnaryExpression* _tmp243_; + _tmp237_ = _result_; + _tmp238_ = name; + _tmp239_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp238_); + _tmp240_ = _tmp239_; + _tmp241_ = vala_ccode_identifier_new (_tmp240_); + _tmp242_ = _tmp241_; + _tmp243_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, (ValaCCodeExpression*) _tmp242_); + _vala_ccode_node_unref0 (_tmp237_->cvalue); + _tmp237_->cvalue = (ValaCCodeExpression*) _tmp243_; + _vala_ccode_node_unref0 (_tmp242_); + _g_free0 (_tmp240_); } else { - gboolean _tmp252_ = FALSE; - gboolean _tmp253_ = FALSE; - gboolean _tmp254_ = FALSE; - gboolean _tmp255_ = FALSE; - ValaPropertyAccessor* _tmp256_; - ValaPropertyAccessor* _tmp257_; - gboolean _tmp262_; + gboolean _tmp244_ = FALSE; + gboolean _tmp245_ = FALSE; + gboolean _tmp246_ = FALSE; + gboolean _tmp247_ = FALSE; + ValaPropertyAccessor* _tmp248_; + ValaPropertyAccessor* _tmp249_; + gboolean _tmp254_; + gboolean _tmp260_; gboolean _tmp268_; - gboolean _tmp276_; - gboolean _tmp285_; - _tmp256_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); - _tmp257_ = _tmp256_; - if (_tmp257_ != NULL) { - ValaPropertyAccessor* _tmp258_; - ValaPropertyAccessor* _tmp259_; - gboolean _tmp260_; - gboolean _tmp261_; - _tmp258_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); - _tmp259_ = _tmp258_; - _tmp260_ = vala_property_accessor_get_writable (_tmp259_); - _tmp261_ = _tmp260_; - _tmp255_ = _tmp261_; + gboolean _tmp277_; + _tmp248_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); + _tmp249_ = _tmp248_; + if (_tmp249_ != NULL) { + ValaPropertyAccessor* _tmp250_; + ValaPropertyAccessor* _tmp251_; + gboolean _tmp252_; + gboolean _tmp253_; + _tmp250_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); + _tmp251_ = _tmp250_; + _tmp252_ = vala_property_accessor_get_writable (_tmp251_); + _tmp253_ = _tmp252_; + _tmp247_ = _tmp253_; } else { - _tmp255_ = FALSE; + _tmp247_ = FALSE; } - _tmp262_ = _tmp255_; - if (_tmp262_) { - ValaPropertyAccessor* _tmp263_; - ValaPropertyAccessor* _tmp264_; - ValaParameter* _tmp265_; - ValaParameter* _tmp266_; - ValaParameter* _tmp267_; - _tmp263_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); + _tmp254_ = _tmp247_; + if (_tmp254_) { + ValaPropertyAccessor* _tmp255_; + ValaPropertyAccessor* _tmp256_; + ValaParameter* _tmp257_; + ValaParameter* _tmp258_; + ValaParameter* _tmp259_; + _tmp255_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); + _tmp256_ = _tmp255_; + _tmp257_ = vala_property_accessor_get_value_parameter (_tmp256_); + _tmp258_ = _tmp257_; + _tmp259_ = param; + _tmp246_ = _tmp258_ == _tmp259_; + } else { + _tmp246_ = FALSE; + } + _tmp260_ = _tmp246_; + if (_tmp260_) { + ValaPropertyAccessor* _tmp261_; + ValaPropertyAccessor* _tmp262_; + ValaProperty* _tmp263_; + ValaProperty* _tmp264_; + ValaDataType* _tmp265_; + ValaDataType* _tmp266_; + gboolean _tmp267_ = FALSE; + _tmp261_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); + _tmp262_ = _tmp261_; + _tmp263_ = vala_property_accessor_get_prop (_tmp262_); _tmp264_ = _tmp263_; - _tmp265_ = vala_property_accessor_get_value_parameter (_tmp264_); + _tmp265_ = vala_property_get_property_type (_tmp264_); _tmp266_ = _tmp265_; - _tmp267_ = param; - _tmp254_ = _tmp266_ == _tmp267_; + _tmp267_ = vala_data_type_is_real_struct_type (_tmp266_); + _tmp245_ = _tmp267_; } else { - _tmp254_ = FALSE; + _tmp245_ = FALSE; } - _tmp268_ = _tmp254_; + _tmp268_ = _tmp245_; if (_tmp268_) { ValaPropertyAccessor* _tmp269_; ValaPropertyAccessor* _tmp270_; @@ -4091,288 +4112,277 @@ ValaProperty* _tmp272_; ValaDataType* _tmp273_; ValaDataType* _tmp274_; - gboolean _tmp275_ = FALSE; + gboolean _tmp275_; + gboolean _tmp276_; _tmp269_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); _tmp270_ = _tmp269_; _tmp271_ = vala_property_accessor_get_prop (_tmp270_); _tmp272_ = _tmp271_; _tmp273_ = vala_property_get_property_type (_tmp272_); _tmp274_ = _tmp273_; - _tmp275_ = vala_data_type_is_real_struct_type (_tmp274_); - _tmp253_ = _tmp275_; + _tmp275_ = vala_data_type_get_nullable (_tmp274_); + _tmp276_ = _tmp275_; + _tmp244_ = !_tmp276_; } else { - _tmp253_ = FALSE; + _tmp244_ = FALSE; } - _tmp276_ = _tmp253_; - if (_tmp276_) { - ValaPropertyAccessor* _tmp277_; - ValaPropertyAccessor* _tmp278_; - ValaProperty* _tmp279_; - ValaProperty* _tmp280_; - ValaDataType* _tmp281_; - ValaDataType* _tmp282_; - gboolean _tmp283_; - gboolean _tmp284_; - _tmp277_ = vala_ccode_base_module_get_current_property_accessor ((ValaCCodeBaseModule*) self); - _tmp278_ = _tmp277_; - _tmp279_ = vala_property_accessor_get_prop (_tmp278_); + _tmp277_ = _tmp244_; + if (_tmp277_) { + ValaGLibValue* _tmp278_; + ValaCCodeIdentifier* _tmp279_; + ValaCCodeIdentifier* _tmp280_; + ValaCCodeUnaryExpression* _tmp281_; + _tmp278_ = _result_; + _tmp279_ = vala_ccode_identifier_new ("value"); _tmp280_ = _tmp279_; - _tmp281_ = vala_property_get_property_type (_tmp280_); - _tmp282_ = _tmp281_; - _tmp283_ = vala_data_type_get_nullable (_tmp282_); - _tmp284_ = _tmp283_; - _tmp252_ = !_tmp284_; + _tmp281_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, (ValaCCodeExpression*) _tmp280_); + _vala_ccode_node_unref0 (_tmp278_->cvalue); + _tmp278_->cvalue = (ValaCCodeExpression*) _tmp281_; + _vala_ccode_node_unref0 (_tmp280_); } else { - _tmp252_ = FALSE; - } - _tmp285_ = _tmp252_; - if (_tmp285_) { - ValaGLibValue* _tmp286_; - ValaCCodeIdentifier* _tmp287_; - ValaCCodeIdentifier* _tmp288_; - ValaCCodeUnaryExpression* _tmp289_; - _tmp286_ = _result_; - _tmp287_ = vala_ccode_identifier_new ("value"); - _tmp288_ = _tmp287_; - _tmp289_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, (ValaCCodeExpression*) _tmp288_); - _vala_ccode_node_unref0 (_tmp286_->cvalue); - _tmp286_->cvalue = (ValaCCodeExpression*) _tmp289_; - _vala_ccode_node_unref0 (_tmp288_); - } else { - ValaGLibValue* _tmp290_; - const gchar* _tmp291_; - ValaCCodeExpression* _tmp292_ = NULL; - _tmp290_ = _result_; - _tmp291_ = name; - _tmp292_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp291_); - _vala_ccode_node_unref0 (_tmp290_->cvalue); - _tmp290_->cvalue = _tmp292_; + ValaGLibValue* _tmp282_; + const gchar* _tmp283_; + ValaCCodeExpression* _tmp284_ = NULL; + _tmp282_ = _result_; + _tmp283_ = name; + _tmp284_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp283_); + _vala_ccode_node_unref0 (_tmp282_->cvalue); + _tmp282_->cvalue = _tmp284_; } } - _tmp294_ = delegate_type; - if (_tmp294_ != NULL) { - ValaDelegateType* _tmp295_; - ValaDelegate* _tmp296_; - ValaDelegate* _tmp297_; - gboolean _tmp298_; - gboolean _tmp299_; - _tmp295_ = delegate_type; - _tmp296_ = vala_delegate_type_get_delegate_symbol (_tmp295_); - _tmp297_ = _tmp296_; - _tmp298_ = vala_delegate_get_has_target (_tmp297_); - _tmp299_ = _tmp298_; - _tmp293_ = _tmp299_; + _tmp286_ = delegate_type; + if (_tmp286_ != NULL) { + ValaDelegateType* _tmp287_; + ValaDelegate* _tmp288_; + ValaDelegate* _tmp289_; + gboolean _tmp290_; + gboolean _tmp291_; + _tmp287_ = delegate_type; + _tmp288_ = vala_delegate_type_get_delegate_symbol (_tmp287_); + _tmp289_ = _tmp288_; + _tmp290_ = vala_delegate_get_has_target (_tmp289_); + _tmp291_ = _tmp290_; + _tmp285_ = _tmp291_; } else { - _tmp293_ = FALSE; + _tmp285_ = FALSE; } - _tmp300_ = _tmp293_; - if (_tmp300_) { - const gchar* _tmp301_; - gchar* _tmp302_ = NULL; - gchar* _tmp303_; - gchar* _tmp304_ = NULL; - gchar* _tmp305_; - ValaCCodeIdentifier* _tmp306_; - ValaCCodeExpression* _tmp307_; + _tmp292_ = _tmp285_; + if (_tmp292_) { + ValaParameter* _tmp293_; + gchar* _tmp294_ = NULL; + gchar* target_cname; + ValaParameter* _tmp295_; + ValaParameterDirection _tmp296_; + ValaParameterDirection _tmp297_; + const gchar* _tmp300_; + ValaCCodeIdentifier* _tmp301_; ValaCCodeExpression* target_expr; - const gchar* _tmp308_; - gchar* _tmp309_ = NULL; - gchar* _tmp310_; - gchar* _tmp311_ = NULL; - gchar* _tmp312_; - ValaCCodeIdentifier* _tmp313_; - ValaCCodeExpression* _tmp314_; + const gchar* _tmp302_; + gchar* _tmp303_ = NULL; + gchar* _tmp304_; + gchar* _tmp305_ = NULL; + gchar* _tmp306_; + ValaCCodeIdentifier* _tmp307_; + ValaCCodeExpression* _tmp308_; ValaCCodeExpression* delegate_target_destroy_notify; - ValaParameter* _tmp315_; - ValaParameterDirection _tmp316_; - ValaParameterDirection _tmp317_; - ValaGLibValue* _tmp322_; - ValaCCodeExpression* _tmp323_; - ValaCCodeExpression* _tmp324_; - ValaGLibValue* _tmp325_; - ValaDataType* _tmp326_; - ValaDataType* _tmp327_; - gboolean _tmp328_; - gboolean _tmp329_; - _tmp301_ = name; - _tmp302_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp301_); - _tmp303_ = _tmp302_; - _tmp304_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp303_); - _tmp305_ = _tmp304_; - _tmp306_ = vala_ccode_identifier_new (_tmp305_); - _tmp307_ = (ValaCCodeExpression*) _tmp306_; - _g_free0 (_tmp305_); - _g_free0 (_tmp303_); - target_expr = _tmp307_; - _tmp308_ = name; - _tmp309_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp308_); - _tmp310_ = _tmp309_; - _tmp311_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp310_); - _tmp312_ = _tmp311_; - _tmp313_ = vala_ccode_identifier_new (_tmp312_); - _tmp314_ = (ValaCCodeExpression*) _tmp313_; - _g_free0 (_tmp312_); - _g_free0 (_tmp310_); - delegate_target_destroy_notify = _tmp314_; - _tmp315_ = param; - _tmp316_ = vala_parameter_get_direction (_tmp315_); - _tmp317_ = _tmp316_; - if (_tmp317_ == VALA_PARAMETER_DIRECTION_REF) { - ValaCCodeExpression* _tmp318_; - ValaCCodeUnaryExpression* _tmp319_; - ValaCCodeExpression* _tmp320_; - ValaCCodeUnaryExpression* _tmp321_; - _tmp318_ = target_expr; - _tmp319_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp318_); + ValaParameter* _tmp309_; + ValaParameterDirection _tmp310_; + ValaParameterDirection _tmp311_; + ValaGLibValue* _tmp316_; + ValaCCodeExpression* _tmp317_; + ValaCCodeExpression* _tmp318_; + ValaGLibValue* _tmp319_; + ValaDataType* _tmp320_; + ValaDataType* _tmp321_; + gboolean _tmp322_; + gboolean _tmp323_; + _tmp293_ = param; + _tmp294_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp293_); + target_cname = _tmp294_; + _tmp295_ = param; + _tmp296_ = vala_parameter_get_direction (_tmp295_); + _tmp297_ = _tmp296_; + if (_tmp297_ == VALA_PARAMETER_DIRECTION_OUT) { + const gchar* _tmp298_; + gchar* _tmp299_; + _tmp298_ = target_cname; + _tmp299_ = g_strconcat ("_vala_", _tmp298_, NULL); + _g_free0 (target_cname); + target_cname = _tmp299_; + } + _tmp300_ = target_cname; + _tmp301_ = vala_ccode_identifier_new (_tmp300_); + target_expr = (ValaCCodeExpression*) _tmp301_; + _tmp302_ = name; + _tmp303_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp302_); + _tmp304_ = _tmp303_; + _tmp305_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp304_); + _tmp306_ = _tmp305_; + _tmp307_ = vala_ccode_identifier_new (_tmp306_); + _tmp308_ = (ValaCCodeExpression*) _tmp307_; + _g_free0 (_tmp306_); + _g_free0 (_tmp304_); + delegate_target_destroy_notify = _tmp308_; + _tmp309_ = param; + _tmp310_ = vala_parameter_get_direction (_tmp309_); + _tmp311_ = _tmp310_; + if (_tmp311_ == VALA_PARAMETER_DIRECTION_REF) { + ValaCCodeExpression* _tmp312_; + ValaCCodeUnaryExpression* _tmp313_; + ValaCCodeExpression* _tmp314_; + ValaCCodeUnaryExpression* _tmp315_; + _tmp312_ = target_expr; + _tmp313_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp312_); _vala_ccode_node_unref0 (target_expr); - target_expr = (ValaCCodeExpression*) _tmp319_; - _tmp320_ = delegate_target_destroy_notify; - _tmp321_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp320_); + target_expr = (ValaCCodeExpression*) _tmp313_; + _tmp314_ = delegate_target_destroy_notify; + _tmp315_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp314_); _vala_ccode_node_unref0 (delegate_target_destroy_notify); - delegate_target_destroy_notify = (ValaCCodeExpression*) _tmp321_; + delegate_target_destroy_notify = (ValaCCodeExpression*) _tmp315_; } - _tmp322_ = _result_; - _tmp323_ = target_expr; - _tmp324_ = _vala_ccode_node_ref0 (_tmp323_); - _vala_ccode_node_unref0 (_tmp322_->delegate_target_cvalue); - _tmp322_->delegate_target_cvalue = _tmp324_; - _tmp325_ = _result_; - _tmp326_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp325_); - _tmp327_ = _tmp326_; - _tmp328_ = vala_data_type_get_value_owned (_tmp327_); - _tmp329_ = _tmp328_; - if (_tmp329_) { - ValaGLibValue* _tmp330_; - ValaCCodeExpression* _tmp331_; - ValaCCodeExpression* _tmp332_; - _tmp330_ = _result_; - _tmp331_ = delegate_target_destroy_notify; - _tmp332_ = _vala_ccode_node_ref0 (_tmp331_); - _vala_ccode_node_unref0 (_tmp330_->delegate_target_destroy_notify_cvalue); - _tmp330_->delegate_target_destroy_notify_cvalue = _tmp332_; + _tmp316_ = _result_; + _tmp317_ = target_expr; + _tmp318_ = _vala_ccode_node_ref0 (_tmp317_); + _vala_ccode_node_unref0 (_tmp316_->delegate_target_cvalue); + _tmp316_->delegate_target_cvalue = _tmp318_; + _tmp319_ = _result_; + _tmp320_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp319_); + _tmp321_ = _tmp320_; + _tmp322_ = vala_data_type_get_value_owned (_tmp321_); + _tmp323_ = _tmp322_; + if (_tmp323_) { + ValaGLibValue* _tmp324_; + ValaCCodeExpression* _tmp325_; + ValaCCodeExpression* _tmp326_; + _tmp324_ = _result_; + _tmp325_ = delegate_target_destroy_notify; + _tmp326_ = _vala_ccode_node_ref0 (_tmp325_); + _vala_ccode_node_unref0 (_tmp324_->delegate_target_destroy_notify_cvalue); + _tmp324_->delegate_target_destroy_notify_cvalue = _tmp326_; } _vala_ccode_node_unref0 (delegate_target_destroy_notify); _vala_ccode_node_unref0 (target_expr); + _g_free0 (target_cname); } _vala_code_node_unref0 (type_as_struct); } } - _tmp334_ = param; - _tmp335_ = vala_parameter_get_captured (_tmp334_); - _tmp336_ = _tmp335_; - if (!_tmp336_) { - ValaArrayType* _tmp337_; - _tmp337_ = array_type; - _tmp333_ = _tmp337_ != NULL; + _tmp328_ = param; + _tmp329_ = vala_parameter_get_captured (_tmp328_); + _tmp330_ = _tmp329_; + if (!_tmp330_) { + ValaArrayType* _tmp331_; + _tmp331_ = array_type; + _tmp327_ = _tmp331_ != NULL; } else { - _tmp333_ = FALSE; + _tmp327_ = FALSE; } - _tmp338_ = _tmp333_; - if (_tmp338_) { - gboolean _tmp339_ = FALSE; - ValaParameter* _tmp340_; - gboolean _tmp341_ = FALSE; - gboolean _tmp344_; - _tmp340_ = param; - _tmp341_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp340_); - if (_tmp341_) { - ValaParameter* _tmp342_; - gboolean _tmp343_ = FALSE; - _tmp342_ = param; - _tmp343_ = vala_ccode_base_module_get_ccode_array_null_terminated ((ValaCodeNode*) _tmp342_); - _tmp339_ = !_tmp343_; + _tmp332_ = _tmp327_; + if (_tmp332_) { + gboolean _tmp333_ = FALSE; + ValaParameter* _tmp334_; + gboolean _tmp335_ = FALSE; + gboolean _tmp338_; + _tmp334_ = param; + _tmp335_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp334_); + if (_tmp335_) { + ValaParameter* _tmp336_; + gboolean _tmp337_ = FALSE; + _tmp336_ = param; + _tmp337_ = vala_ccode_base_module_get_ccode_array_null_terminated ((ValaCodeNode*) _tmp336_); + _tmp333_ = !_tmp337_; } else { - _tmp339_ = FALSE; + _tmp333_ = FALSE; } - _tmp344_ = _tmp339_; - if (_tmp344_) { + _tmp338_ = _tmp333_; + if (_tmp338_) { { gint dim; dim = 1; { - gboolean _tmp345_; - _tmp345_ = TRUE; + gboolean _tmp339_; + _tmp339_ = TRUE; while (TRUE) { - gboolean _tmp346_; - gint _tmp348_; - ValaArrayType* _tmp349_; - gint _tmp350_; - gint _tmp351_; - ValaParameter* _tmp352_; - gint _tmp353_; - gchar* _tmp354_ = NULL; - gchar* _tmp355_; - ValaCCodeExpression* _tmp356_ = NULL; - ValaCCodeExpression* _tmp357_; + gboolean _tmp340_; + gint _tmp342_; + ValaArrayType* _tmp343_; + gint _tmp344_; + gint _tmp345_; + ValaParameter* _tmp346_; + gint _tmp347_; + gchar* _tmp348_ = NULL; + gchar* _tmp349_; + ValaCCodeExpression* _tmp350_ = NULL; + ValaCCodeExpression* _tmp351_; ValaCCodeExpression* length_expr; - ValaParameter* _tmp358_; - ValaParameterDirection _tmp359_; - ValaParameterDirection _tmp360_; - ValaGLibValue* _tmp373_; - ValaCCodeExpression* _tmp374_; - _tmp346_ = _tmp345_; - if (!_tmp346_) { - gint _tmp347_; - _tmp347_ = dim; - dim = _tmp347_ + 1; + ValaParameter* _tmp352_; + ValaParameterDirection _tmp353_; + ValaParameterDirection _tmp354_; + ValaGLibValue* _tmp367_; + ValaCCodeExpression* _tmp368_; + _tmp340_ = _tmp339_; + if (!_tmp340_) { + gint _tmp341_; + _tmp341_ = dim; + dim = _tmp341_ + 1; } - _tmp345_ = FALSE; - _tmp348_ = dim; - _tmp349_ = array_type; - _tmp350_ = vala_array_type_get_rank (_tmp349_); - _tmp351_ = _tmp350_; - if (!(_tmp348_ <= _tmp351_)) { + _tmp339_ = FALSE; + _tmp342_ = dim; + _tmp343_ = array_type; + _tmp344_ = vala_array_type_get_rank (_tmp343_); + _tmp345_ = _tmp344_; + if (!(_tmp342_ <= _tmp345_)) { break; } + _tmp346_ = param; + _tmp347_ = dim; + _tmp348_ = vala_ccode_base_module_get_parameter_array_length_cname ((ValaCCodeBaseModule*) self, _tmp346_, _tmp347_); + _tmp349_ = _tmp348_; + _tmp350_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp349_); + _tmp351_ = _tmp350_; + _g_free0 (_tmp349_); + length_expr = _tmp351_; _tmp352_ = param; - _tmp353_ = dim; - _tmp354_ = vala_ccode_base_module_get_parameter_array_length_cname ((ValaCCodeBaseModule*) self, _tmp352_, _tmp353_); - _tmp355_ = _tmp354_; - _tmp356_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp355_); - _tmp357_ = _tmp356_; - _g_free0 (_tmp355_); - length_expr = _tmp357_; - _tmp358_ = param; - _tmp359_ = vala_parameter_get_direction (_tmp358_); - _tmp360_ = _tmp359_; - if (_tmp360_ == VALA_PARAMETER_DIRECTION_OUT) { - const gchar* _tmp361_; - gchar* _tmp362_ = NULL; - gchar* _tmp363_; - gint _tmp364_; - gchar* _tmp365_ = NULL; - gchar* _tmp366_; - ValaCCodeExpression* _tmp367_ = NULL; - _tmp361_ = name; - _tmp362_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp361_); - _tmp363_ = _tmp362_; - _tmp364_ = dim; - _tmp365_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, _tmp363_, _tmp364_); - _tmp366_ = _tmp365_; - _tmp367_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp366_); + _tmp353_ = vala_parameter_get_direction (_tmp352_); + _tmp354_ = _tmp353_; + if (_tmp354_ == VALA_PARAMETER_DIRECTION_OUT) { + const gchar* _tmp355_; + gchar* _tmp356_ = NULL; + gchar* _tmp357_; + gint _tmp358_; + gchar* _tmp359_ = NULL; + gchar* _tmp360_; + ValaCCodeExpression* _tmp361_ = NULL; + _tmp355_ = name; + _tmp356_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp355_); + _tmp357_ = _tmp356_; + _tmp358_ = dim; + _tmp359_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, _tmp357_, _tmp358_); + _tmp360_ = _tmp359_; + _tmp361_ = vala_ccode_base_module_get_variable_cexpression ((ValaCCodeBaseModule*) self, _tmp360_); _vala_ccode_node_unref0 (length_expr); - length_expr = _tmp367_; - _g_free0 (_tmp366_); - _g_free0 (_tmp363_); + length_expr = _tmp361_; + _g_free0 (_tmp360_); + _g_free0 (_tmp357_); } else { - ValaParameter* _tmp368_; - ValaParameterDirection _tmp369_; - ValaParameterDirection _tmp370_; - _tmp368_ = param; - _tmp369_ = vala_parameter_get_direction (_tmp368_); - _tmp370_ = _tmp369_; - if (_tmp370_ == VALA_PARAMETER_DIRECTION_REF) { - ValaCCodeExpression* _tmp371_; - ValaCCodeUnaryExpression* _tmp372_; - _tmp371_ = length_expr; - _tmp372_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp371_); + ValaParameter* _tmp362_; + ValaParameterDirection _tmp363_; + ValaParameterDirection _tmp364_; + _tmp362_ = param; + _tmp363_ = vala_parameter_get_direction (_tmp362_); + _tmp364_ = _tmp363_; + if (_tmp364_ == VALA_PARAMETER_DIRECTION_REF) { + ValaCCodeExpression* _tmp365_; + ValaCCodeUnaryExpression* _tmp366_; + _tmp365_ = length_expr; + _tmp366_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_POINTER_INDIRECTION, _tmp365_); _vala_ccode_node_unref0 (length_expr); - length_expr = (ValaCCodeExpression*) _tmp372_; + length_expr = (ValaCCodeExpression*) _tmp366_; } } - _tmp373_ = _result_; - _tmp374_ = length_expr; - vala_glib_value_append_array_length_cvalue (_tmp373_, _tmp374_); + _tmp367_ = _result_; + _tmp368_ = length_expr; + vala_glib_value_append_array_length_cvalue (_tmp367_, _tmp368_); _vala_ccode_node_unref0 (length_expr); } } @@ -4889,103 +4899,96 @@ if (_tmp175_) { ValaField* _tmp176_; gchar* _tmp177_ = NULL; - gchar* _tmp178_; + gchar* target_cname; + ValaField* _tmp178_; gchar* _tmp179_ = NULL; gchar* _tmp180_; - gchar* target_cname; - ValaField* _tmp181_; - gchar* _tmp182_ = NULL; - gchar* _tmp183_; - gchar* _tmp184_ = NULL; - gchar* _tmp185_; + gchar* _tmp181_ = NULL; + gchar* _tmp182_; gchar* target_destroy_notify_cname; - ValaField* _tmp186_; - ValaSymbol* _tmp187_; - ValaSymbol* _tmp188_; - gboolean _tmp189_ = FALSE; + ValaField* _tmp183_; + ValaSymbol* _tmp184_; + ValaSymbol* _tmp185_; + gboolean _tmp186_ = FALSE; _tmp176_ = field; - _tmp177_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp176_); - _tmp178_ = _tmp177_; - _tmp179_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp178_); + _tmp177_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp176_); + target_cname = _tmp177_; + _tmp178_ = field; + _tmp179_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp178_); _tmp180_ = _tmp179_; - _g_free0 (_tmp178_); - target_cname = _tmp180_; - _tmp181_ = field; - _tmp182_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp181_); - _tmp183_ = _tmp182_; - _tmp184_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp183_); + _tmp181_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp180_); + _tmp182_ = _tmp181_; + _g_free0 (_tmp180_); + target_destroy_notify_cname = _tmp182_; + _tmp183_ = field; + _tmp184_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp183_); _tmp185_ = _tmp184_; - _g_free0 (_tmp183_); - target_destroy_notify_cname = _tmp185_; - _tmp186_ = field; - _tmp187_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp186_); - _tmp188_ = _tmp187_; - _tmp189_ = vala_typesymbol_is_reference_type (VALA_TYPESYMBOL (_tmp188_)); - if (_tmp189_) { - ValaGLibValue* _tmp190_; - ValaCCodeExpression* _tmp191_; - const gchar* _tmp192_; - ValaCCodeMemberAccess* _tmp193_; - ValaGLibValue* _tmp194_; - ValaDataType* _tmp195_; - ValaDataType* _tmp196_; - gboolean _tmp197_; - gboolean _tmp198_; - _tmp190_ = _result_; - _tmp191_ = inst; - _tmp192_ = target_cname; - _tmp193_ = vala_ccode_member_access_new_pointer (_tmp191_, _tmp192_); - _vala_ccode_node_unref0 (_tmp190_->delegate_target_cvalue); - _tmp190_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp193_; - _tmp194_ = _result_; - _tmp195_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp194_); - _tmp196_ = _tmp195_; - _tmp197_ = vala_data_type_get_value_owned (_tmp196_); - _tmp198_ = _tmp197_; - if (_tmp198_) { - ValaGLibValue* _tmp199_; - ValaCCodeExpression* _tmp200_; - const gchar* _tmp201_; - ValaCCodeMemberAccess* _tmp202_; - _tmp199_ = _result_; - _tmp200_ = inst; - _tmp201_ = target_destroy_notify_cname; - _tmp202_ = vala_ccode_member_access_new_pointer (_tmp200_, _tmp201_); - _vala_ccode_node_unref0 (_tmp199_->delegate_target_destroy_notify_cvalue); - _tmp199_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp202_; + _tmp186_ = vala_typesymbol_is_reference_type (VALA_TYPESYMBOL (_tmp185_)); + if (_tmp186_) { + ValaGLibValue* _tmp187_; + ValaCCodeExpression* _tmp188_; + const gchar* _tmp189_; + ValaCCodeMemberAccess* _tmp190_; + ValaGLibValue* _tmp191_; + ValaDataType* _tmp192_; + ValaDataType* _tmp193_; + gboolean _tmp194_; + gboolean _tmp195_; + _tmp187_ = _result_; + _tmp188_ = inst; + _tmp189_ = target_cname; + _tmp190_ = vala_ccode_member_access_new_pointer (_tmp188_, _tmp189_); + _vala_ccode_node_unref0 (_tmp187_->delegate_target_cvalue); + _tmp187_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp190_; + _tmp191_ = _result_; + _tmp192_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp191_); + _tmp193_ = _tmp192_; + _tmp194_ = vala_data_type_get_value_owned (_tmp193_); + _tmp195_ = _tmp194_; + if (_tmp195_) { + ValaGLibValue* _tmp196_; + ValaCCodeExpression* _tmp197_; + const gchar* _tmp198_; + ValaCCodeMemberAccess* _tmp199_; + _tmp196_ = _result_; + _tmp197_ = inst; + _tmp198_ = target_destroy_notify_cname; + _tmp199_ = vala_ccode_member_access_new_pointer (_tmp197_, _tmp198_); + _vala_ccode_node_unref0 (_tmp196_->delegate_target_destroy_notify_cvalue); + _tmp196_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp199_; } } else { - ValaGLibValue* _tmp203_; - ValaCCodeExpression* _tmp204_; - const gchar* _tmp205_; - ValaCCodeMemberAccess* _tmp206_; - ValaGLibValue* _tmp207_; - ValaDataType* _tmp208_; - ValaDataType* _tmp209_; - gboolean _tmp210_; - gboolean _tmp211_; - _tmp203_ = _result_; - _tmp204_ = inst; - _tmp205_ = target_cname; - _tmp206_ = vala_ccode_member_access_new (_tmp204_, _tmp205_, FALSE); - _vala_ccode_node_unref0 (_tmp203_->delegate_target_cvalue); - _tmp203_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp206_; - _tmp207_ = _result_; - _tmp208_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp207_); - _tmp209_ = _tmp208_; - _tmp210_ = vala_data_type_get_value_owned (_tmp209_); - _tmp211_ = _tmp210_; - if (_tmp211_) { - ValaGLibValue* _tmp212_; - ValaCCodeExpression* _tmp213_; - const gchar* _tmp214_; - ValaCCodeMemberAccess* _tmp215_; - _tmp212_ = _result_; - _tmp213_ = inst; - _tmp214_ = target_destroy_notify_cname; - _tmp215_ = vala_ccode_member_access_new (_tmp213_, _tmp214_, FALSE); - _vala_ccode_node_unref0 (_tmp212_->delegate_target_destroy_notify_cvalue); - _tmp212_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp215_; + ValaGLibValue* _tmp200_; + ValaCCodeExpression* _tmp201_; + const gchar* _tmp202_; + ValaCCodeMemberAccess* _tmp203_; + ValaGLibValue* _tmp204_; + ValaDataType* _tmp205_; + ValaDataType* _tmp206_; + gboolean _tmp207_; + gboolean _tmp208_; + _tmp200_ = _result_; + _tmp201_ = inst; + _tmp202_ = target_cname; + _tmp203_ = vala_ccode_member_access_new (_tmp201_, _tmp202_, FALSE); + _vala_ccode_node_unref0 (_tmp200_->delegate_target_cvalue); + _tmp200_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp203_; + _tmp204_ = _result_; + _tmp205_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp204_); + _tmp206_ = _tmp205_; + _tmp207_ = vala_data_type_get_value_owned (_tmp206_); + _tmp208_ = _tmp207_; + if (_tmp208_) { + ValaGLibValue* _tmp209_; + ValaCCodeExpression* _tmp210_; + const gchar* _tmp211_; + ValaCCodeMemberAccess* _tmp212_; + _tmp209_ = _result_; + _tmp210_ = inst; + _tmp211_ = target_destroy_notify_cname; + _tmp212_ = vala_ccode_member_access_new (_tmp210_, _tmp211_, FALSE); + _vala_ccode_node_unref0 (_tmp209_->delegate_target_destroy_notify_cvalue); + _tmp209_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp212_; } } _g_free0 (target_destroy_notify_cname); @@ -4997,423 +5000,418 @@ _vala_code_node_unref0 (instance_target_type); _vala_ccode_node_unref0 (pub_inst); } else { - ValaField* _tmp216_; - ValaMemberBinding _tmp217_; - ValaMemberBinding _tmp218_; - _tmp216_ = field; - _tmp217_ = vala_field_get_binding (_tmp216_); - _tmp218_ = _tmp217_; - if (_tmp218_ == VALA_MEMBER_BINDING_CLASS) { - ValaField* _tmp219_; - ValaSymbol* _tmp220_; - ValaSymbol* _tmp221_; - ValaClass* _tmp222_; + ValaField* _tmp213_; + ValaMemberBinding _tmp214_; + ValaMemberBinding _tmp215_; + _tmp213_ = field; + _tmp214_ = vala_field_get_binding (_tmp213_); + _tmp215_ = _tmp214_; + if (_tmp215_ == VALA_MEMBER_BINDING_CLASS) { + ValaField* _tmp216_; + ValaSymbol* _tmp217_; + ValaSymbol* _tmp218_; + ValaClass* _tmp219_; ValaClass* cl; - ValaClass* _tmp223_; - gchar* _tmp224_ = NULL; - gchar* _tmp225_; - gchar* _tmp226_; - gchar* _tmp227_; - ValaCCodeIdentifier* _tmp228_; - ValaCCodeIdentifier* _tmp229_; - ValaCCodeFunctionCall* _tmp230_; - ValaCCodeFunctionCall* _tmp231_; + ValaClass* _tmp220_; + gchar* _tmp221_ = NULL; + gchar* _tmp222_; + gchar* _tmp223_; + gchar* _tmp224_; + ValaCCodeIdentifier* _tmp225_; + ValaCCodeIdentifier* _tmp226_; + ValaCCodeFunctionCall* _tmp227_; + ValaCCodeFunctionCall* _tmp228_; ValaCCodeFunctionCall* cast; ValaCCodeExpression* klass = NULL; - ValaTargetValue* _tmp232_; - ValaCCodeFunctionCall* _tmp256_; - ValaCCodeExpression* _tmp257_; - ValaField* _tmp258_; - ValaSymbolAccessibility _tmp259_; - ValaSymbolAccessibility _tmp260_; - _tmp219_ = field; - _tmp220_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp219_); - _tmp221_ = _tmp220_; - _tmp222_ = _vala_code_node_ref0 (VALA_CLASS (_tmp221_)); - cl = _tmp222_; - _tmp223_ = cl; - _tmp224_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp223_, NULL); - _tmp225_ = _tmp224_; - _tmp226_ = g_strconcat (_tmp225_, "_CLASS", NULL); - _tmp227_ = _tmp226_; - _tmp228_ = vala_ccode_identifier_new (_tmp227_); - _tmp229_ = _tmp228_; - _tmp230_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp229_); - _tmp231_ = _tmp230_; - _vala_ccode_node_unref0 (_tmp229_); - _g_free0 (_tmp227_); - _g_free0 (_tmp225_); - cast = _tmp231_; - _tmp232_ = instance; - if (_tmp232_ == NULL) { - ValaDataType* _tmp233_ = NULL; - ValaDataType* _tmp234_; - gboolean _tmp235_; - _tmp233_ = vala_ccode_base_module_get_this_type ((ValaCCodeBaseModule*) self); - _tmp234_ = _tmp233_; - _tmp235_ = _tmp234_ == NULL; - _vala_code_node_unref0 (_tmp234_); - if (_tmp235_) { - ValaCCodeIdentifier* _tmp236_; - _tmp236_ = vala_ccode_identifier_new ("klass"); + ValaTargetValue* _tmp229_; + ValaCCodeFunctionCall* _tmp253_; + ValaCCodeExpression* _tmp254_; + ValaField* _tmp255_; + ValaSymbolAccessibility _tmp256_; + ValaSymbolAccessibility _tmp257_; + _tmp216_ = field; + _tmp217_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp216_); + _tmp218_ = _tmp217_; + _tmp219_ = _vala_code_node_ref0 (VALA_CLASS (_tmp218_)); + cl = _tmp219_; + _tmp220_ = cl; + _tmp221_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp220_, NULL); + _tmp222_ = _tmp221_; + _tmp223_ = g_strconcat (_tmp222_, "_CLASS", NULL); + _tmp224_ = _tmp223_; + _tmp225_ = vala_ccode_identifier_new (_tmp224_); + _tmp226_ = _tmp225_; + _tmp227_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp226_); + _tmp228_ = _tmp227_; + _vala_ccode_node_unref0 (_tmp226_); + _g_free0 (_tmp224_); + _g_free0 (_tmp222_); + cast = _tmp228_; + _tmp229_ = instance; + if (_tmp229_ == NULL) { + ValaDataType* _tmp230_ = NULL; + ValaDataType* _tmp231_; + gboolean _tmp232_; + _tmp230_ = vala_ccode_base_module_get_this_type ((ValaCCodeBaseModule*) self); + _tmp231_ = _tmp230_; + _tmp232_ = _tmp231_ == NULL; + _vala_code_node_unref0 (_tmp231_); + if (_tmp232_) { + ValaCCodeIdentifier* _tmp233_; + _tmp233_ = vala_ccode_identifier_new ("klass"); _vala_ccode_node_unref0 (klass); - klass = (ValaCCodeExpression*) _tmp236_; + klass = (ValaCCodeExpression*) _tmp233_; } else { - ValaCCodeIdentifier* _tmp237_; - ValaCCodeIdentifier* _tmp238_; - ValaCCodeFunctionCall* _tmp239_; - ValaCCodeFunctionCall* _tmp240_; + ValaCCodeIdentifier* _tmp234_; + ValaCCodeIdentifier* _tmp235_; + ValaCCodeFunctionCall* _tmp236_; + ValaCCodeFunctionCall* _tmp237_; ValaCCodeFunctionCall* k; + ValaCCodeFunctionCall* _tmp238_; + ValaCCodeIdentifier* _tmp239_; + ValaCCodeIdentifier* _tmp240_; ValaCCodeFunctionCall* _tmp241_; - ValaCCodeIdentifier* _tmp242_; - ValaCCodeIdentifier* _tmp243_; - ValaCCodeFunctionCall* _tmp244_; - ValaCCodeExpression* _tmp245_; - _tmp237_ = vala_ccode_identifier_new ("G_OBJECT_GET_CLASS"); - _tmp238_ = _tmp237_; - _tmp239_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp238_); + ValaCCodeExpression* _tmp242_; + _tmp234_ = vala_ccode_identifier_new ("G_OBJECT_GET_CLASS"); + _tmp235_ = _tmp234_; + _tmp236_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp235_); + _tmp237_ = _tmp236_; + _vala_ccode_node_unref0 (_tmp235_); + k = _tmp237_; + _tmp238_ = k; + _tmp239_ = vala_ccode_identifier_new ("self"); _tmp240_ = _tmp239_; - _vala_ccode_node_unref0 (_tmp238_); - k = _tmp240_; + vala_ccode_function_call_add_argument (_tmp238_, (ValaCCodeExpression*) _tmp240_); + _vala_ccode_node_unref0 (_tmp240_); _tmp241_ = k; - _tmp242_ = vala_ccode_identifier_new ("self"); - _tmp243_ = _tmp242_; - vala_ccode_function_call_add_argument (_tmp241_, (ValaCCodeExpression*) _tmp243_); - _vala_ccode_node_unref0 (_tmp243_); - _tmp244_ = k; - _tmp245_ = _vala_ccode_node_ref0 ((ValaCCodeExpression*) _tmp244_); + _tmp242_ = _vala_ccode_node_ref0 ((ValaCCodeExpression*) _tmp241_); _vala_ccode_node_unref0 (klass); - klass = _tmp245_; + klass = _tmp242_; _vala_ccode_node_unref0 (k); } } else { - ValaCCodeIdentifier* _tmp246_; - ValaCCodeIdentifier* _tmp247_; - ValaCCodeFunctionCall* _tmp248_; - ValaCCodeFunctionCall* _tmp249_; + ValaCCodeIdentifier* _tmp243_; + ValaCCodeIdentifier* _tmp244_; + ValaCCodeFunctionCall* _tmp245_; + ValaCCodeFunctionCall* _tmp246_; ValaCCodeFunctionCall* k; - ValaCCodeFunctionCall* _tmp250_; - ValaTargetValue* _tmp251_; - ValaCCodeExpression* _tmp252_ = NULL; - ValaCCodeExpression* _tmp253_; - ValaCCodeFunctionCall* _tmp254_; - ValaCCodeExpression* _tmp255_; - _tmp246_ = vala_ccode_identifier_new ("G_OBJECT_GET_CLASS"); - _tmp247_ = _tmp246_; - _tmp248_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp247_); - _tmp249_ = _tmp248_; - _vala_ccode_node_unref0 (_tmp247_); - k = _tmp249_; - _tmp250_ = k; - _tmp251_ = instance; - _tmp252_ = vala_ccode_base_module_get_cvalue_ ((ValaCCodeBaseModule*) self, _tmp251_); - _tmp253_ = _tmp252_; - vala_ccode_function_call_add_argument (_tmp250_, _tmp253_); - _vala_ccode_node_unref0 (_tmp253_); - _tmp254_ = k; - _tmp255_ = _vala_ccode_node_ref0 ((ValaCCodeExpression*) _tmp254_); + ValaCCodeFunctionCall* _tmp247_; + ValaTargetValue* _tmp248_; + ValaCCodeExpression* _tmp249_ = NULL; + ValaCCodeExpression* _tmp250_; + ValaCCodeFunctionCall* _tmp251_; + ValaCCodeExpression* _tmp252_; + _tmp243_ = vala_ccode_identifier_new ("G_OBJECT_GET_CLASS"); + _tmp244_ = _tmp243_; + _tmp245_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp244_); + _tmp246_ = _tmp245_; + _vala_ccode_node_unref0 (_tmp244_); + k = _tmp246_; + _tmp247_ = k; + _tmp248_ = instance; + _tmp249_ = vala_ccode_base_module_get_cvalue_ ((ValaCCodeBaseModule*) self, _tmp248_); + _tmp250_ = _tmp249_; + vala_ccode_function_call_add_argument (_tmp247_, _tmp250_); + _vala_ccode_node_unref0 (_tmp250_); + _tmp251_ = k; + _tmp252_ = _vala_ccode_node_ref0 ((ValaCCodeExpression*) _tmp251_); _vala_ccode_node_unref0 (klass); - klass = _tmp255_; + klass = _tmp252_; _vala_ccode_node_unref0 (k); } - _tmp256_ = cast; - _tmp257_ = klass; - vala_ccode_function_call_add_argument (_tmp256_, _tmp257_); - _tmp258_ = field; - _tmp259_ = vala_symbol_get_access ((ValaSymbol*) _tmp258_); - _tmp260_ = _tmp259_; - if (_tmp260_ == VALA_SYMBOL_ACCESSIBILITY_PRIVATE) { - ValaClass* _tmp261_; - gchar* _tmp262_ = NULL; - gchar* _tmp263_; - gchar* _tmp264_ = NULL; - gchar* _tmp265_; - ValaCCodeIdentifier* _tmp266_; - ValaCCodeIdentifier* _tmp267_; - ValaCCodeFunctionCall* _tmp268_; - ValaCCodeFunctionCall* _tmp269_; + _tmp253_ = cast; + _tmp254_ = klass; + vala_ccode_function_call_add_argument (_tmp253_, _tmp254_); + _tmp255_ = field; + _tmp256_ = vala_symbol_get_access ((ValaSymbol*) _tmp255_); + _tmp257_ = _tmp256_; + if (_tmp257_ == VALA_SYMBOL_ACCESSIBILITY_PRIVATE) { + ValaClass* _tmp258_; + gchar* _tmp259_ = NULL; + gchar* _tmp260_; + gchar* _tmp261_ = NULL; + gchar* _tmp262_; + ValaCCodeIdentifier* _tmp263_; + ValaCCodeIdentifier* _tmp264_; + ValaCCodeFunctionCall* _tmp265_; + ValaCCodeFunctionCall* _tmp266_; ValaCCodeFunctionCall* ccall; + ValaCCodeFunctionCall* _tmp267_; + ValaCCodeExpression* _tmp268_; + ValaGLibValue* _tmp269_; ValaCCodeFunctionCall* _tmp270_; - ValaCCodeExpression* _tmp271_; - ValaGLibValue* _tmp272_; - ValaCCodeFunctionCall* _tmp273_; - ValaField* _tmp274_; - gchar* _tmp275_ = NULL; - gchar* _tmp276_; - ValaCCodeMemberAccess* _tmp277_; - _tmp261_ = cl; - _tmp262_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp261_, NULL); - _tmp263_ = _tmp262_; - _tmp264_ = g_strdup_printf ("%s_GET_CLASS_PRIVATE", _tmp263_); - _tmp265_ = _tmp264_; - _tmp266_ = vala_ccode_identifier_new (_tmp265_); - _tmp267_ = _tmp266_; - _tmp268_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp267_); - _tmp269_ = _tmp268_; - _vala_ccode_node_unref0 (_tmp267_); - _g_free0 (_tmp265_); - _g_free0 (_tmp263_); - ccall = _tmp269_; + ValaField* _tmp271_; + gchar* _tmp272_ = NULL; + gchar* _tmp273_; + ValaCCodeMemberAccess* _tmp274_; + _tmp258_ = cl; + _tmp259_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp258_, NULL); + _tmp260_ = _tmp259_; + _tmp261_ = g_strdup_printf ("%s_GET_CLASS_PRIVATE", _tmp260_); + _tmp262_ = _tmp261_; + _tmp263_ = vala_ccode_identifier_new (_tmp262_); + _tmp264_ = _tmp263_; + _tmp265_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp264_); + _tmp266_ = _tmp265_; + _vala_ccode_node_unref0 (_tmp264_); + _g_free0 (_tmp262_); + _g_free0 (_tmp260_); + ccall = _tmp266_; + _tmp267_ = ccall; + _tmp268_ = klass; + vala_ccode_function_call_add_argument (_tmp267_, _tmp268_); + _tmp269_ = _result_; _tmp270_ = ccall; - _tmp271_ = klass; - vala_ccode_function_call_add_argument (_tmp270_, _tmp271_); - _tmp272_ = _result_; - _tmp273_ = ccall; - _tmp274_ = field; - _tmp275_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp274_); - _tmp276_ = _tmp275_; - _tmp277_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp273_, _tmp276_); - _vala_ccode_node_unref0 (_tmp272_->cvalue); - _tmp272_->cvalue = (ValaCCodeExpression*) _tmp277_; - _g_free0 (_tmp276_); + _tmp271_ = field; + _tmp272_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp271_); + _tmp273_ = _tmp272_; + _tmp274_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp270_, _tmp273_); + _vala_ccode_node_unref0 (_tmp269_->cvalue); + _tmp269_->cvalue = (ValaCCodeExpression*) _tmp274_; + _g_free0 (_tmp273_); _vala_ccode_node_unref0 (ccall); } else { - ValaGLibValue* _tmp278_; - ValaCCodeFunctionCall* _tmp279_; - ValaField* _tmp280_; - gchar* _tmp281_ = NULL; - gchar* _tmp282_; - ValaCCodeMemberAccess* _tmp283_; - _tmp278_ = _result_; - _tmp279_ = cast; - _tmp280_ = field; - _tmp281_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp280_); - _tmp282_ = _tmp281_; - _tmp283_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp279_, _tmp282_); - _vala_ccode_node_unref0 (_tmp278_->cvalue); - _tmp278_->cvalue = (ValaCCodeExpression*) _tmp283_; - _g_free0 (_tmp282_); + ValaGLibValue* _tmp275_; + ValaCCodeFunctionCall* _tmp276_; + ValaField* _tmp277_; + gchar* _tmp278_ = NULL; + gchar* _tmp279_; + ValaCCodeMemberAccess* _tmp280_; + _tmp275_ = _result_; + _tmp276_ = cast; + _tmp277_ = field; + _tmp278_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp277_); + _tmp279_ = _tmp278_; + _tmp280_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp276_, _tmp279_); + _vala_ccode_node_unref0 (_tmp275_->cvalue); + _tmp275_->cvalue = (ValaCCodeExpression*) _tmp280_; + _g_free0 (_tmp279_); } _vala_ccode_node_unref0 (klass); _vala_ccode_node_unref0 (cast); _vala_code_node_unref0 (cl); } else { + ValaField* _tmp281_; + ValaCCodeFile* _tmp282_; + ValaGLibValue* _tmp283_; ValaField* _tmp284_; - ValaCCodeFile* _tmp285_; - ValaGLibValue* _tmp286_; - ValaField* _tmp287_; - gchar* _tmp288_ = NULL; - gchar* _tmp289_; - ValaCCodeIdentifier* _tmp290_; - gboolean _tmp291_ = FALSE; - ValaArrayType* _tmp292_; - gboolean _tmp295_; + gchar* _tmp285_ = NULL; + gchar* _tmp286_; + ValaCCodeIdentifier* _tmp287_; + gboolean _tmp288_ = FALSE; + ValaArrayType* _tmp289_; + gboolean _tmp292_; + _tmp281_ = field; + _tmp282_ = ((ValaCCodeBaseModule*) self)->cfile; + vala_ccode_base_module_generate_field_declaration ((ValaCCodeBaseModule*) self, _tmp281_, _tmp282_); + _tmp283_ = _result_; _tmp284_ = field; - _tmp285_ = ((ValaCCodeBaseModule*) self)->cfile; - vala_ccode_base_module_generate_field_declaration ((ValaCCodeBaseModule*) self, _tmp284_, _tmp285_); - _tmp286_ = _result_; - _tmp287_ = field; - _tmp288_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp287_); - _tmp289_ = _tmp288_; - _tmp290_ = vala_ccode_identifier_new (_tmp289_); - _vala_ccode_node_unref0 (_tmp286_->cvalue); - _tmp286_->cvalue = (ValaCCodeExpression*) _tmp290_; - _g_free0 (_tmp289_); - _tmp292_ = array_type; - if (_tmp292_ != NULL) { - ValaField* _tmp293_; - gboolean _tmp294_ = FALSE; - _tmp293_ = field; - _tmp294_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp293_); - _tmp291_ = _tmp294_; + _tmp285_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp284_); + _tmp286_ = _tmp285_; + _tmp287_ = vala_ccode_identifier_new (_tmp286_); + _vala_ccode_node_unref0 (_tmp283_->cvalue); + _tmp283_->cvalue = (ValaCCodeExpression*) _tmp287_; + _g_free0 (_tmp286_); + _tmp289_ = array_type; + if (_tmp289_ != NULL) { + ValaField* _tmp290_; + gboolean _tmp291_ = FALSE; + _tmp290_ = field; + _tmp291_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp290_); + _tmp288_ = _tmp291_; } else { - _tmp291_ = FALSE; + _tmp288_ = FALSE; } - _tmp295_ = _tmp291_; - if (_tmp295_) { - gboolean _tmp318_ = FALSE; - ValaArrayType* _tmp319_; - gint _tmp320_; - gint _tmp321_; - gboolean _tmp324_; + _tmp292_ = _tmp288_; + if (_tmp292_) { + gboolean _tmp315_ = FALSE; + ValaArrayType* _tmp316_; + gint _tmp317_; + gint _tmp318_; + gboolean _tmp321_; { gint dim; dim = 1; { - gboolean _tmp296_; - _tmp296_ = TRUE; + gboolean _tmp293_; + _tmp293_ = TRUE; while (TRUE) { - gboolean _tmp297_; + gboolean _tmp294_; + gint _tmp296_; + ValaArrayType* _tmp297_; + gint _tmp298_; gint _tmp299_; - ValaArrayType* _tmp300_; - gint _tmp301_; - gint _tmp302_; gchar* length_cname = NULL; - ValaField* _tmp303_; - gchar* _tmp304_ = NULL; - gchar* _tmp305_; - gboolean _tmp306_; - ValaGLibValue* _tmp314_; - const gchar* _tmp315_; - ValaCCodeIdentifier* _tmp316_; - ValaCCodeIdentifier* _tmp317_; - _tmp297_ = _tmp296_; - if (!_tmp297_) { - gint _tmp298_; - _tmp298_ = dim; - dim = _tmp298_ + 1; + ValaField* _tmp300_; + gchar* _tmp301_ = NULL; + gchar* _tmp302_; + gboolean _tmp303_; + ValaGLibValue* _tmp311_; + const gchar* _tmp312_; + ValaCCodeIdentifier* _tmp313_; + ValaCCodeIdentifier* _tmp314_; + _tmp294_ = _tmp293_; + if (!_tmp294_) { + gint _tmp295_; + _tmp295_ = dim; + dim = _tmp295_ + 1; } - _tmp296_ = FALSE; - _tmp299_ = dim; - _tmp300_ = array_type; - _tmp301_ = vala_array_type_get_rank (_tmp300_); - _tmp302_ = _tmp301_; - if (!(_tmp299_ <= _tmp302_)) { + _tmp293_ = FALSE; + _tmp296_ = dim; + _tmp297_ = array_type; + _tmp298_ = vala_array_type_get_rank (_tmp297_); + _tmp299_ = _tmp298_; + if (!(_tmp296_ <= _tmp299_)) { break; } - _tmp303_ = field; - _tmp304_ = vala_ccode_base_module_get_ccode_array_length_name ((ValaCodeNode*) _tmp303_); - _tmp305_ = _tmp304_; - _tmp306_ = _tmp305_ != NULL; - _g_free0 (_tmp305_); - if (_tmp306_) { - ValaField* _tmp307_; - gchar* _tmp308_ = NULL; - _tmp307_ = field; - _tmp308_ = vala_ccode_base_module_get_ccode_array_length_name ((ValaCodeNode*) _tmp307_); + _tmp300_ = field; + _tmp301_ = vala_ccode_base_module_get_ccode_array_length_name ((ValaCodeNode*) _tmp300_); + _tmp302_ = _tmp301_; + _tmp303_ = _tmp302_ != NULL; + _g_free0 (_tmp302_); + if (_tmp303_) { + ValaField* _tmp304_; + gchar* _tmp305_ = NULL; + _tmp304_ = field; + _tmp305_ = vala_ccode_base_module_get_ccode_array_length_name ((ValaCodeNode*) _tmp304_); _g_free0 (length_cname); - length_cname = _tmp308_; + length_cname = _tmp305_; } else { - ValaField* _tmp309_; + ValaField* _tmp306_; + gchar* _tmp307_ = NULL; + gchar* _tmp308_; + gint _tmp309_; gchar* _tmp310_ = NULL; - gchar* _tmp311_; - gint _tmp312_; - gchar* _tmp313_ = NULL; - _tmp309_ = field; - _tmp310_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp309_); - _tmp311_ = _tmp310_; - _tmp312_ = dim; - _tmp313_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, _tmp311_, _tmp312_); + _tmp306_ = field; + _tmp307_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp306_); + _tmp308_ = _tmp307_; + _tmp309_ = dim; + _tmp310_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, _tmp308_, _tmp309_); _g_free0 (length_cname); - length_cname = _tmp313_; - _g_free0 (_tmp311_); + length_cname = _tmp310_; + _g_free0 (_tmp308_); } - _tmp314_ = _result_; - _tmp315_ = length_cname; - _tmp316_ = vala_ccode_identifier_new (_tmp315_); - _tmp317_ = _tmp316_; - vala_glib_value_append_array_length_cvalue (_tmp314_, (ValaCCodeExpression*) _tmp317_); - _vala_ccode_node_unref0 (_tmp317_); + _tmp311_ = _result_; + _tmp312_ = length_cname; + _tmp313_ = vala_ccode_identifier_new (_tmp312_); + _tmp314_ = _tmp313_; + vala_glib_value_append_array_length_cvalue (_tmp311_, (ValaCCodeExpression*) _tmp314_); + _vala_ccode_node_unref0 (_tmp314_); _g_free0 (length_cname); } } } - _tmp319_ = array_type; - _tmp320_ = vala_array_type_get_rank (_tmp319_); - _tmp321_ = _tmp320_; - if (_tmp321_ == 1) { - ValaField* _tmp322_; - gboolean _tmp323_ = FALSE; - _tmp322_ = field; - _tmp323_ = vala_symbol_is_internal_symbol ((ValaSymbol*) _tmp322_); - _tmp318_ = _tmp323_; + _tmp316_ = array_type; + _tmp317_ = vala_array_type_get_rank (_tmp316_); + _tmp318_ = _tmp317_; + if (_tmp318_ == 1) { + ValaField* _tmp319_; + gboolean _tmp320_ = FALSE; + _tmp319_ = field; + _tmp320_ = vala_symbol_is_internal_symbol ((ValaSymbol*) _tmp319_); + _tmp315_ = _tmp320_; } else { - _tmp318_ = FALSE; + _tmp315_ = FALSE; } - _tmp324_ = _tmp318_; - if (_tmp324_) { - ValaGLibValue* _tmp325_; - ValaField* _tmp326_; - gchar* _tmp327_ = NULL; - gchar* _tmp328_; - gchar* _tmp329_ = NULL; - gchar* _tmp330_; - ValaCCodeIdentifier* _tmp331_; - ValaCCodeIdentifier* _tmp332_; - _tmp325_ = _result_; - _tmp326_ = field; - _tmp327_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp326_); - _tmp328_ = _tmp327_; - _tmp329_ = vala_ccode_base_module_get_array_size_cname ((ValaCCodeBaseModule*) self, _tmp328_); - _tmp330_ = _tmp329_; - _tmp331_ = vala_ccode_identifier_new (_tmp330_); - _tmp332_ = _tmp331_; - vala_ccode_base_module_set_array_size_cvalue ((ValaCCodeBaseModule*) self, (ValaTargetValue*) _tmp325_, (ValaCCodeExpression*) _tmp332_); - _vala_ccode_node_unref0 (_tmp332_); - _g_free0 (_tmp330_); - _g_free0 (_tmp328_); + _tmp321_ = _tmp315_; + if (_tmp321_) { + ValaGLibValue* _tmp322_; + ValaField* _tmp323_; + gchar* _tmp324_ = NULL; + gchar* _tmp325_; + gchar* _tmp326_ = NULL; + gchar* _tmp327_; + ValaCCodeIdentifier* _tmp328_; + ValaCCodeIdentifier* _tmp329_; + _tmp322_ = _result_; + _tmp323_ = field; + _tmp324_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp323_); + _tmp325_ = _tmp324_; + _tmp326_ = vala_ccode_base_module_get_array_size_cname ((ValaCCodeBaseModule*) self, _tmp325_); + _tmp327_ = _tmp326_; + _tmp328_ = vala_ccode_identifier_new (_tmp327_); + _tmp329_ = _tmp328_; + vala_ccode_base_module_set_array_size_cvalue ((ValaCCodeBaseModule*) self, (ValaTargetValue*) _tmp322_, (ValaCCodeExpression*) _tmp329_); + _vala_ccode_node_unref0 (_tmp329_); + _g_free0 (_tmp327_); + _g_free0 (_tmp325_); } } else { - gboolean _tmp333_ = FALSE; - gboolean _tmp334_ = FALSE; - ValaDelegateType* _tmp335_; + gboolean _tmp330_ = FALSE; + gboolean _tmp331_ = FALSE; + ValaDelegateType* _tmp332_; + gboolean _tmp338_; gboolean _tmp341_; - gboolean _tmp344_; - _tmp335_ = delegate_type; - if (_tmp335_ != NULL) { - ValaDelegateType* _tmp336_; - ValaDelegate* _tmp337_; - ValaDelegate* _tmp338_; - gboolean _tmp339_; - gboolean _tmp340_; - _tmp336_ = delegate_type; - _tmp337_ = vala_delegate_type_get_delegate_symbol (_tmp336_); - _tmp338_ = _tmp337_; - _tmp339_ = vala_delegate_get_has_target (_tmp338_); - _tmp340_ = _tmp339_; - _tmp334_ = _tmp340_; + _tmp332_ = delegate_type; + if (_tmp332_ != NULL) { + ValaDelegateType* _tmp333_; + ValaDelegate* _tmp334_; + ValaDelegate* _tmp335_; + gboolean _tmp336_; + gboolean _tmp337_; + _tmp333_ = delegate_type; + _tmp334_ = vala_delegate_type_get_delegate_symbol (_tmp333_); + _tmp335_ = _tmp334_; + _tmp336_ = vala_delegate_get_has_target (_tmp335_); + _tmp337_ = _tmp336_; + _tmp331_ = _tmp337_; } else { - _tmp334_ = FALSE; + _tmp331_ = FALSE; } - _tmp341_ = _tmp334_; - if (_tmp341_) { - ValaField* _tmp342_; - gboolean _tmp343_ = FALSE; - _tmp342_ = field; - _tmp343_ = vala_ccode_base_module_get_ccode_delegate_target ((ValaCodeNode*) _tmp342_); - _tmp333_ = _tmp343_; + _tmp338_ = _tmp331_; + if (_tmp338_) { + ValaField* _tmp339_; + gboolean _tmp340_ = FALSE; + _tmp339_ = field; + _tmp340_ = vala_ccode_base_module_get_ccode_delegate_target ((ValaCodeNode*) _tmp339_); + _tmp330_ = _tmp340_; } else { - _tmp333_ = FALSE; + _tmp330_ = FALSE; } - _tmp344_ = _tmp333_; - if (_tmp344_) { - ValaGLibValue* _tmp345_; - ValaField* _tmp346_; - gchar* _tmp347_ = NULL; - gchar* _tmp348_; - gchar* _tmp349_ = NULL; - gchar* _tmp350_; - ValaCCodeIdentifier* _tmp351_; - ValaGLibValue* _tmp352_; - ValaDataType* _tmp353_; - ValaDataType* _tmp354_; - gboolean _tmp355_; - gboolean _tmp356_; - _tmp345_ = _result_; - _tmp346_ = field; - _tmp347_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp346_); - _tmp348_ = _tmp347_; - _tmp349_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp348_); - _tmp350_ = _tmp349_; - _tmp351_ = vala_ccode_identifier_new (_tmp350_); - _vala_ccode_node_unref0 (_tmp345_->delegate_target_cvalue); - _tmp345_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp351_; - _g_free0 (_tmp350_); - _g_free0 (_tmp348_); - _tmp352_ = _result_; - _tmp353_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp352_); - _tmp354_ = _tmp353_; - _tmp355_ = vala_data_type_get_value_owned (_tmp354_); - _tmp356_ = _tmp355_; - if (_tmp356_) { - ValaGLibValue* _tmp357_; - ValaField* _tmp358_; - gchar* _tmp359_ = NULL; - gchar* _tmp360_; - gchar* _tmp361_ = NULL; - gchar* _tmp362_; - ValaCCodeIdentifier* _tmp363_; - _tmp357_ = _result_; - _tmp358_ = field; - _tmp359_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp358_); - _tmp360_ = _tmp359_; - _tmp361_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp360_); - _tmp362_ = _tmp361_; - _tmp363_ = vala_ccode_identifier_new (_tmp362_); - _vala_ccode_node_unref0 (_tmp357_->delegate_target_destroy_notify_cvalue); - _tmp357_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp363_; - _g_free0 (_tmp362_); - _g_free0 (_tmp360_); + _tmp341_ = _tmp330_; + if (_tmp341_) { + ValaGLibValue* _tmp342_; + ValaField* _tmp343_; + gchar* _tmp344_ = NULL; + gchar* _tmp345_; + ValaCCodeIdentifier* _tmp346_; + ValaGLibValue* _tmp347_; + ValaDataType* _tmp348_; + ValaDataType* _tmp349_; + gboolean _tmp350_; + gboolean _tmp351_; + _tmp342_ = _result_; + _tmp343_ = field; + _tmp344_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp343_); + _tmp345_ = _tmp344_; + _tmp346_ = vala_ccode_identifier_new (_tmp345_); + _vala_ccode_node_unref0 (_tmp342_->delegate_target_cvalue); + _tmp342_->delegate_target_cvalue = (ValaCCodeExpression*) _tmp346_; + _g_free0 (_tmp345_); + _tmp347_ = _result_; + _tmp348_ = vala_target_value_get_value_type ((ValaTargetValue*) _tmp347_); + _tmp349_ = _tmp348_; + _tmp350_ = vala_data_type_get_value_owned (_tmp349_); + _tmp351_ = _tmp350_; + if (_tmp351_) { + ValaGLibValue* _tmp352_; + ValaField* _tmp353_; + gchar* _tmp354_ = NULL; + gchar* _tmp355_; + gchar* _tmp356_ = NULL; + gchar* _tmp357_; + ValaCCodeIdentifier* _tmp358_; + _tmp352_ = _result_; + _tmp353_ = field; + _tmp354_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp353_); + _tmp355_ = _tmp354_; + _tmp356_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp355_); + _tmp357_ = _tmp356_; + _tmp358_ = vala_ccode_identifier_new (_tmp357_); + _vala_ccode_node_unref0 (_tmp352_->delegate_target_destroy_notify_cvalue); + _tmp352_->delegate_target_destroy_notify_cvalue = (ValaCCodeExpression*) _tmp358_; + _g_free0 (_tmp357_); + _g_free0 (_tmp355_); } } } diff -Nru vala-0.16-0.15.1/codegen/valaccodememberaccessmodule.vala vala-0.16-0.15.2/codegen/valaccodememberaccessmodule.vala --- vala-0.16-0.15.1/codegen/valaccodememberaccessmodule.vala 2012-01-24 14:59:30.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodememberaccessmodule.vala 2012-02-09 18:32:59.000000000 +0000 @@ -70,7 +70,7 @@ var base_class = (Class) m.base_method.parent_symbol; var vclass = new CCodeFunctionCall (new CCodeIdentifier ("%s_GET_CLASS".printf (get_ccode_upper_case_name (base_class)))); vclass.add_argument (pub_inst); - set_cvalue (expr, new CCodeMemberAccess.pointer (vclass, m.name)); + set_cvalue (expr, new CCodeMemberAccess.pointer (vclass, get_ccode_vfunc_name (m))); } else { set_cvalue (expr, new CCodeIdentifier (get_ccode_name (m.base_method))); } @@ -259,6 +259,11 @@ } } + if (expr.value_type.is_real_struct_type ()) { + // gobject allocates structs on heap + expr.value_type.nullable = true; + } + var temp_var = get_temp_variable (expr.value_type); var ctemp = get_variable_cexpression (temp_var.name); emit_temp_var (temp_var); @@ -416,7 +421,7 @@ result.append_array_length_cvalue (new CCodeMemberAccess.pointer (get_variable_cexpression ("_data%d_".printf (get_block_id (block))), get_parameter_array_length_cname (param, dim))); } } else if (delegate_type != null && delegate_type.delegate_symbol.has_target) { - result.delegate_target_cvalue = new CCodeMemberAccess.pointer (get_variable_cexpression ("_data%d_".printf (get_block_id (block))), get_delegate_target_cname (get_variable_cname (param.name))); + result.delegate_target_cvalue = new CCodeMemberAccess.pointer (get_variable_cexpression ("_data%d_".printf (get_block_id (block))), get_ccode_delegate_target_name (param)); if (result.value_type.value_owned) { result.delegate_target_destroy_notify_cvalue = new CCodeMemberAccess.pointer (get_variable_cexpression ("_data%d_".printf (get_block_id (block))), get_delegate_target_destroy_notify_cname (get_variable_cname (param.name))); } @@ -425,7 +430,7 @@ // use closure result.cvalue = get_variable_cexpression (param.name); if (delegate_type != null && delegate_type.delegate_symbol.has_target) { - result.delegate_target_cvalue = new CCodeMemberAccess.pointer (new CCodeIdentifier ("_data_"), get_delegate_target_cname (get_variable_cname (param.name))); + result.delegate_target_cvalue = new CCodeMemberAccess.pointer (new CCodeIdentifier ("_data_"), get_ccode_delegate_target_name (param)); if (delegate_type.value_owned) { result.delegate_target_destroy_notify_cvalue = new CCodeMemberAccess.pointer (new CCodeIdentifier ("_data_"), get_delegate_target_destroy_notify_cname (get_variable_cname (param.name))); } @@ -455,7 +460,11 @@ } } if (delegate_type != null && delegate_type.delegate_symbol.has_target) { - CCodeExpression target_expr = new CCodeIdentifier (get_delegate_target_cname (get_variable_cname (name))); + var target_cname = get_ccode_delegate_target_name (param); + if (param.direction == ParameterDirection.OUT) { + target_cname = "_vala_" + target_cname; + } + CCodeExpression target_expr = new CCodeIdentifier (target_cname); CCodeExpression delegate_target_destroy_notify = new CCodeIdentifier (get_delegate_target_destroy_notify_cname (get_variable_cname (name))); if (param.direction == ParameterDirection.REF) { // accessing argument of ref param @@ -560,7 +569,7 @@ } } } else if (delegate_type != null && delegate_type.delegate_symbol.has_target && get_ccode_delegate_target (field)) { - string target_cname = get_delegate_target_cname (get_ccode_name (field)); + string target_cname = get_ccode_delegate_target_name (field); string target_destroy_notify_cname = get_delegate_target_destroy_notify_cname (get_ccode_name (field)); if (((TypeSymbol) field.parent_symbol).is_reference_type ()) { @@ -626,7 +635,7 @@ set_array_size_cvalue (result, new CCodeIdentifier (get_array_size_cname (get_ccode_name (field)))); } } else if (delegate_type != null && delegate_type.delegate_symbol.has_target && get_ccode_delegate_target (field)) { - result.delegate_target_cvalue = new CCodeIdentifier (get_delegate_target_cname (get_ccode_name (field))); + result.delegate_target_cvalue = new CCodeIdentifier (get_ccode_delegate_target_name (field)); if (result.value_type.value_owned) { result.delegate_target_destroy_notify_cvalue = new CCodeIdentifier (get_delegate_target_destroy_notify_cname (get_ccode_name (field))); } diff -Nru vala-0.16-0.15.1/codegen/valaccodemethodmodule.c vala-0.16-0.15.2/codegen/valaccodemethodmodule.c --- vala-0.16-0.15.1/codegen/valaccodemethodmodule.c 2012-01-26 21:08:06.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodemethodmodule.c 2012-02-25 16:21:59.000000000 +0000 @@ -309,6 +309,7 @@ static void vala_ccode_method_module_create_method_type_check_statement (ValaCCodeMethodModule* self, ValaMethod* m, ValaDataType* return_type, ValaTypeSymbol* t, gboolean non_null, const gchar* var_name); gchar* vala_ccode_base_module_get_variable_cname (ValaCCodeBaseModule* self, const gchar* name); ValaCCodeExpression* vala_ccode_base_module_default_value_for_type (ValaCCodeBaseModule* self, ValaDataType* type, gboolean initializer_expression); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); ValaClass* vala_ccode_base_module_get_current_class (ValaCCodeBaseModule* self); ValaCodeContext* vala_ccode_base_module_get_context (ValaCCodeBaseModule* self); static void vala_ccode_method_module_create_precondition_statement (ValaCCodeMethodModule* self, ValaCodeNode* method_node, ValaDataType* ret_type, ValaExpression* precondition); @@ -1903,31 +1904,31 @@ gboolean _tmp185_; gboolean _tmp186_; gboolean _tmp194_; - ValaMethod* _tmp919_; - ValaBlock* _tmp920_; - ValaBlock* _tmp921_; - gboolean _tmp925_ = FALSE; - ValaMethod* _tmp926_; - gboolean _tmp927_; - gboolean _tmp928_; - gboolean _tmp936_; - gboolean _tmp1075_ = FALSE; - ValaMethod* _tmp1076_; + ValaMethod* _tmp915_; + ValaBlock* _tmp916_; + ValaBlock* _tmp917_; + gboolean _tmp921_ = FALSE; + ValaMethod* _tmp922_; + gboolean _tmp923_; + gboolean _tmp924_; + gboolean _tmp932_; + gboolean _tmp1071_ = FALSE; + ValaMethod* _tmp1072_; + gboolean _tmp1073_; + gboolean _tmp1074_; gboolean _tmp1077_; - gboolean _tmp1078_; - gboolean _tmp1081_; - gboolean _tmp1117_ = FALSE; - gboolean _tmp1118_ = FALSE; - gboolean _tmp1119_ = FALSE; - ValaMethod* _tmp1120_; - gboolean _tmp1121_; + gboolean _tmp1113_ = FALSE; + gboolean _tmp1114_ = FALSE; + gboolean _tmp1115_ = FALSE; + ValaMethod* _tmp1116_; + gboolean _tmp1117_; + gboolean _tmp1118_; gboolean _tmp1122_; gboolean _tmp1126_; gboolean _tmp1130_; - gboolean _tmp1134_; - ValaMethod* _tmp1147_; - gboolean _tmp1148_; - gboolean _tmp1149_; + ValaMethod* _tmp1143_; + gboolean _tmp1144_; + gboolean _tmp1145_; self = (ValaCCodeMethodModule*) base; g_return_if_fail (m != NULL); _tmp0_ = m; @@ -2415,21 +2416,21 @@ ValaMethod* _tmp244_; gboolean _tmp245_; gboolean _tmp246_; - gboolean _tmp657_ = FALSE; - gboolean _tmp658_ = FALSE; - ValaMethod* _tmp659_; - ValaDataType* _tmp660_; - ValaDataType* _tmp661_; + gboolean _tmp653_ = FALSE; + gboolean _tmp654_ = FALSE; + ValaMethod* _tmp655_; + ValaDataType* _tmp656_; + ValaDataType* _tmp657_; + gboolean _tmp662_; gboolean _tmp666_; - gboolean _tmp670_; - ValaMethod* _tmp687_; - gboolean _tmp889_ = FALSE; - ValaCodeContext* _tmp890_; - ValaCodeContext* _tmp891_; - ValaMethod* _tmp892_; - ValaMethod* _tmp893_; - ValaMethod* _tmp894_; - gboolean _tmp896_; + ValaMethod* _tmp683_; + gboolean _tmp885_ = FALSE; + ValaCodeContext* _tmp886_; + ValaCodeContext* _tmp887_; + ValaMethod* _tmp888_; + ValaMethod* _tmp889_; + ValaMethod* _tmp890_; + gboolean _tmp892_; _tmp198_ = m; _tmp199_ = vala_method_get_coroutine (_tmp198_); _tmp200_ = _tmp199_; @@ -3566,86 +3567,77 @@ _tmp623_ = _tmp622_; if (_tmp623_) { ValaParameter* _tmp624_; - const gchar* _tmp625_; - const gchar* _tmp626_; + gchar* _tmp625_ = NULL; + gchar* _tmp626_; gchar* _tmp627_; gchar* _tmp628_; - gchar* _tmp629_ = NULL; - gchar* _tmp630_; - gchar* _tmp631_ = NULL; - gchar* _tmp632_; - ValaCCodeConstant* _tmp633_; - ValaCCodeConstant* _tmp634_; - ValaCCodeVariableDeclarator* _tmp635_; - ValaCCodeFunction* _tmp636_; - ValaCCodeFunction* _tmp637_; - ValaCCodeVariableDeclarator* _tmp638_; - ValaDelegateType* _tmp639_; - gboolean _tmp640_; - gboolean _tmp641_; + ValaCCodeConstant* _tmp629_; + ValaCCodeConstant* _tmp630_; + ValaCCodeVariableDeclarator* _tmp631_; + ValaCCodeFunction* _tmp632_; + ValaCCodeFunction* _tmp633_; + ValaCCodeVariableDeclarator* _tmp634_; + ValaDelegateType* _tmp635_; + gboolean _tmp636_; + gboolean _tmp637_; _tmp624_ = param; - _tmp625_ = vala_symbol_get_name ((ValaSymbol*) _tmp624_); + _tmp625_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp624_); _tmp626_ = _tmp625_; _tmp627_ = g_strconcat ("_vala_", _tmp626_, NULL); _tmp628_ = _tmp627_; - _tmp629_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp628_); + _tmp629_ = vala_ccode_constant_new ("NULL"); _tmp630_ = _tmp629_; - _tmp631_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp630_); - _tmp632_ = _tmp631_; - _tmp633_ = vala_ccode_constant_new ("NULL"); - _tmp634_ = _tmp633_; - _tmp635_ = vala_ccode_variable_declarator_new_zero (_tmp632_, (ValaCCodeExpression*) _tmp634_, NULL); + _tmp631_ = vala_ccode_variable_declarator_new_zero (_tmp628_, (ValaCCodeExpression*) _tmp630_, NULL); _vala_ccode_node_unref0 (vardecl); - vardecl = _tmp635_; - _vala_ccode_node_unref0 (_tmp634_); - _g_free0 (_tmp632_); - _g_free0 (_tmp630_); + vardecl = _tmp631_; + _vala_ccode_node_unref0 (_tmp630_); _g_free0 (_tmp628_); - _tmp636_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _g_free0 (_tmp626_); + _tmp632_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp633_ = _tmp632_; + _tmp634_ = vardecl; + vala_ccode_function_add_declaration (_tmp633_, "void *", (ValaCCodeDeclarator*) _tmp634_, 0); + _tmp635_ = deleg_type; + _tmp636_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp635_); _tmp637_ = _tmp636_; - _tmp638_ = vardecl; - vala_ccode_function_add_declaration (_tmp637_, "void *", (ValaCCodeDeclarator*) _tmp638_, 0); - _tmp639_ = deleg_type; - _tmp640_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp639_); - _tmp641_ = _tmp640_; - if (_tmp641_) { - ValaParameter* _tmp642_; - const gchar* _tmp643_; - const gchar* _tmp644_; - gchar* _tmp645_; + if (_tmp637_) { + ValaParameter* _tmp638_; + const gchar* _tmp639_; + const gchar* _tmp640_; + gchar* _tmp641_; + gchar* _tmp642_; + gchar* _tmp643_ = NULL; + gchar* _tmp644_; + gchar* _tmp645_ = NULL; gchar* _tmp646_; - gchar* _tmp647_ = NULL; - gchar* _tmp648_; - gchar* _tmp649_ = NULL; - gchar* _tmp650_; - ValaCCodeConstant* _tmp651_; - ValaCCodeConstant* _tmp652_; - ValaCCodeVariableDeclarator* _tmp653_; - ValaCCodeFunction* _tmp654_; - ValaCCodeFunction* _tmp655_; - ValaCCodeVariableDeclarator* _tmp656_; - _tmp642_ = param; - _tmp643_ = vala_symbol_get_name ((ValaSymbol*) _tmp642_); + ValaCCodeConstant* _tmp647_; + ValaCCodeConstant* _tmp648_; + ValaCCodeVariableDeclarator* _tmp649_; + ValaCCodeFunction* _tmp650_; + ValaCCodeFunction* _tmp651_; + ValaCCodeVariableDeclarator* _tmp652_; + _tmp638_ = param; + _tmp639_ = vala_symbol_get_name ((ValaSymbol*) _tmp638_); + _tmp640_ = _tmp639_; + _tmp641_ = g_strconcat ("_vala_", _tmp640_, NULL); + _tmp642_ = _tmp641_; + _tmp643_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp642_); _tmp644_ = _tmp643_; - _tmp645_ = g_strconcat ("_vala_", _tmp644_, NULL); + _tmp645_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp644_); _tmp646_ = _tmp645_; - _tmp647_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp646_); + _tmp647_ = vala_ccode_constant_new ("NULL"); _tmp648_ = _tmp647_; - _tmp649_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp648_); - _tmp650_ = _tmp649_; - _tmp651_ = vala_ccode_constant_new ("NULL"); - _tmp652_ = _tmp651_; - _tmp653_ = vala_ccode_variable_declarator_new_zero (_tmp650_, (ValaCCodeExpression*) _tmp652_, NULL); + _tmp649_ = vala_ccode_variable_declarator_new_zero (_tmp646_, (ValaCCodeExpression*) _tmp648_, NULL); _vala_ccode_node_unref0 (vardecl); - vardecl = _tmp653_; - _vala_ccode_node_unref0 (_tmp652_); - _g_free0 (_tmp650_); - _g_free0 (_tmp648_); + vardecl = _tmp649_; + _vala_ccode_node_unref0 (_tmp648_); _g_free0 (_tmp646_); - _tmp654_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp655_ = _tmp654_; - _tmp656_ = vardecl; - vala_ccode_function_add_declaration (_tmp655_, "GDestroyNotify", (ValaCCodeDeclarator*) _tmp656_, 0); + _g_free0 (_tmp644_); + _g_free0 (_tmp642_); + _tmp650_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp651_ = _tmp650_; + _tmp652_ = vardecl; + vala_ccode_function_add_declaration (_tmp651_, "GDestroyNotify", (ValaCCodeDeclarator*) _tmp652_, 0); } } _vala_code_node_unref0 (d); @@ -3659,395 +3651,395 @@ } _vala_iterable_unref0 (_param_list); } - _tmp659_ = m; - _tmp660_ = vala_method_get_return_type (_tmp659_); - _tmp661_ = _tmp660_; - if (!VALA_IS_VOID_TYPE (_tmp661_)) { - ValaMethod* _tmp662_; - ValaDataType* _tmp663_; - ValaDataType* _tmp664_; - gboolean _tmp665_ = FALSE; - _tmp662_ = m; - _tmp663_ = vala_method_get_return_type (_tmp662_); - _tmp664_ = _tmp663_; - _tmp665_ = vala_data_type_is_real_non_null_struct_type (_tmp664_); - _tmp658_ = !_tmp665_; + _tmp655_ = m; + _tmp656_ = vala_method_get_return_type (_tmp655_); + _tmp657_ = _tmp656_; + if (!VALA_IS_VOID_TYPE (_tmp657_)) { + ValaMethod* _tmp658_; + ValaDataType* _tmp659_; + ValaDataType* _tmp660_; + gboolean _tmp661_ = FALSE; + _tmp658_ = m; + _tmp659_ = vala_method_get_return_type (_tmp658_); + _tmp660_ = _tmp659_; + _tmp661_ = vala_data_type_is_real_non_null_struct_type (_tmp660_); + _tmp654_ = !_tmp661_; } else { - _tmp658_ = FALSE; + _tmp654_ = FALSE; } - _tmp666_ = _tmp658_; + _tmp662_ = _tmp654_; + if (_tmp662_) { + ValaMethod* _tmp663_; + gboolean _tmp664_; + gboolean _tmp665_; + _tmp663_ = m; + _tmp664_ = vala_method_get_coroutine (_tmp663_); + _tmp665_ = _tmp664_; + _tmp653_ = !_tmp665_; + } else { + _tmp653_ = FALSE; + } + _tmp666_ = _tmp653_; if (_tmp666_) { ValaMethod* _tmp667_; - gboolean _tmp668_; - gboolean _tmp669_; + ValaDataType* _tmp668_; + ValaDataType* _tmp669_; + ValaCCodeExpression* _tmp670_ = NULL; + ValaCCodeExpression* _tmp671_; + ValaCCodeVariableDeclarator* _tmp672_; + ValaCCodeVariableDeclarator* _tmp673_; + ValaCCodeVariableDeclarator* vardecl; + ValaCCodeVariableDeclarator* _tmp674_; + ValaCCodeFunction* _tmp675_; + ValaCCodeFunction* _tmp676_; + ValaMethod* _tmp677_; + ValaDataType* _tmp678_; + ValaDataType* _tmp679_; + gchar* _tmp680_ = NULL; + gchar* _tmp681_; + ValaCCodeVariableDeclarator* _tmp682_; _tmp667_ = m; - _tmp668_ = vala_method_get_coroutine (_tmp667_); + _tmp668_ = vala_method_get_return_type (_tmp667_); _tmp669_ = _tmp668_; - _tmp657_ = !_tmp669_; - } else { - _tmp657_ = FALSE; - } - _tmp670_ = _tmp657_; - if (_tmp670_) { - ValaMethod* _tmp671_; - ValaDataType* _tmp672_; - ValaDataType* _tmp673_; - ValaCCodeExpression* _tmp674_ = NULL; - ValaCCodeExpression* _tmp675_; - ValaCCodeVariableDeclarator* _tmp676_; - ValaCCodeVariableDeclarator* _tmp677_; - ValaCCodeVariableDeclarator* vardecl; - ValaCCodeVariableDeclarator* _tmp678_; - ValaCCodeFunction* _tmp679_; - ValaCCodeFunction* _tmp680_; - ValaMethod* _tmp681_; - ValaDataType* _tmp682_; - ValaDataType* _tmp683_; - gchar* _tmp684_ = NULL; - gchar* _tmp685_; - ValaCCodeVariableDeclarator* _tmp686_; - _tmp671_ = m; - _tmp672_ = vala_method_get_return_type (_tmp671_); + _tmp670_ = vala_ccode_base_module_default_value_for_type ((ValaCCodeBaseModule*) self, _tmp669_, TRUE); + _tmp671_ = _tmp670_; + _tmp672_ = vala_ccode_variable_declarator_new ("result", _tmp671_, NULL); _tmp673_ = _tmp672_; - _tmp674_ = vala_ccode_base_module_default_value_for_type ((ValaCCodeBaseModule*) self, _tmp673_, TRUE); - _tmp675_ = _tmp674_; - _tmp676_ = vala_ccode_variable_declarator_new ("result", _tmp675_, NULL); - _tmp677_ = _tmp676_; - _vala_ccode_node_unref0 (_tmp675_); - vardecl = _tmp677_; - _tmp678_ = vardecl; - vala_ccode_variable_declarator_set_init0 (_tmp678_, TRUE); - _tmp679_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp680_ = _tmp679_; - _tmp681_ = m; - _tmp682_ = vala_method_get_return_type (_tmp681_); - _tmp683_ = _tmp682_; - _tmp684_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp683_); - _tmp685_ = _tmp684_; - _tmp686_ = vardecl; - vala_ccode_function_add_declaration (_tmp680_, _tmp685_, (ValaCCodeDeclarator*) _tmp686_, 0); - _g_free0 (_tmp685_); + _vala_ccode_node_unref0 (_tmp671_); + vardecl = _tmp673_; + _tmp674_ = vardecl; + vala_ccode_variable_declarator_set_init0 (_tmp674_, TRUE); + _tmp675_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp676_ = _tmp675_; + _tmp677_ = m; + _tmp678_ = vala_method_get_return_type (_tmp677_); + _tmp679_ = _tmp678_; + _tmp680_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp679_); + _tmp681_ = _tmp680_; + _tmp682_ = vardecl; + vala_ccode_function_add_declaration (_tmp676_, _tmp681_, (ValaCCodeDeclarator*) _tmp682_, 0); + _g_free0 (_tmp681_); _vala_ccode_node_unref0 (vardecl); } - _tmp687_ = m; - if (VALA_IS_CREATION_METHOD (_tmp687_)) { - gboolean _tmp688_; - _tmp688_ = in_gobject_creation_method; - if (_tmp688_) { - ValaCCodeFunction* _tmp689_; - ValaCCodeFunction* _tmp690_; - ValaTypeSymbol* _tmp691_; - ValaTypeSymbol* _tmp692_; - gchar* _tmp693_ = NULL; - gchar* _tmp694_; - gchar* _tmp695_ = NULL; - gchar* _tmp696_; - ValaCCodeConstant* _tmp697_; - ValaCCodeConstant* _tmp698_; - ValaCCodeVariableDeclarator* _tmp699_; - ValaCCodeVariableDeclarator* _tmp700_; - _tmp689_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp683_ = m; + if (VALA_IS_CREATION_METHOD (_tmp683_)) { + gboolean _tmp684_; + _tmp684_ = in_gobject_creation_method; + if (_tmp684_) { + ValaCCodeFunction* _tmp685_; + ValaCCodeFunction* _tmp686_; + ValaTypeSymbol* _tmp687_; + ValaTypeSymbol* _tmp688_; + gchar* _tmp689_ = NULL; + gchar* _tmp690_; + gchar* _tmp691_ = NULL; + gchar* _tmp692_; + ValaCCodeConstant* _tmp693_; + ValaCCodeConstant* _tmp694_; + ValaCCodeVariableDeclarator* _tmp695_; + ValaCCodeVariableDeclarator* _tmp696_; + _tmp685_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp686_ = _tmp685_; + _tmp687_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp688_ = _tmp687_; + _tmp689_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp688_); _tmp690_ = _tmp689_; - _tmp691_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp691_ = g_strdup_printf ("%s *", _tmp690_); _tmp692_ = _tmp691_; - _tmp693_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp692_); + _tmp693_ = vala_ccode_constant_new ("NULL"); _tmp694_ = _tmp693_; - _tmp695_ = g_strdup_printf ("%s *", _tmp694_); + _tmp695_ = vala_ccode_variable_declarator_new_zero ("self", (ValaCCodeExpression*) _tmp694_, NULL); _tmp696_ = _tmp695_; - _tmp697_ = vala_ccode_constant_new ("NULL"); - _tmp698_ = _tmp697_; - _tmp699_ = vala_ccode_variable_declarator_new_zero ("self", (ValaCCodeExpression*) _tmp698_, NULL); - _tmp700_ = _tmp699_; - vala_ccode_function_add_declaration (_tmp690_, _tmp696_, (ValaCCodeDeclarator*) _tmp700_, 0); - _vala_ccode_node_unref0 (_tmp700_); - _vala_ccode_node_unref0 (_tmp698_); - _g_free0 (_tmp696_); - _g_free0 (_tmp694_); + vala_ccode_function_add_declaration (_tmp686_, _tmp692_, (ValaCCodeDeclarator*) _tmp696_, 0); + _vala_ccode_node_unref0 (_tmp696_); + _vala_ccode_node_unref0 (_tmp694_); + _g_free0 (_tmp692_); + _g_free0 (_tmp690_); } else { - ValaMethod* _tmp701_; - gboolean _tmp702_ = FALSE; - _tmp701_ = m; - _tmp702_ = vala_ccode_method_module_is_gtypeinstance_creation_method (self, _tmp701_); - if (_tmp702_) { - ValaMethod* _tmp703_; - ValaSymbol* _tmp704_; - ValaSymbol* _tmp705_; - ValaClass* _tmp706_; + ValaMethod* _tmp697_; + gboolean _tmp698_ = FALSE; + _tmp697_ = m; + _tmp698_ = vala_ccode_method_module_is_gtypeinstance_creation_method (self, _tmp697_); + if (_tmp698_) { + ValaMethod* _tmp699_; + ValaSymbol* _tmp700_; + ValaSymbol* _tmp701_; + ValaClass* _tmp702_; ValaClass* cl; - ValaCCodeFunction* _tmp707_; - ValaCCodeFunction* _tmp708_; - ValaClass* _tmp709_; - gchar* _tmp710_ = NULL; - gchar* _tmp711_; - gchar* _tmp712_; - gchar* _tmp713_; - ValaCCodeConstant* _tmp714_; - ValaCCodeConstant* _tmp715_; - ValaCCodeVariableDeclarator* _tmp716_; - ValaCCodeVariableDeclarator* _tmp717_; - ValaClass* _tmp718_; - gboolean _tmp719_ = FALSE; - _tmp703_ = m; - _tmp704_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp703_); - _tmp705_ = _tmp704_; - _tmp706_ = _vala_code_node_ref0 (VALA_CLASS (_tmp705_)); - cl = _tmp706_; - _tmp707_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp708_ = _tmp707_; - _tmp709_ = cl; - _tmp710_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp709_); + ValaCCodeFunction* _tmp703_; + ValaCCodeFunction* _tmp704_; + ValaClass* _tmp705_; + gchar* _tmp706_ = NULL; + gchar* _tmp707_; + gchar* _tmp708_; + gchar* _tmp709_; + ValaCCodeConstant* _tmp710_; + ValaCCodeConstant* _tmp711_; + ValaCCodeVariableDeclarator* _tmp712_; + ValaCCodeVariableDeclarator* _tmp713_; + ValaClass* _tmp714_; + gboolean _tmp715_ = FALSE; + _tmp699_ = m; + _tmp700_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp699_); + _tmp701_ = _tmp700_; + _tmp702_ = _vala_code_node_ref0 (VALA_CLASS (_tmp701_)); + cl = _tmp702_; + _tmp703_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp704_ = _tmp703_; + _tmp705_ = cl; + _tmp706_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp705_); + _tmp707_ = _tmp706_; + _tmp708_ = g_strconcat (_tmp707_, "*", NULL); + _tmp709_ = _tmp708_; + _tmp710_ = vala_ccode_constant_new ("NULL"); _tmp711_ = _tmp710_; - _tmp712_ = g_strconcat (_tmp711_, "*", NULL); + _tmp712_ = vala_ccode_variable_declarator_new_zero ("self", (ValaCCodeExpression*) _tmp711_, NULL); _tmp713_ = _tmp712_; - _tmp714_ = vala_ccode_constant_new ("NULL"); - _tmp715_ = _tmp714_; - _tmp716_ = vala_ccode_variable_declarator_new_zero ("self", (ValaCCodeExpression*) _tmp715_, NULL); - _tmp717_ = _tmp716_; - vala_ccode_function_add_declaration (_tmp708_, _tmp713_, (ValaCCodeDeclarator*) _tmp717_, 0); - _vala_ccode_node_unref0 (_tmp717_); - _vala_ccode_node_unref0 (_tmp715_); - _g_free0 (_tmp713_); - _g_free0 (_tmp711_); - _tmp718_ = cl; - _tmp719_ = vala_class_is_fundamental (_tmp718_); - if (_tmp719_) { - ValaCCodeIdentifier* _tmp720_; - ValaCCodeIdentifier* _tmp721_; - ValaCCodeFunctionCall* _tmp722_; - ValaCCodeFunctionCall* _tmp723_; + vala_ccode_function_add_declaration (_tmp704_, _tmp709_, (ValaCCodeDeclarator*) _tmp713_, 0); + _vala_ccode_node_unref0 (_tmp713_); + _vala_ccode_node_unref0 (_tmp711_); + _g_free0 (_tmp709_); + _g_free0 (_tmp707_); + _tmp714_ = cl; + _tmp715_ = vala_class_is_fundamental (_tmp714_); + if (_tmp715_) { + ValaCCodeIdentifier* _tmp716_; + ValaCCodeIdentifier* _tmp717_; + ValaCCodeFunctionCall* _tmp718_; + ValaCCodeFunctionCall* _tmp719_; ValaCCodeFunctionCall* ccall; - ValaCCodeFunctionCall* _tmp724_; + ValaCCodeFunctionCall* _tmp720_; + ValaCCodeIdentifier* _tmp721_; + ValaCCodeIdentifier* _tmp722_; + ValaCCodeFunction* _tmp723_; + ValaCCodeFunction* _tmp724_; ValaCCodeIdentifier* _tmp725_; ValaCCodeIdentifier* _tmp726_; - ValaCCodeFunction* _tmp727_; - ValaCCodeFunction* _tmp728_; - ValaCCodeIdentifier* _tmp729_; - ValaCCodeIdentifier* _tmp730_; - ValaCCodeFunctionCall* _tmp731_; - ValaClass* _tmp732_; - gchar* _tmp733_ = NULL; - gchar* _tmp734_; - gchar* _tmp735_; - gchar* _tmp736_; - ValaCCodeCastExpression* _tmp737_; - ValaCCodeCastExpression* _tmp738_; - _tmp720_ = vala_ccode_identifier_new ("g_type_create_instance"); - _tmp721_ = _tmp720_; - _tmp722_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp721_); - _tmp723_ = _tmp722_; - _vala_ccode_node_unref0 (_tmp721_); - ccall = _tmp723_; - _tmp724_ = ccall; - _tmp725_ = vala_ccode_identifier_new ("object_type"); + ValaCCodeFunctionCall* _tmp727_; + ValaClass* _tmp728_; + gchar* _tmp729_ = NULL; + gchar* _tmp730_; + gchar* _tmp731_; + gchar* _tmp732_; + ValaCCodeCastExpression* _tmp733_; + ValaCCodeCastExpression* _tmp734_; + _tmp716_ = vala_ccode_identifier_new ("g_type_create_instance"); + _tmp717_ = _tmp716_; + _tmp718_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp717_); + _tmp719_ = _tmp718_; + _vala_ccode_node_unref0 (_tmp717_); + ccall = _tmp719_; + _tmp720_ = ccall; + _tmp721_ = vala_ccode_identifier_new ("object_type"); + _tmp722_ = _tmp721_; + vala_ccode_function_call_add_argument (_tmp720_, (ValaCCodeExpression*) _tmp722_); + _vala_ccode_node_unref0 (_tmp722_); + _tmp723_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp724_ = _tmp723_; + _tmp725_ = vala_ccode_identifier_new ("self"); _tmp726_ = _tmp725_; - vala_ccode_function_call_add_argument (_tmp724_, (ValaCCodeExpression*) _tmp726_); - _vala_ccode_node_unref0 (_tmp726_); - _tmp727_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp728_ = _tmp727_; - _tmp729_ = vala_ccode_identifier_new ("self"); + _tmp727_ = ccall; + _tmp728_ = cl; + _tmp729_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp728_); _tmp730_ = _tmp729_; - _tmp731_ = ccall; - _tmp732_ = cl; - _tmp733_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp732_); + _tmp731_ = g_strconcat (_tmp730_, "*", NULL); + _tmp732_ = _tmp731_; + _tmp733_ = vala_ccode_cast_expression_new ((ValaCCodeExpression*) _tmp727_, _tmp732_); _tmp734_ = _tmp733_; - _tmp735_ = g_strconcat (_tmp734_, "*", NULL); - _tmp736_ = _tmp735_; - _tmp737_ = vala_ccode_cast_expression_new ((ValaCCodeExpression*) _tmp731_, _tmp736_); - _tmp738_ = _tmp737_; - vala_ccode_function_add_assignment (_tmp728_, (ValaCCodeExpression*) _tmp730_, (ValaCCodeExpression*) _tmp738_); - _vala_ccode_node_unref0 (_tmp738_); - _g_free0 (_tmp736_); - _g_free0 (_tmp734_); - _vala_ccode_node_unref0 (_tmp730_); + vala_ccode_function_add_assignment (_tmp724_, (ValaCCodeExpression*) _tmp726_, (ValaCCodeExpression*) _tmp734_); + _vala_ccode_node_unref0 (_tmp734_); + _g_free0 (_tmp732_); + _g_free0 (_tmp730_); + _vala_ccode_node_unref0 (_tmp726_); { - ValaClass* _tmp739_; - ValaClass* _tmp740_; - ValaList* _tmp741_ = NULL; + ValaClass* _tmp735_; + ValaClass* _tmp736_; + ValaList* _tmp737_ = NULL; ValaList* _type_param_list; - ValaList* _tmp742_; - gint _tmp743_; - gint _tmp744_; + ValaList* _tmp738_; + gint _tmp739_; + gint _tmp740_; gint _type_param_size; gint _type_param_index; - _tmp739_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); + _tmp735_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); + _tmp736_ = _tmp735_; + _tmp737_ = vala_object_type_symbol_get_type_parameters ((ValaObjectTypeSymbol*) _tmp736_); + _type_param_list = _tmp737_; + _tmp738_ = _type_param_list; + _tmp739_ = vala_collection_get_size ((ValaCollection*) _tmp738_); _tmp740_ = _tmp739_; - _tmp741_ = vala_object_type_symbol_get_type_parameters ((ValaObjectTypeSymbol*) _tmp740_); - _type_param_list = _tmp741_; - _tmp742_ = _type_param_list; - _tmp743_ = vala_collection_get_size ((ValaCollection*) _tmp742_); - _tmp744_ = _tmp743_; - _type_param_size = _tmp744_; + _type_param_size = _tmp740_; _type_param_index = -1; while (TRUE) { + gint _tmp741_; + gint _tmp742_; + gint _tmp743_; + ValaList* _tmp744_; gint _tmp745_; - gint _tmp746_; - gint _tmp747_; - ValaList* _tmp748_; - gint _tmp749_; - gpointer _tmp750_ = NULL; + gpointer _tmp746_ = NULL; ValaTypeParameter* type_param; ValaCCodeIdentifier* param_name = NULL; ValaCCodeAssignment* assign = NULL; - ValaCCodeIdentifier* _tmp751_; - ValaCCodeIdentifier* _tmp752_; - ValaCCodeMemberAccess* _tmp753_; - ValaCCodeMemberAccess* _tmp754_; + ValaCCodeIdentifier* _tmp747_; + ValaCCodeIdentifier* _tmp748_; + ValaCCodeMemberAccess* _tmp749_; + ValaCCodeMemberAccess* _tmp750_; ValaCCodeMemberAccess* priv_access; - ValaTypeParameter* _tmp755_; - const gchar* _tmp756_; - const gchar* _tmp757_; - gchar* _tmp758_ = NULL; - gchar* _tmp759_; - gchar* _tmp760_ = NULL; - gchar* _tmp761_; - ValaCCodeIdentifier* _tmp762_; + ValaTypeParameter* _tmp751_; + const gchar* _tmp752_; + const gchar* _tmp753_; + gchar* _tmp754_ = NULL; + gchar* _tmp755_; + gchar* _tmp756_ = NULL; + gchar* _tmp757_; + ValaCCodeIdentifier* _tmp758_; + ValaCCodeMemberAccess* _tmp759_; + ValaCCodeIdentifier* _tmp760_; + const gchar* _tmp761_; + const gchar* _tmp762_; ValaCCodeMemberAccess* _tmp763_; - ValaCCodeIdentifier* _tmp764_; - const gchar* _tmp765_; - const gchar* _tmp766_; - ValaCCodeMemberAccess* _tmp767_; - ValaCCodeMemberAccess* _tmp768_; - ValaCCodeIdentifier* _tmp769_; - ValaCCodeAssignment* _tmp770_; - ValaCCodeFunction* _tmp771_; - ValaCCodeFunction* _tmp772_; - ValaCCodeAssignment* _tmp773_; - ValaTypeParameter* _tmp774_; - const gchar* _tmp775_; - const gchar* _tmp776_; - gchar* _tmp777_ = NULL; - gchar* _tmp778_; - gchar* _tmp779_ = NULL; - gchar* _tmp780_; - ValaCCodeIdentifier* _tmp781_; + ValaCCodeMemberAccess* _tmp764_; + ValaCCodeIdentifier* _tmp765_; + ValaCCodeAssignment* _tmp766_; + ValaCCodeFunction* _tmp767_; + ValaCCodeFunction* _tmp768_; + ValaCCodeAssignment* _tmp769_; + ValaTypeParameter* _tmp770_; + const gchar* _tmp771_; + const gchar* _tmp772_; + gchar* _tmp773_ = NULL; + gchar* _tmp774_; + gchar* _tmp775_ = NULL; + gchar* _tmp776_; + ValaCCodeIdentifier* _tmp777_; + ValaCCodeMemberAccess* _tmp778_; + ValaCCodeIdentifier* _tmp779_; + const gchar* _tmp780_; + const gchar* _tmp781_; ValaCCodeMemberAccess* _tmp782_; - ValaCCodeIdentifier* _tmp783_; - const gchar* _tmp784_; - const gchar* _tmp785_; - ValaCCodeMemberAccess* _tmp786_; - ValaCCodeMemberAccess* _tmp787_; - ValaCCodeIdentifier* _tmp788_; - ValaCCodeAssignment* _tmp789_; - ValaCCodeFunction* _tmp790_; - ValaCCodeFunction* _tmp791_; - ValaCCodeAssignment* _tmp792_; - ValaTypeParameter* _tmp793_; - const gchar* _tmp794_; - const gchar* _tmp795_; - gchar* _tmp796_ = NULL; - gchar* _tmp797_; - gchar* _tmp798_ = NULL; - gchar* _tmp799_; - ValaCCodeIdentifier* _tmp800_; + ValaCCodeMemberAccess* _tmp783_; + ValaCCodeIdentifier* _tmp784_; + ValaCCodeAssignment* _tmp785_; + ValaCCodeFunction* _tmp786_; + ValaCCodeFunction* _tmp787_; + ValaCCodeAssignment* _tmp788_; + ValaTypeParameter* _tmp789_; + const gchar* _tmp790_; + const gchar* _tmp791_; + gchar* _tmp792_ = NULL; + gchar* _tmp793_; + gchar* _tmp794_ = NULL; + gchar* _tmp795_; + ValaCCodeIdentifier* _tmp796_; + ValaCCodeMemberAccess* _tmp797_; + ValaCCodeIdentifier* _tmp798_; + const gchar* _tmp799_; + const gchar* _tmp800_; ValaCCodeMemberAccess* _tmp801_; - ValaCCodeIdentifier* _tmp802_; - const gchar* _tmp803_; - const gchar* _tmp804_; - ValaCCodeMemberAccess* _tmp805_; - ValaCCodeMemberAccess* _tmp806_; - ValaCCodeIdentifier* _tmp807_; - ValaCCodeAssignment* _tmp808_; - ValaCCodeFunction* _tmp809_; - ValaCCodeFunction* _tmp810_; - ValaCCodeAssignment* _tmp811_; - _tmp745_ = _type_param_index; - _type_param_index = _tmp745_ + 1; - _tmp746_ = _type_param_index; - _tmp747_ = _type_param_size; - if (!(_tmp746_ < _tmp747_)) { + ValaCCodeMemberAccess* _tmp802_; + ValaCCodeIdentifier* _tmp803_; + ValaCCodeAssignment* _tmp804_; + ValaCCodeFunction* _tmp805_; + ValaCCodeFunction* _tmp806_; + ValaCCodeAssignment* _tmp807_; + _tmp741_ = _type_param_index; + _type_param_index = _tmp741_ + 1; + _tmp742_ = _type_param_index; + _tmp743_ = _type_param_size; + if (!(_tmp742_ < _tmp743_)) { break; } - _tmp748_ = _type_param_list; - _tmp749_ = _type_param_index; - _tmp750_ = vala_list_get (_tmp748_, _tmp749_); - type_param = (ValaTypeParameter*) _tmp750_; - _tmp751_ = vala_ccode_identifier_new ("self"); - _tmp752_ = _tmp751_; - _tmp753_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp752_, "priv"); - _tmp754_ = _tmp753_; - _vala_ccode_node_unref0 (_tmp752_); - priv_access = _tmp754_; - _tmp755_ = type_param; - _tmp756_ = vala_symbol_get_name ((ValaSymbol*) _tmp755_); + _tmp744_ = _type_param_list; + _tmp745_ = _type_param_index; + _tmp746_ = vala_list_get (_tmp744_, _tmp745_); + type_param = (ValaTypeParameter*) _tmp746_; + _tmp747_ = vala_ccode_identifier_new ("self"); + _tmp748_ = _tmp747_; + _tmp749_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp748_, "priv"); + _tmp750_ = _tmp749_; + _vala_ccode_node_unref0 (_tmp748_); + priv_access = _tmp750_; + _tmp751_ = type_param; + _tmp752_ = vala_symbol_get_name ((ValaSymbol*) _tmp751_); + _tmp753_ = _tmp752_; + _tmp754_ = g_utf8_strdown (_tmp753_, (gssize) (-1)); + _tmp755_ = _tmp754_; + _tmp756_ = g_strdup_printf ("%s_type", _tmp755_); _tmp757_ = _tmp756_; - _tmp758_ = g_utf8_strdown (_tmp757_, (gssize) (-1)); - _tmp759_ = _tmp758_; - _tmp760_ = g_strdup_printf ("%s_type", _tmp759_); - _tmp761_ = _tmp760_; - _tmp762_ = vala_ccode_identifier_new (_tmp761_); + _tmp758_ = vala_ccode_identifier_new (_tmp757_); _vala_ccode_node_unref0 (param_name); - param_name = _tmp762_; - _g_free0 (_tmp761_); - _g_free0 (_tmp759_); - _tmp763_ = priv_access; - _tmp764_ = param_name; - _tmp765_ = vala_ccode_identifier_get_name (_tmp764_); - _tmp766_ = _tmp765_; - _tmp767_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp763_, _tmp766_); - _tmp768_ = _tmp767_; - _tmp769_ = param_name; - _tmp770_ = vala_ccode_assignment_new ((ValaCCodeExpression*) _tmp768_, (ValaCCodeExpression*) _tmp769_, VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE); + param_name = _tmp758_; + _g_free0 (_tmp757_); + _g_free0 (_tmp755_); + _tmp759_ = priv_access; + _tmp760_ = param_name; + _tmp761_ = vala_ccode_identifier_get_name (_tmp760_); + _tmp762_ = _tmp761_; + _tmp763_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp759_, _tmp762_); + _tmp764_ = _tmp763_; + _tmp765_ = param_name; + _tmp766_ = vala_ccode_assignment_new ((ValaCCodeExpression*) _tmp764_, (ValaCCodeExpression*) _tmp765_, VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE); _vala_ccode_node_unref0 (assign); - assign = _tmp770_; - _vala_ccode_node_unref0 (_tmp768_); - _tmp771_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + assign = _tmp766_; + _vala_ccode_node_unref0 (_tmp764_); + _tmp767_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp768_ = _tmp767_; + _tmp769_ = assign; + vala_ccode_function_add_expression (_tmp768_, (ValaCCodeExpression*) _tmp769_); + _tmp770_ = type_param; + _tmp771_ = vala_symbol_get_name ((ValaSymbol*) _tmp770_); _tmp772_ = _tmp771_; - _tmp773_ = assign; - vala_ccode_function_add_expression (_tmp772_, (ValaCCodeExpression*) _tmp773_); - _tmp774_ = type_param; - _tmp775_ = vala_symbol_get_name ((ValaSymbol*) _tmp774_); + _tmp773_ = g_utf8_strdown (_tmp772_, (gssize) (-1)); + _tmp774_ = _tmp773_; + _tmp775_ = g_strdup_printf ("%s_dup_func", _tmp774_); _tmp776_ = _tmp775_; - _tmp777_ = g_utf8_strdown (_tmp776_, (gssize) (-1)); - _tmp778_ = _tmp777_; - _tmp779_ = g_strdup_printf ("%s_dup_func", _tmp778_); - _tmp780_ = _tmp779_; - _tmp781_ = vala_ccode_identifier_new (_tmp780_); + _tmp777_ = vala_ccode_identifier_new (_tmp776_); _vala_ccode_node_unref0 (param_name); - param_name = _tmp781_; - _g_free0 (_tmp780_); - _g_free0 (_tmp778_); - _tmp782_ = priv_access; - _tmp783_ = param_name; - _tmp784_ = vala_ccode_identifier_get_name (_tmp783_); - _tmp785_ = _tmp784_; - _tmp786_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp782_, _tmp785_); - _tmp787_ = _tmp786_; - _tmp788_ = param_name; - _tmp789_ = vala_ccode_assignment_new ((ValaCCodeExpression*) _tmp787_, (ValaCCodeExpression*) _tmp788_, VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE); + param_name = _tmp777_; + _g_free0 (_tmp776_); + _g_free0 (_tmp774_); + _tmp778_ = priv_access; + _tmp779_ = param_name; + _tmp780_ = vala_ccode_identifier_get_name (_tmp779_); + _tmp781_ = _tmp780_; + _tmp782_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp778_, _tmp781_); + _tmp783_ = _tmp782_; + _tmp784_ = param_name; + _tmp785_ = vala_ccode_assignment_new ((ValaCCodeExpression*) _tmp783_, (ValaCCodeExpression*) _tmp784_, VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE); _vala_ccode_node_unref0 (assign); - assign = _tmp789_; - _vala_ccode_node_unref0 (_tmp787_); - _tmp790_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + assign = _tmp785_; + _vala_ccode_node_unref0 (_tmp783_); + _tmp786_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp787_ = _tmp786_; + _tmp788_ = assign; + vala_ccode_function_add_expression (_tmp787_, (ValaCCodeExpression*) _tmp788_); + _tmp789_ = type_param; + _tmp790_ = vala_symbol_get_name ((ValaSymbol*) _tmp789_); _tmp791_ = _tmp790_; - _tmp792_ = assign; - vala_ccode_function_add_expression (_tmp791_, (ValaCCodeExpression*) _tmp792_); - _tmp793_ = type_param; - _tmp794_ = vala_symbol_get_name ((ValaSymbol*) _tmp793_); + _tmp792_ = g_utf8_strdown (_tmp791_, (gssize) (-1)); + _tmp793_ = _tmp792_; + _tmp794_ = g_strdup_printf ("%s_destroy_func", _tmp793_); _tmp795_ = _tmp794_; - _tmp796_ = g_utf8_strdown (_tmp795_, (gssize) (-1)); - _tmp797_ = _tmp796_; - _tmp798_ = g_strdup_printf ("%s_destroy_func", _tmp797_); - _tmp799_ = _tmp798_; - _tmp800_ = vala_ccode_identifier_new (_tmp799_); + _tmp796_ = vala_ccode_identifier_new (_tmp795_); _vala_ccode_node_unref0 (param_name); - param_name = _tmp800_; - _g_free0 (_tmp799_); - _g_free0 (_tmp797_); - _tmp801_ = priv_access; - _tmp802_ = param_name; - _tmp803_ = vala_ccode_identifier_get_name (_tmp802_); - _tmp804_ = _tmp803_; - _tmp805_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp801_, _tmp804_); - _tmp806_ = _tmp805_; - _tmp807_ = param_name; - _tmp808_ = vala_ccode_assignment_new ((ValaCCodeExpression*) _tmp806_, (ValaCCodeExpression*) _tmp807_, VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE); + param_name = _tmp796_; + _g_free0 (_tmp795_); + _g_free0 (_tmp793_); + _tmp797_ = priv_access; + _tmp798_ = param_name; + _tmp799_ = vala_ccode_identifier_get_name (_tmp798_); + _tmp800_ = _tmp799_; + _tmp801_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp797_, _tmp800_); + _tmp802_ = _tmp801_; + _tmp803_ = param_name; + _tmp804_ = vala_ccode_assignment_new ((ValaCCodeExpression*) _tmp802_, (ValaCCodeExpression*) _tmp803_, VALA_CCODE_ASSIGNMENT_OPERATOR_SIMPLE); _vala_ccode_node_unref0 (assign); - assign = _tmp808_; - _vala_ccode_node_unref0 (_tmp806_); - _tmp809_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp810_ = _tmp809_; - _tmp811_ = assign; - vala_ccode_function_add_expression (_tmp810_, (ValaCCodeExpression*) _tmp811_); + assign = _tmp804_; + _vala_ccode_node_unref0 (_tmp802_); + _tmp805_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp806_ = _tmp805_; + _tmp807_ = assign; + vala_ccode_function_add_expression (_tmp806_, (ValaCCodeExpression*) _tmp807_); _vala_ccode_node_unref0 (priv_access); _vala_ccode_node_unref0 (assign); _vala_ccode_node_unref0 (param_name); @@ -4059,1133 +4051,1133 @@ } _vala_code_node_unref0 (cl); } else { - ValaTypeSymbol* _tmp812_; - ValaTypeSymbol* _tmp813_; - _tmp812_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); - _tmp813_ = _tmp812_; - if (VALA_IS_CLASS (_tmp813_)) { - ValaMethod* _tmp814_; - ValaSymbol* _tmp815_; - ValaSymbol* _tmp816_; - ValaClass* _tmp817_; + ValaTypeSymbol* _tmp808_; + ValaTypeSymbol* _tmp809_; + _tmp808_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp809_ = _tmp808_; + if (VALA_IS_CLASS (_tmp809_)) { + ValaMethod* _tmp810_; + ValaSymbol* _tmp811_; + ValaSymbol* _tmp812_; + ValaClass* _tmp813_; ValaClass* cl; - ValaCCodeFunction* _tmp818_; - ValaCCodeFunction* _tmp819_; - ValaClass* _tmp820_; - gchar* _tmp821_ = NULL; - gchar* _tmp822_; - gchar* _tmp823_; - gchar* _tmp824_; - ValaCCodeVariableDeclarator* _tmp825_; - ValaCCodeVariableDeclarator* _tmp826_; - ValaMethod* _tmp827_; - gboolean _tmp828_; - gboolean _tmp829_; - ValaClass* _tmp845_; - ValaClass* _tmp846_; - ValaClass* _tmp847_; - _tmp814_ = m; - _tmp815_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp814_); - _tmp816_ = _tmp815_; - _tmp817_ = _vala_code_node_ref0 (VALA_CLASS (_tmp816_)); - cl = _tmp817_; - _tmp818_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp819_ = _tmp818_; - _tmp820_ = cl; - _tmp821_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp820_); + ValaCCodeFunction* _tmp814_; + ValaCCodeFunction* _tmp815_; + ValaClass* _tmp816_; + gchar* _tmp817_ = NULL; + gchar* _tmp818_; + gchar* _tmp819_; + gchar* _tmp820_; + ValaCCodeVariableDeclarator* _tmp821_; + ValaCCodeVariableDeclarator* _tmp822_; + ValaMethod* _tmp823_; + gboolean _tmp824_; + gboolean _tmp825_; + ValaClass* _tmp841_; + ValaClass* _tmp842_; + ValaClass* _tmp843_; + _tmp810_ = m; + _tmp811_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp810_); + _tmp812_ = _tmp811_; + _tmp813_ = _vala_code_node_ref0 (VALA_CLASS (_tmp812_)); + cl = _tmp813_; + _tmp814_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp815_ = _tmp814_; + _tmp816_ = cl; + _tmp817_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp816_); + _tmp818_ = _tmp817_; + _tmp819_ = g_strconcat (_tmp818_, "*", NULL); + _tmp820_ = _tmp819_; + _tmp821_ = vala_ccode_variable_declarator_new ("self", NULL, NULL); _tmp822_ = _tmp821_; - _tmp823_ = g_strconcat (_tmp822_, "*", NULL); - _tmp824_ = _tmp823_; - _tmp825_ = vala_ccode_variable_declarator_new ("self", NULL, NULL); - _tmp826_ = _tmp825_; - vala_ccode_function_add_declaration (_tmp819_, _tmp824_, (ValaCCodeDeclarator*) _tmp826_, 0); - _vala_ccode_node_unref0 (_tmp826_); - _g_free0 (_tmp824_); - _g_free0 (_tmp822_); - _tmp827_ = m; - _tmp828_ = vala_creation_method_get_chain_up (VALA_CREATION_METHOD (_tmp827_)); - _tmp829_ = _tmp828_; - if (!_tmp829_) { - ValaCCodeIdentifier* _tmp830_; - ValaCCodeIdentifier* _tmp831_; - ValaCCodeFunctionCall* _tmp832_; - ValaCCodeFunctionCall* _tmp833_; + vala_ccode_function_add_declaration (_tmp815_, _tmp820_, (ValaCCodeDeclarator*) _tmp822_, 0); + _vala_ccode_node_unref0 (_tmp822_); + _g_free0 (_tmp820_); + _g_free0 (_tmp818_); + _tmp823_ = m; + _tmp824_ = vala_creation_method_get_chain_up (VALA_CREATION_METHOD (_tmp823_)); + _tmp825_ = _tmp824_; + if (!_tmp825_) { + ValaCCodeIdentifier* _tmp826_; + ValaCCodeIdentifier* _tmp827_; + ValaCCodeFunctionCall* _tmp828_; + ValaCCodeFunctionCall* _tmp829_; ValaCCodeFunctionCall* ccall; - ValaCCodeFunctionCall* _tmp834_; - ValaClass* _tmp835_; - gchar* _tmp836_ = NULL; - gchar* _tmp837_; + ValaCCodeFunctionCall* _tmp830_; + ValaClass* _tmp831_; + gchar* _tmp832_ = NULL; + gchar* _tmp833_; + ValaCCodeIdentifier* _tmp834_; + ValaCCodeIdentifier* _tmp835_; + ValaCCodeFunction* _tmp836_; + ValaCCodeFunction* _tmp837_; ValaCCodeIdentifier* _tmp838_; ValaCCodeIdentifier* _tmp839_; - ValaCCodeFunction* _tmp840_; - ValaCCodeFunction* _tmp841_; - ValaCCodeIdentifier* _tmp842_; - ValaCCodeIdentifier* _tmp843_; - ValaCCodeFunctionCall* _tmp844_; - _tmp830_ = vala_ccode_identifier_new ("g_slice_new0"); - _tmp831_ = _tmp830_; - _tmp832_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp831_); + ValaCCodeFunctionCall* _tmp840_; + _tmp826_ = vala_ccode_identifier_new ("g_slice_new0"); + _tmp827_ = _tmp826_; + _tmp828_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp827_); + _tmp829_ = _tmp828_; + _vala_ccode_node_unref0 (_tmp827_); + ccall = _tmp829_; + _tmp830_ = ccall; + _tmp831_ = cl; + _tmp832_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp831_); _tmp833_ = _tmp832_; - _vala_ccode_node_unref0 (_tmp831_); - ccall = _tmp833_; - _tmp834_ = ccall; - _tmp835_ = cl; - _tmp836_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp835_); + _tmp834_ = vala_ccode_identifier_new (_tmp833_); + _tmp835_ = _tmp834_; + vala_ccode_function_call_add_argument (_tmp830_, (ValaCCodeExpression*) _tmp835_); + _vala_ccode_node_unref0 (_tmp835_); + _g_free0 (_tmp833_); + _tmp836_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); _tmp837_ = _tmp836_; - _tmp838_ = vala_ccode_identifier_new (_tmp837_); + _tmp838_ = vala_ccode_identifier_new ("self"); _tmp839_ = _tmp838_; - vala_ccode_function_call_add_argument (_tmp834_, (ValaCCodeExpression*) _tmp839_); + _tmp840_ = ccall; + vala_ccode_function_add_assignment (_tmp837_, (ValaCCodeExpression*) _tmp839_, (ValaCCodeExpression*) _tmp840_); _vala_ccode_node_unref0 (_tmp839_); - _g_free0 (_tmp837_); - _tmp840_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp841_ = _tmp840_; - _tmp842_ = vala_ccode_identifier_new ("self"); - _tmp843_ = _tmp842_; - _tmp844_ = ccall; - vala_ccode_function_add_assignment (_tmp841_, (ValaCCodeExpression*) _tmp843_, (ValaCCodeExpression*) _tmp844_); - _vala_ccode_node_unref0 (_tmp843_); _vala_ccode_node_unref0 (ccall); } - _tmp845_ = cl; - _tmp846_ = vala_class_get_base_class (_tmp845_); - _tmp847_ = _tmp846_; - if (_tmp847_ == NULL) { - ValaClass* _tmp848_; - gchar* _tmp849_ = NULL; - gchar* _tmp850_; - gchar* _tmp851_ = NULL; - gchar* _tmp852_; - ValaCCodeIdentifier* _tmp853_; - ValaCCodeIdentifier* _tmp854_; - ValaCCodeFunctionCall* _tmp855_; - ValaCCodeFunctionCall* _tmp856_; + _tmp841_ = cl; + _tmp842_ = vala_class_get_base_class (_tmp841_); + _tmp843_ = _tmp842_; + if (_tmp843_ == NULL) { + ValaClass* _tmp844_; + gchar* _tmp845_ = NULL; + gchar* _tmp846_; + gchar* _tmp847_ = NULL; + gchar* _tmp848_; + ValaCCodeIdentifier* _tmp849_; + ValaCCodeIdentifier* _tmp850_; + ValaCCodeFunctionCall* _tmp851_; + ValaCCodeFunctionCall* _tmp852_; ValaCCodeFunctionCall* cinitcall; - ValaCCodeFunctionCall* _tmp857_; - ValaCCodeIdentifier* _tmp858_; - ValaCCodeIdentifier* _tmp859_; - ValaCCodeFunction* _tmp860_; - ValaCCodeFunction* _tmp861_; - ValaCCodeFunctionCall* _tmp862_; - _tmp848_ = cl; - _tmp849_ = vala_ccode_base_module_get_ccode_lower_case_name ((ValaCodeNode*) _tmp848_, NULL); + ValaCCodeFunctionCall* _tmp853_; + ValaCCodeIdentifier* _tmp854_; + ValaCCodeIdentifier* _tmp855_; + ValaCCodeFunction* _tmp856_; + ValaCCodeFunction* _tmp857_; + ValaCCodeFunctionCall* _tmp858_; + _tmp844_ = cl; + _tmp845_ = vala_ccode_base_module_get_ccode_lower_case_name ((ValaCodeNode*) _tmp844_, NULL); + _tmp846_ = _tmp845_; + _tmp847_ = g_strdup_printf ("%s_instance_init", _tmp846_); + _tmp848_ = _tmp847_; + _tmp849_ = vala_ccode_identifier_new (_tmp848_); _tmp850_ = _tmp849_; - _tmp851_ = g_strdup_printf ("%s_instance_init", _tmp850_); + _tmp851_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp850_); _tmp852_ = _tmp851_; - _tmp853_ = vala_ccode_identifier_new (_tmp852_); - _tmp854_ = _tmp853_; - _tmp855_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp854_); - _tmp856_ = _tmp855_; - _vala_ccode_node_unref0 (_tmp854_); - _g_free0 (_tmp852_); - _g_free0 (_tmp850_); - cinitcall = _tmp856_; - _tmp857_ = cinitcall; - _tmp858_ = vala_ccode_identifier_new ("self"); - _tmp859_ = _tmp858_; - vala_ccode_function_call_add_argument (_tmp857_, (ValaCCodeExpression*) _tmp859_); - _vala_ccode_node_unref0 (_tmp859_); - _tmp860_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp861_ = _tmp860_; - _tmp862_ = cinitcall; - vala_ccode_function_add_expression (_tmp861_, (ValaCCodeExpression*) _tmp862_); + _vala_ccode_node_unref0 (_tmp850_); + _g_free0 (_tmp848_); + _g_free0 (_tmp846_); + cinitcall = _tmp852_; + _tmp853_ = cinitcall; + _tmp854_ = vala_ccode_identifier_new ("self"); + _tmp855_ = _tmp854_; + vala_ccode_function_call_add_argument (_tmp853_, (ValaCCodeExpression*) _tmp855_); + _vala_ccode_node_unref0 (_tmp855_); + _tmp856_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp857_ = _tmp856_; + _tmp858_ = cinitcall; + vala_ccode_function_add_expression (_tmp857_, (ValaCCodeExpression*) _tmp858_); _vala_ccode_node_unref0 (cinitcall); } _vala_code_node_unref0 (cl); } else { - ValaMethod* _tmp863_; - ValaSymbol* _tmp864_; - ValaSymbol* _tmp865_; - ValaStruct* _tmp866_; + ValaMethod* _tmp859_; + ValaSymbol* _tmp860_; + ValaSymbol* _tmp861_; + ValaStruct* _tmp862_; ValaStruct* st; - ValaCCodeFile* _tmp867_; - ValaCCodeIdentifier* _tmp868_; + ValaCCodeFile* _tmp863_; + ValaCCodeIdentifier* _tmp864_; + ValaCCodeIdentifier* _tmp865_; + ValaCCodeFunctionCall* _tmp866_; + ValaCCodeFunctionCall* _tmp867_; + ValaCCodeFunctionCall* czero; + ValaCCodeFunctionCall* _tmp868_; ValaCCodeIdentifier* _tmp869_; - ValaCCodeFunctionCall* _tmp870_; + ValaCCodeIdentifier* _tmp870_; ValaCCodeFunctionCall* _tmp871_; - ValaCCodeFunctionCall* czero; - ValaCCodeFunctionCall* _tmp872_; - ValaCCodeIdentifier* _tmp873_; - ValaCCodeIdentifier* _tmp874_; - ValaCCodeFunctionCall* _tmp875_; - ValaCCodeConstant* _tmp876_; - ValaCCodeConstant* _tmp877_; - ValaCCodeFunctionCall* _tmp878_; - ValaStruct* _tmp879_; - gchar* _tmp880_ = NULL; - gchar* _tmp881_; - gchar* _tmp882_ = NULL; - gchar* _tmp883_; - ValaCCodeIdentifier* _tmp884_; - ValaCCodeIdentifier* _tmp885_; - ValaCCodeFunction* _tmp886_; - ValaCCodeFunction* _tmp887_; - ValaCCodeFunctionCall* _tmp888_; - _tmp863_ = m; - _tmp864_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp863_); + ValaCCodeConstant* _tmp872_; + ValaCCodeConstant* _tmp873_; + ValaCCodeFunctionCall* _tmp874_; + ValaStruct* _tmp875_; + gchar* _tmp876_ = NULL; + gchar* _tmp877_; + gchar* _tmp878_ = NULL; + gchar* _tmp879_; + ValaCCodeIdentifier* _tmp880_; + ValaCCodeIdentifier* _tmp881_; + ValaCCodeFunction* _tmp882_; + ValaCCodeFunction* _tmp883_; + ValaCCodeFunctionCall* _tmp884_; + _tmp859_ = m; + _tmp860_ = vala_symbol_get_parent_symbol ((ValaSymbol*) _tmp859_); + _tmp861_ = _tmp860_; + _tmp862_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp861_)); + st = _tmp862_; + _tmp863_ = ((ValaCCodeBaseModule*) self)->cfile; + vala_ccode_file_add_include (_tmp863_, "string.h", FALSE); + _tmp864_ = vala_ccode_identifier_new ("memset"); _tmp865_ = _tmp864_; - _tmp866_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp865_)); - st = _tmp866_; - _tmp867_ = ((ValaCCodeBaseModule*) self)->cfile; - vala_ccode_file_add_include (_tmp867_, "string.h", FALSE); - _tmp868_ = vala_ccode_identifier_new ("memset"); - _tmp869_ = _tmp868_; - _tmp870_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp869_); - _tmp871_ = _tmp870_; - _vala_ccode_node_unref0 (_tmp869_); - czero = _tmp871_; - _tmp872_ = czero; - _tmp873_ = vala_ccode_identifier_new ("self"); - _tmp874_ = _tmp873_; - vala_ccode_function_call_add_argument (_tmp872_, (ValaCCodeExpression*) _tmp874_); - _vala_ccode_node_unref0 (_tmp874_); - _tmp875_ = czero; - _tmp876_ = vala_ccode_constant_new ("0"); + _tmp866_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp865_); + _tmp867_ = _tmp866_; + _vala_ccode_node_unref0 (_tmp865_); + czero = _tmp867_; + _tmp868_ = czero; + _tmp869_ = vala_ccode_identifier_new ("self"); + _tmp870_ = _tmp869_; + vala_ccode_function_call_add_argument (_tmp868_, (ValaCCodeExpression*) _tmp870_); + _vala_ccode_node_unref0 (_tmp870_); + _tmp871_ = czero; + _tmp872_ = vala_ccode_constant_new ("0"); + _tmp873_ = _tmp872_; + vala_ccode_function_call_add_argument (_tmp871_, (ValaCCodeExpression*) _tmp873_); + _vala_ccode_node_unref0 (_tmp873_); + _tmp874_ = czero; + _tmp875_ = st; + _tmp876_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp875_); _tmp877_ = _tmp876_; - vala_ccode_function_call_add_argument (_tmp875_, (ValaCCodeExpression*) _tmp877_); - _vala_ccode_node_unref0 (_tmp877_); - _tmp878_ = czero; - _tmp879_ = st; - _tmp880_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp879_); + _tmp878_ = g_strdup_printf ("sizeof (%s)", _tmp877_); + _tmp879_ = _tmp878_; + _tmp880_ = vala_ccode_identifier_new (_tmp879_); _tmp881_ = _tmp880_; - _tmp882_ = g_strdup_printf ("sizeof (%s)", _tmp881_); + vala_ccode_function_call_add_argument (_tmp874_, (ValaCCodeExpression*) _tmp881_); + _vala_ccode_node_unref0 (_tmp881_); + _g_free0 (_tmp879_); + _g_free0 (_tmp877_); + _tmp882_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); _tmp883_ = _tmp882_; - _tmp884_ = vala_ccode_identifier_new (_tmp883_); - _tmp885_ = _tmp884_; - vala_ccode_function_call_add_argument (_tmp878_, (ValaCCodeExpression*) _tmp885_); - _vala_ccode_node_unref0 (_tmp885_); - _g_free0 (_tmp883_); - _g_free0 (_tmp881_); - _tmp886_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp887_ = _tmp886_; - _tmp888_ = czero; - vala_ccode_function_add_expression (_tmp887_, (ValaCCodeExpression*) _tmp888_); + _tmp884_ = czero; + vala_ccode_function_add_expression (_tmp883_, (ValaCCodeExpression*) _tmp884_); _vala_ccode_node_unref0 (czero); _vala_code_node_unref0 (st); } } } } - _tmp890_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp891_ = _tmp890_; - _tmp892_ = vala_code_context_get_module_init_method (_tmp891_); - _tmp893_ = _tmp892_; - _tmp894_ = m; - if (_tmp893_ == _tmp894_) { - gboolean _tmp895_; - _tmp895_ = ((ValaCCodeBaseModule*) self)->in_plugin; - _tmp889_ = _tmp895_; + _tmp886_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp887_ = _tmp886_; + _tmp888_ = vala_code_context_get_module_init_method (_tmp887_); + _tmp889_ = _tmp888_; + _tmp890_ = m; + if (_tmp889_ == _tmp890_) { + gboolean _tmp891_; + _tmp891_ = ((ValaCCodeBaseModule*) self)->in_plugin; + _tmp885_ = _tmp891_; } else { - _tmp889_ = FALSE; + _tmp885_ = FALSE; } - _tmp896_ = _tmp889_; - if (_tmp896_) { - ValaCodeContext* _tmp897_; - ValaCodeContext* _tmp898_; - ValaNamespace* _tmp899_; - ValaNamespace* _tmp900_; - GHashFunc _tmp901_; - GEqualFunc _tmp902_; - ValaHashSet* _tmp903_; - ValaHashSet* _tmp904_; - _tmp897_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp898_ = _tmp897_; - _tmp899_ = vala_code_context_get_root (_tmp898_); + _tmp892_ = _tmp885_; + if (_tmp892_) { + ValaCodeContext* _tmp893_; + ValaCodeContext* _tmp894_; + ValaNamespace* _tmp895_; + ValaNamespace* _tmp896_; + GHashFunc _tmp897_; + GEqualFunc _tmp898_; + ValaHashSet* _tmp899_; + ValaHashSet* _tmp900_; + _tmp893_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp894_ = _tmp893_; + _tmp895_ = vala_code_context_get_root (_tmp894_); + _tmp896_ = _tmp895_; + _tmp897_ = g_direct_hash; + _tmp898_ = g_direct_equal; + _tmp899_ = vala_hash_set_new (VALA_TYPE_SYMBOL, (GBoxedCopyFunc) vala_code_node_ref, vala_code_node_unref, _tmp897_, _tmp898_); _tmp900_ = _tmp899_; - _tmp901_ = g_direct_hash; - _tmp902_ = g_direct_equal; - _tmp903_ = vala_hash_set_new (VALA_TYPE_SYMBOL, (GBoxedCopyFunc) vala_code_node_ref, vala_code_node_unref, _tmp901_, _tmp902_); - _tmp904_ = _tmp903_; - vala_ccode_method_module_register_plugin_types (self, (ValaSymbol*) _tmp900_, (ValaSet*) _tmp904_); - _vala_iterable_unref0 (_tmp904_); + vala_ccode_method_module_register_plugin_types (self, (ValaSymbol*) _tmp896_, (ValaSet*) _tmp900_); + _vala_iterable_unref0 (_tmp900_); } { - ValaMethod* _tmp905_; - ValaList* _tmp906_ = NULL; + ValaMethod* _tmp901_; + ValaList* _tmp902_ = NULL; ValaList* _precondition_list; - ValaList* _tmp907_; - gint _tmp908_; - gint _tmp909_; + ValaList* _tmp903_; + gint _tmp904_; + gint _tmp905_; gint _precondition_size; gint _precondition_index; - _tmp905_ = m; - _tmp906_ = vala_method_get_preconditions (_tmp905_); - _precondition_list = _tmp906_; - _tmp907_ = _precondition_list; - _tmp908_ = vala_collection_get_size ((ValaCollection*) _tmp907_); - _tmp909_ = _tmp908_; - _precondition_size = _tmp909_; + _tmp901_ = m; + _tmp902_ = vala_method_get_preconditions (_tmp901_); + _precondition_list = _tmp902_; + _tmp903_ = _precondition_list; + _tmp904_ = vala_collection_get_size ((ValaCollection*) _tmp903_); + _tmp905_ = _tmp904_; + _precondition_size = _tmp905_; _precondition_index = -1; while (TRUE) { + gint _tmp906_; + gint _tmp907_; + gint _tmp908_; + ValaList* _tmp909_; gint _tmp910_; - gint _tmp911_; - gint _tmp912_; - ValaList* _tmp913_; - gint _tmp914_; - gpointer _tmp915_ = NULL; + gpointer _tmp911_ = NULL; ValaExpression* precondition; - ValaMethod* _tmp916_; - ValaDataType* _tmp917_; - ValaExpression* _tmp918_; - _tmp910_ = _precondition_index; - _precondition_index = _tmp910_ + 1; - _tmp911_ = _precondition_index; - _tmp912_ = _precondition_size; - if (!(_tmp911_ < _tmp912_)) { + ValaMethod* _tmp912_; + ValaDataType* _tmp913_; + ValaExpression* _tmp914_; + _tmp906_ = _precondition_index; + _precondition_index = _tmp906_ + 1; + _tmp907_ = _precondition_index; + _tmp908_ = _precondition_size; + if (!(_tmp907_ < _tmp908_)) { break; } - _tmp913_ = _precondition_list; - _tmp914_ = _precondition_index; - _tmp915_ = vala_list_get (_tmp913_, _tmp914_); - precondition = (ValaExpression*) _tmp915_; - _tmp916_ = m; - _tmp917_ = creturn_type; - _tmp918_ = precondition; - vala_ccode_method_module_create_precondition_statement (self, (ValaCodeNode*) _tmp916_, _tmp917_, _tmp918_); + _tmp909_ = _precondition_list; + _tmp910_ = _precondition_index; + _tmp911_ = vala_list_get (_tmp909_, _tmp910_); + precondition = (ValaExpression*) _tmp911_; + _tmp912_ = m; + _tmp913_ = creturn_type; + _tmp914_ = precondition; + vala_ccode_method_module_create_precondition_statement (self, (ValaCodeNode*) _tmp912_, _tmp913_, _tmp914_); _vala_code_node_unref0 (precondition); } _vala_iterable_unref0 (_precondition_list); } } } - _tmp919_ = m; - _tmp920_ = vala_subroutine_get_body ((ValaSubroutine*) _tmp919_); - _tmp921_ = _tmp920_; - if (_tmp921_ != NULL) { - ValaMethod* _tmp922_; - ValaBlock* _tmp923_; - ValaBlock* _tmp924_; - _tmp922_ = m; - _tmp923_ = vala_subroutine_get_body ((ValaSubroutine*) _tmp922_); - _tmp924_ = _tmp923_; - vala_code_node_emit ((ValaCodeNode*) _tmp924_, (ValaCodeGenerator*) self); - } - _tmp926_ = m; - _tmp927_ = vala_method_get_is_abstract (_tmp926_); - _tmp928_ = _tmp927_; - if (!_tmp928_) { - _tmp925_ = TRUE; + _tmp915_ = m; + _tmp916_ = vala_subroutine_get_body ((ValaSubroutine*) _tmp915_); + _tmp917_ = _tmp916_; + if (_tmp917_ != NULL) { + ValaMethod* _tmp918_; + ValaBlock* _tmp919_; + ValaBlock* _tmp920_; + _tmp918_ = m; + _tmp919_ = vala_subroutine_get_body ((ValaSubroutine*) _tmp918_); + _tmp920_ = _tmp919_; + vala_code_node_emit ((ValaCodeNode*) _tmp920_, (ValaCodeGenerator*) self); + } + _tmp922_ = m; + _tmp923_ = vala_method_get_is_abstract (_tmp922_); + _tmp924_ = _tmp923_; + if (!_tmp924_) { + _tmp921_ = TRUE; } else { - gboolean _tmp929_ = FALSE; - ValaMethod* _tmp930_; + gboolean _tmp925_ = FALSE; + ValaMethod* _tmp926_; + gboolean _tmp927_; + gboolean _tmp928_; gboolean _tmp931_; - gboolean _tmp932_; - gboolean _tmp935_; - _tmp930_ = m; - _tmp931_ = vala_method_get_is_abstract (_tmp930_); - _tmp932_ = _tmp931_; - if (_tmp932_) { - ValaTypeSymbol* _tmp933_; - ValaTypeSymbol* _tmp934_; - _tmp933_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); - _tmp934_ = _tmp933_; - _tmp929_ = VALA_IS_CLASS (_tmp934_); + _tmp926_ = m; + _tmp927_ = vala_method_get_is_abstract (_tmp926_); + _tmp928_ = _tmp927_; + if (_tmp928_) { + ValaTypeSymbol* _tmp929_; + ValaTypeSymbol* _tmp930_; + _tmp929_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp930_ = _tmp929_; + _tmp925_ = VALA_IS_CLASS (_tmp930_); } else { - _tmp929_ = FALSE; + _tmp925_ = FALSE; } - _tmp935_ = _tmp929_; - _tmp925_ = _tmp935_; + _tmp931_ = _tmp925_; + _tmp921_ = _tmp931_; } - _tmp936_ = _tmp925_; - if (_tmp936_) { - ValaMethod* _tmp937_; - ValaBlock* _tmp938_; - ValaBlock* _tmp939_; - _tmp937_ = m; - _tmp938_ = vala_subroutine_get_body ((ValaSubroutine*) _tmp937_); - _tmp939_ = _tmp938_; - if (_tmp939_ != NULL) { - gboolean _tmp940_; - gboolean _tmp941_; - ValaMethod* _tmp952_; - gboolean _tmp953_; - gboolean _tmp954_; - gboolean _tmp955_ = FALSE; - gboolean _tmp956_ = FALSE; - ValaMethod* _tmp957_; - ValaDataType* _tmp958_; - ValaDataType* _tmp959_; + _tmp932_ = _tmp921_; + if (_tmp932_) { + ValaMethod* _tmp933_; + ValaBlock* _tmp934_; + ValaBlock* _tmp935_; + _tmp933_ = m; + _tmp934_ = vala_subroutine_get_body ((ValaSubroutine*) _tmp933_); + _tmp935_ = _tmp934_; + if (_tmp935_ != NULL) { + gboolean _tmp936_; + gboolean _tmp937_; + ValaMethod* _tmp948_; + gboolean _tmp949_; + gboolean _tmp950_; + gboolean _tmp951_ = FALSE; + gboolean _tmp952_ = FALSE; + ValaMethod* _tmp953_; + ValaDataType* _tmp954_; + ValaDataType* _tmp955_; + gboolean _tmp960_; gboolean _tmp964_; - gboolean _tmp968_; - ValaMethod* _tmp985_; - ValaCCodeFile* _tmp1072_; - ValaCCodeFunction* _tmp1073_; - ValaCCodeFunction* _tmp1074_; - _tmp940_ = vala_ccode_base_module_get_current_method_inner_error ((ValaCCodeBaseModule*) self); - _tmp941_ = _tmp940_; - if (_tmp941_) { - ValaMethod* _tmp942_; - gboolean _tmp943_; - gboolean _tmp944_; - _tmp942_ = m; - _tmp943_ = vala_method_get_coroutine (_tmp942_); - _tmp944_ = _tmp943_; - if (_tmp944_) { - ValaCCodeStruct* _tmp945_; - _tmp945_ = ((ValaCCodeBaseModule*) self)->closure_struct; - vala_ccode_struct_add_field (_tmp945_, "GError *", "_inner_error_", NULL); + ValaMethod* _tmp981_; + ValaCCodeFile* _tmp1068_; + ValaCCodeFunction* _tmp1069_; + ValaCCodeFunction* _tmp1070_; + _tmp936_ = vala_ccode_base_module_get_current_method_inner_error ((ValaCCodeBaseModule*) self); + _tmp937_ = _tmp936_; + if (_tmp937_) { + ValaMethod* _tmp938_; + gboolean _tmp939_; + gboolean _tmp940_; + _tmp938_ = m; + _tmp939_ = vala_method_get_coroutine (_tmp938_); + _tmp940_ = _tmp939_; + if (_tmp940_) { + ValaCCodeStruct* _tmp941_; + _tmp941_ = ((ValaCCodeBaseModule*) self)->closure_struct; + vala_ccode_struct_add_field (_tmp941_, "GError *", "_inner_error_", NULL); } else { - ValaCCodeFunction* _tmp946_; - ValaCCodeFunction* _tmp947_; - ValaCCodeConstant* _tmp948_; - ValaCCodeConstant* _tmp949_; - ValaCCodeVariableDeclarator* _tmp950_; - ValaCCodeVariableDeclarator* _tmp951_; - _tmp946_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + ValaCCodeFunction* _tmp942_; + ValaCCodeFunction* _tmp943_; + ValaCCodeConstant* _tmp944_; + ValaCCodeConstant* _tmp945_; + ValaCCodeVariableDeclarator* _tmp946_; + ValaCCodeVariableDeclarator* _tmp947_; + _tmp942_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp943_ = _tmp942_; + _tmp944_ = vala_ccode_constant_new ("NULL"); + _tmp945_ = _tmp944_; + _tmp946_ = vala_ccode_variable_declarator_new_zero ("_inner_error_", (ValaCCodeExpression*) _tmp945_, NULL); _tmp947_ = _tmp946_; - _tmp948_ = vala_ccode_constant_new ("NULL"); - _tmp949_ = _tmp948_; - _tmp950_ = vala_ccode_variable_declarator_new_zero ("_inner_error_", (ValaCCodeExpression*) _tmp949_, NULL); - _tmp951_ = _tmp950_; - vala_ccode_function_add_declaration (_tmp947_, "GError *", (ValaCCodeDeclarator*) _tmp951_, 0); - _vala_ccode_node_unref0 (_tmp951_); - _vala_ccode_node_unref0 (_tmp949_); + vala_ccode_function_add_declaration (_tmp943_, "GError *", (ValaCCodeDeclarator*) _tmp947_, 0); + _vala_ccode_node_unref0 (_tmp947_); + _vala_ccode_node_unref0 (_tmp945_); } } - _tmp952_ = m; - _tmp953_ = vala_method_get_coroutine (_tmp952_); - _tmp954_ = _tmp953_; - if (_tmp954_) { + _tmp948_ = m; + _tmp949_ = vala_method_get_coroutine (_tmp948_); + _tmp950_ = _tmp949_; + if (_tmp950_) { vala_ccode_method_module_complete_async (self); } - _tmp957_ = m; - _tmp958_ = vala_method_get_return_type (_tmp957_); - _tmp959_ = _tmp958_; - if (!VALA_IS_VOID_TYPE (_tmp959_)) { - ValaMethod* _tmp960_; - ValaDataType* _tmp961_; - ValaDataType* _tmp962_; - gboolean _tmp963_ = FALSE; - _tmp960_ = m; - _tmp961_ = vala_method_get_return_type (_tmp960_); - _tmp962_ = _tmp961_; - _tmp963_ = vala_data_type_is_real_non_null_struct_type (_tmp962_); - _tmp956_ = !_tmp963_; + _tmp953_ = m; + _tmp954_ = vala_method_get_return_type (_tmp953_); + _tmp955_ = _tmp954_; + if (!VALA_IS_VOID_TYPE (_tmp955_)) { + ValaMethod* _tmp956_; + ValaDataType* _tmp957_; + ValaDataType* _tmp958_; + gboolean _tmp959_ = FALSE; + _tmp956_ = m; + _tmp957_ = vala_method_get_return_type (_tmp956_); + _tmp958_ = _tmp957_; + _tmp959_ = vala_data_type_is_real_non_null_struct_type (_tmp958_); + _tmp952_ = !_tmp959_; } else { - _tmp956_ = FALSE; + _tmp952_ = FALSE; } - _tmp964_ = _tmp956_; - if (_tmp964_) { - ValaMethod* _tmp965_; - gboolean _tmp966_; - gboolean _tmp967_; - _tmp965_ = m; - _tmp966_ = vala_method_get_coroutine (_tmp965_); - _tmp967_ = _tmp966_; - _tmp955_ = !_tmp967_; + _tmp960_ = _tmp952_; + if (_tmp960_) { + ValaMethod* _tmp961_; + gboolean _tmp962_; + gboolean _tmp963_; + _tmp961_ = m; + _tmp962_ = vala_method_get_coroutine (_tmp961_); + _tmp963_ = _tmp962_; + _tmp951_ = !_tmp963_; } else { - _tmp955_ = FALSE; + _tmp951_ = FALSE; } - _tmp968_ = _tmp955_; - if (_tmp968_) { - gboolean _tmp969_ = FALSE; - ValaMethod* _tmp970_; - ValaBasicBlock* _tmp971_; - ValaBasicBlock* _tmp972_; - gboolean _tmp980_; - _tmp970_ = m; - _tmp971_ = vala_subroutine_get_return_block ((ValaSubroutine*) _tmp970_); - _tmp972_ = _tmp971_; - if (_tmp972_ != NULL) { - ValaMethod* _tmp973_; - ValaBasicBlock* _tmp974_; - ValaBasicBlock* _tmp975_; - ValaList* _tmp976_ = NULL; - ValaList* _tmp977_; - gint _tmp978_; - gint _tmp979_; - _tmp973_ = m; - _tmp974_ = vala_subroutine_get_return_block ((ValaSubroutine*) _tmp973_); + _tmp964_ = _tmp951_; + if (_tmp964_) { + gboolean _tmp965_ = FALSE; + ValaMethod* _tmp966_; + ValaBasicBlock* _tmp967_; + ValaBasicBlock* _tmp968_; + gboolean _tmp976_; + _tmp966_ = m; + _tmp967_ = vala_subroutine_get_return_block ((ValaSubroutine*) _tmp966_); + _tmp968_ = _tmp967_; + if (_tmp968_ != NULL) { + ValaMethod* _tmp969_; + ValaBasicBlock* _tmp970_; + ValaBasicBlock* _tmp971_; + ValaList* _tmp972_ = NULL; + ValaList* _tmp973_; + gint _tmp974_; + gint _tmp975_; + _tmp969_ = m; + _tmp970_ = vala_subroutine_get_return_block ((ValaSubroutine*) _tmp969_); + _tmp971_ = _tmp970_; + _tmp972_ = vala_basic_block_get_predecessors (_tmp971_); + _tmp973_ = _tmp972_; + _tmp974_ = vala_collection_get_size ((ValaCollection*) _tmp973_); _tmp975_ = _tmp974_; - _tmp976_ = vala_basic_block_get_predecessors (_tmp975_); - _tmp977_ = _tmp976_; - _tmp978_ = vala_collection_get_size ((ValaCollection*) _tmp977_); - _tmp979_ = _tmp978_; - _tmp969_ = _tmp979_ == 0; - _vala_iterable_unref0 (_tmp977_); + _tmp965_ = _tmp975_ == 0; + _vala_iterable_unref0 (_tmp973_); } else { - _tmp969_ = FALSE; + _tmp965_ = FALSE; } - _tmp980_ = _tmp969_; - if (_tmp980_) { - ValaCCodeFunction* _tmp981_; - ValaCCodeFunction* _tmp982_; - ValaCCodeIdentifier* _tmp983_; - ValaCCodeIdentifier* _tmp984_; - _tmp981_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp982_ = _tmp981_; - _tmp983_ = vala_ccode_identifier_new ("result"); - _tmp984_ = _tmp983_; - vala_ccode_function_add_return (_tmp982_, (ValaCCodeExpression*) _tmp984_); - _vala_ccode_node_unref0 (_tmp984_); - } - } - _tmp985_ = m; - if (VALA_IS_CREATION_METHOD (_tmp985_)) { - ValaTypeSymbol* _tmp986_; - ValaTypeSymbol* _tmp987_; - gboolean _tmp992_ = FALSE; - gboolean _tmp993_ = FALSE; - gboolean _tmp994_ = FALSE; - gboolean _tmp995_ = FALSE; - ValaTypeSymbol* _tmp996_; - ValaTypeSymbol* _tmp997_; - gboolean _tmp999_; - gboolean _tmp1004_; + _tmp976_ = _tmp965_; + if (_tmp976_) { + ValaCCodeFunction* _tmp977_; + ValaCCodeFunction* _tmp978_; + ValaCCodeIdentifier* _tmp979_; + ValaCCodeIdentifier* _tmp980_; + _tmp977_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp978_ = _tmp977_; + _tmp979_ = vala_ccode_identifier_new ("result"); + _tmp980_ = _tmp979_; + vala_ccode_function_add_return (_tmp978_, (ValaCCodeExpression*) _tmp980_); + _vala_ccode_node_unref0 (_tmp980_); + } + } + _tmp981_ = m; + if (VALA_IS_CREATION_METHOD (_tmp981_)) { + ValaTypeSymbol* _tmp982_; + ValaTypeSymbol* _tmp983_; + gboolean _tmp988_ = FALSE; + gboolean _tmp989_ = FALSE; + gboolean _tmp990_ = FALSE; + gboolean _tmp991_ = FALSE; + ValaTypeSymbol* _tmp992_; + ValaTypeSymbol* _tmp993_; + gboolean _tmp995_; + gboolean _tmp1000_; + gboolean _tmp1007_; gboolean _tmp1011_; - gboolean _tmp1015_; - ValaTypeSymbol* _tmp1057_; - ValaTypeSymbol* _tmp1058_; - _tmp986_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); - _tmp987_ = _tmp986_; - if (VALA_IS_CLASS (_tmp987_)) { - ValaClass* _tmp988_; - ValaClass* _tmp989_; - ValaObjectType* _tmp990_; - _tmp988_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); - _tmp989_ = _tmp988_; - _tmp990_ = vala_object_type_new ((ValaObjectTypeSymbol*) _tmp989_); + ValaTypeSymbol* _tmp1053_; + ValaTypeSymbol* _tmp1054_; + _tmp982_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp983_ = _tmp982_; + if (VALA_IS_CLASS (_tmp983_)) { + ValaClass* _tmp984_; + ValaClass* _tmp985_; + ValaObjectType* _tmp986_; + _tmp984_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); + _tmp985_ = _tmp984_; + _tmp986_ = vala_object_type_new ((ValaObjectTypeSymbol*) _tmp985_); _vala_code_node_unref0 (creturn_type); - creturn_type = (ValaDataType*) _tmp990_; + creturn_type = (ValaDataType*) _tmp986_; } else { - ValaVoidType* _tmp991_; - _tmp991_ = vala_void_type_new (NULL); + ValaVoidType* _tmp987_; + _tmp987_ = vala_void_type_new (NULL); _vala_code_node_unref0 (creturn_type); - creturn_type = (ValaDataType*) _tmp991_; + creturn_type = (ValaDataType*) _tmp987_; + } + _tmp992_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp993_ = _tmp992_; + if (VALA_IS_CLASS (_tmp993_)) { + ValaTypeSymbol* _tmp994_; + _tmp994_ = ((ValaCCodeBaseModule*) self)->gobject_type; + _tmp991_ = _tmp994_ != NULL; + } else { + _tmp991_ = FALSE; } - _tmp996_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); - _tmp997_ = _tmp996_; - if (VALA_IS_CLASS (_tmp997_)) { + _tmp995_ = _tmp991_; + if (_tmp995_) { + ValaClass* _tmp996_; + ValaClass* _tmp997_; ValaTypeSymbol* _tmp998_; + gboolean _tmp999_ = FALSE; + _tmp996_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); + _tmp997_ = _tmp996_; _tmp998_ = ((ValaCCodeBaseModule*) self)->gobject_type; - _tmp995_ = _tmp998_ != NULL; + _tmp999_ = vala_typesymbol_is_subtype_of ((ValaTypeSymbol*) _tmp997_, _tmp998_); + _tmp990_ = _tmp999_; } else { - _tmp995_ = FALSE; + _tmp990_ = FALSE; } - _tmp999_ = _tmp995_; - if (_tmp999_) { - ValaClass* _tmp1000_; + _tmp1000_ = _tmp990_; + if (_tmp1000_) { ValaClass* _tmp1001_; - ValaTypeSymbol* _tmp1002_; - gboolean _tmp1003_ = FALSE; - _tmp1000_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); - _tmp1001_ = _tmp1000_; - _tmp1002_ = ((ValaCCodeBaseModule*) self)->gobject_type; - _tmp1003_ = vala_typesymbol_is_subtype_of ((ValaTypeSymbol*) _tmp1001_, _tmp1002_); - _tmp994_ = _tmp1003_; + ValaClass* _tmp1002_; + ValaList* _tmp1003_ = NULL; + ValaList* _tmp1004_; + gint _tmp1005_; + gint _tmp1006_; + _tmp1001_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); + _tmp1002_ = _tmp1001_; + _tmp1003_ = vala_object_type_symbol_get_type_parameters ((ValaObjectTypeSymbol*) _tmp1002_); + _tmp1004_ = _tmp1003_; + _tmp1005_ = vala_collection_get_size ((ValaCollection*) _tmp1004_); + _tmp1006_ = _tmp1005_; + _tmp989_ = _tmp1006_ > 0; + _vala_iterable_unref0 (_tmp1004_); } else { - _tmp994_ = FALSE; + _tmp989_ = FALSE; } - _tmp1004_ = _tmp994_; - if (_tmp1004_) { - ValaClass* _tmp1005_; - ValaClass* _tmp1006_; - ValaList* _tmp1007_ = NULL; - ValaList* _tmp1008_; - gint _tmp1009_; - gint _tmp1010_; - _tmp1005_ = vala_ccode_base_module_get_current_class ((ValaCCodeBaseModule*) self); - _tmp1006_ = _tmp1005_; - _tmp1007_ = vala_object_type_symbol_get_type_parameters ((ValaObjectTypeSymbol*) _tmp1006_); - _tmp1008_ = _tmp1007_; - _tmp1009_ = vala_collection_get_size ((ValaCollection*) _tmp1008_); + _tmp1007_ = _tmp989_; + if (_tmp1007_) { + ValaMethod* _tmp1008_; + gboolean _tmp1009_; + gboolean _tmp1010_; + _tmp1008_ = m; + _tmp1009_ = vala_creation_method_get_chain_up (VALA_CREATION_METHOD (_tmp1008_)); _tmp1010_ = _tmp1009_; - _tmp993_ = _tmp1010_ > 0; - _vala_iterable_unref0 (_tmp1008_); + _tmp988_ = !_tmp1010_; } else { - _tmp993_ = FALSE; + _tmp988_ = FALSE; } - _tmp1011_ = _tmp993_; + _tmp1011_ = _tmp988_; if (_tmp1011_) { - ValaMethod* _tmp1012_; - gboolean _tmp1013_; - gboolean _tmp1014_; - _tmp1012_ = m; - _tmp1013_ = vala_creation_method_get_chain_up (VALA_CREATION_METHOD (_tmp1012_)); - _tmp1014_ = _tmp1013_; - _tmp992_ = !_tmp1014_; - } else { - _tmp992_ = FALSE; - } - _tmp1015_ = _tmp992_; - if (_tmp1015_) { - ValaCCodeIdentifier* _tmp1016_; - ValaCCodeIdentifier* _tmp1017_; - ValaCCodeIdentifier* _tmp1018_; - ValaCCodeIdentifier* _tmp1019_; - ValaCCodeBinaryExpression* _tmp1020_; - ValaCCodeBinaryExpression* _tmp1021_; + ValaCCodeIdentifier* _tmp1012_; + ValaCCodeIdentifier* _tmp1013_; + ValaCCodeIdentifier* _tmp1014_; + ValaCCodeIdentifier* _tmp1015_; + ValaCCodeBinaryExpression* _tmp1016_; + ValaCCodeBinaryExpression* _tmp1017_; ValaCCodeBinaryExpression* ccond; + ValaCCodeFunction* _tmp1018_; + ValaCCodeFunction* _tmp1019_; + ValaCCodeBinaryExpression* _tmp1020_; + ValaCCodeFunction* _tmp1021_; ValaCCodeFunction* _tmp1022_; - ValaCCodeFunction* _tmp1023_; - ValaCCodeBinaryExpression* _tmp1024_; - ValaCCodeFunction* _tmp1025_; - ValaCCodeFunction* _tmp1026_; + ValaCCodeIdentifier* _tmp1023_; + ValaCCodeIdentifier* _tmp1024_; + ValaCCodeUnaryExpression* _tmp1025_; + ValaCCodeUnaryExpression* _tmp1026_; ValaCCodeIdentifier* _tmp1027_; ValaCCodeIdentifier* _tmp1028_; - ValaCCodeUnaryExpression* _tmp1029_; - ValaCCodeUnaryExpression* _tmp1030_; - ValaCCodeIdentifier* _tmp1031_; - ValaCCodeIdentifier* _tmp1032_; - ValaCCodeFunctionCall* _tmp1033_; - ValaCCodeFunctionCall* _tmp1034_; + ValaCCodeFunctionCall* _tmp1029_; + ValaCCodeFunctionCall* _tmp1030_; ValaCCodeFunctionCall* cunsetcall; - ValaCCodeFunctionCall* _tmp1035_; - ValaCCodeIdentifier* _tmp1036_; - ValaCCodeIdentifier* _tmp1037_; - ValaCCodeMemberAccess* _tmp1038_; - ValaCCodeMemberAccess* _tmp1039_; - ValaCCodeUnaryExpression* _tmp1040_; - ValaCCodeUnaryExpression* _tmp1041_; + ValaCCodeFunctionCall* _tmp1031_; + ValaCCodeIdentifier* _tmp1032_; + ValaCCodeIdentifier* _tmp1033_; + ValaCCodeMemberAccess* _tmp1034_; + ValaCCodeMemberAccess* _tmp1035_; + ValaCCodeUnaryExpression* _tmp1036_; + ValaCCodeUnaryExpression* _tmp1037_; + ValaCCodeFunction* _tmp1038_; + ValaCCodeFunction* _tmp1039_; + ValaCCodeFunctionCall* _tmp1040_; + ValaCCodeFunction* _tmp1041_; ValaCCodeFunction* _tmp1042_; - ValaCCodeFunction* _tmp1043_; - ValaCCodeFunctionCall* _tmp1044_; - ValaCCodeFunction* _tmp1045_; - ValaCCodeFunction* _tmp1046_; - ValaCCodeIdentifier* _tmp1047_; - ValaCCodeIdentifier* _tmp1048_; - ValaCCodeFunctionCall* _tmp1049_; - ValaCCodeFunctionCall* _tmp1050_; + ValaCCodeIdentifier* _tmp1043_; + ValaCCodeIdentifier* _tmp1044_; + ValaCCodeFunctionCall* _tmp1045_; + ValaCCodeFunctionCall* _tmp1046_; ValaCCodeFunctionCall* cfreeparams; - ValaCCodeFunctionCall* _tmp1051_; - ValaCCodeIdentifier* _tmp1052_; - ValaCCodeIdentifier* _tmp1053_; - ValaCCodeFunction* _tmp1054_; - ValaCCodeFunction* _tmp1055_; - ValaCCodeFunctionCall* _tmp1056_; - _tmp1016_ = vala_ccode_identifier_new ("__params_it"); + ValaCCodeFunctionCall* _tmp1047_; + ValaCCodeIdentifier* _tmp1048_; + ValaCCodeIdentifier* _tmp1049_; + ValaCCodeFunction* _tmp1050_; + ValaCCodeFunction* _tmp1051_; + ValaCCodeFunctionCall* _tmp1052_; + _tmp1012_ = vala_ccode_identifier_new ("__params_it"); + _tmp1013_ = _tmp1012_; + _tmp1014_ = vala_ccode_identifier_new ("__params"); + _tmp1015_ = _tmp1014_; + _tmp1016_ = vala_ccode_binary_expression_new (VALA_CCODE_BINARY_OPERATOR_GREATER_THAN, (ValaCCodeExpression*) _tmp1013_, (ValaCCodeExpression*) _tmp1015_); _tmp1017_ = _tmp1016_; - _tmp1018_ = vala_ccode_identifier_new ("__params"); + _vala_ccode_node_unref0 (_tmp1015_); + _vala_ccode_node_unref0 (_tmp1013_); + ccond = _tmp1017_; + _tmp1018_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); _tmp1019_ = _tmp1018_; - _tmp1020_ = vala_ccode_binary_expression_new (VALA_CCODE_BINARY_OPERATOR_GREATER_THAN, (ValaCCodeExpression*) _tmp1017_, (ValaCCodeExpression*) _tmp1019_); - _tmp1021_ = _tmp1020_; - _vala_ccode_node_unref0 (_tmp1019_); - _vala_ccode_node_unref0 (_tmp1017_); - ccond = _tmp1021_; - _tmp1022_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1023_ = _tmp1022_; - _tmp1024_ = ccond; - vala_ccode_function_open_while (_tmp1023_, (ValaCCodeExpression*) _tmp1024_); - _tmp1025_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1020_ = ccond; + vala_ccode_function_open_while (_tmp1019_, (ValaCCodeExpression*) _tmp1020_); + _tmp1021_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1022_ = _tmp1021_; + _tmp1023_ = vala_ccode_identifier_new ("__params_it"); + _tmp1024_ = _tmp1023_; + _tmp1025_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_PREFIX_DECREMENT, (ValaCCodeExpression*) _tmp1024_); _tmp1026_ = _tmp1025_; - _tmp1027_ = vala_ccode_identifier_new ("__params_it"); + vala_ccode_function_add_expression (_tmp1022_, (ValaCCodeExpression*) _tmp1026_); + _vala_ccode_node_unref0 (_tmp1026_); + _vala_ccode_node_unref0 (_tmp1024_); + _tmp1027_ = vala_ccode_identifier_new ("g_value_unset"); _tmp1028_ = _tmp1027_; - _tmp1029_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_PREFIX_DECREMENT, (ValaCCodeExpression*) _tmp1028_); + _tmp1029_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1028_); _tmp1030_ = _tmp1029_; - vala_ccode_function_add_expression (_tmp1026_, (ValaCCodeExpression*) _tmp1030_); - _vala_ccode_node_unref0 (_tmp1030_); _vala_ccode_node_unref0 (_tmp1028_); - _tmp1031_ = vala_ccode_identifier_new ("g_value_unset"); - _tmp1032_ = _tmp1031_; - _tmp1033_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1032_); - _tmp1034_ = _tmp1033_; - _vala_ccode_node_unref0 (_tmp1032_); - cunsetcall = _tmp1034_; - _tmp1035_ = cunsetcall; - _tmp1036_ = vala_ccode_identifier_new ("__params_it"); + cunsetcall = _tmp1030_; + _tmp1031_ = cunsetcall; + _tmp1032_ = vala_ccode_identifier_new ("__params_it"); + _tmp1033_ = _tmp1032_; + _tmp1034_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp1033_, "value"); + _tmp1035_ = _tmp1034_; + _tmp1036_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_ADDRESS_OF, (ValaCCodeExpression*) _tmp1035_); _tmp1037_ = _tmp1036_; - _tmp1038_ = vala_ccode_member_access_new_pointer ((ValaCCodeExpression*) _tmp1037_, "value"); - _tmp1039_ = _tmp1038_; - _tmp1040_ = vala_ccode_unary_expression_new (VALA_CCODE_UNARY_OPERATOR_ADDRESS_OF, (ValaCCodeExpression*) _tmp1039_); - _tmp1041_ = _tmp1040_; - vala_ccode_function_call_add_argument (_tmp1035_, (ValaCCodeExpression*) _tmp1041_); - _vala_ccode_node_unref0 (_tmp1041_); - _vala_ccode_node_unref0 (_tmp1039_); + vala_ccode_function_call_add_argument (_tmp1031_, (ValaCCodeExpression*) _tmp1037_); _vala_ccode_node_unref0 (_tmp1037_); - _tmp1042_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1043_ = _tmp1042_; - _tmp1044_ = cunsetcall; - vala_ccode_function_add_expression (_tmp1043_, (ValaCCodeExpression*) _tmp1044_); - _tmp1045_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _vala_ccode_node_unref0 (_tmp1035_); + _vala_ccode_node_unref0 (_tmp1033_); + _tmp1038_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1039_ = _tmp1038_; + _tmp1040_ = cunsetcall; + vala_ccode_function_add_expression (_tmp1039_, (ValaCCodeExpression*) _tmp1040_); + _tmp1041_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1042_ = _tmp1041_; + vala_ccode_function_close (_tmp1042_); + _tmp1043_ = vala_ccode_identifier_new ("g_free"); + _tmp1044_ = _tmp1043_; + _tmp1045_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1044_); _tmp1046_ = _tmp1045_; - vala_ccode_function_close (_tmp1046_); - _tmp1047_ = vala_ccode_identifier_new ("g_free"); - _tmp1048_ = _tmp1047_; - _tmp1049_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1048_); - _tmp1050_ = _tmp1049_; - _vala_ccode_node_unref0 (_tmp1048_); - cfreeparams = _tmp1050_; - _tmp1051_ = cfreeparams; - _tmp1052_ = vala_ccode_identifier_new ("__params"); - _tmp1053_ = _tmp1052_; - vala_ccode_function_call_add_argument (_tmp1051_, (ValaCCodeExpression*) _tmp1053_); - _vala_ccode_node_unref0 (_tmp1053_); - _tmp1054_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1055_ = _tmp1054_; - _tmp1056_ = cfreeparams; - vala_ccode_function_add_expression (_tmp1055_, (ValaCCodeExpression*) _tmp1056_); + _vala_ccode_node_unref0 (_tmp1044_); + cfreeparams = _tmp1046_; + _tmp1047_ = cfreeparams; + _tmp1048_ = vala_ccode_identifier_new ("__params"); + _tmp1049_ = _tmp1048_; + vala_ccode_function_call_add_argument (_tmp1047_, (ValaCCodeExpression*) _tmp1049_); + _vala_ccode_node_unref0 (_tmp1049_); + _tmp1050_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1051_ = _tmp1050_; + _tmp1052_ = cfreeparams; + vala_ccode_function_add_expression (_tmp1051_, (ValaCCodeExpression*) _tmp1052_); _vala_ccode_node_unref0 (cfreeparams); _vala_ccode_node_unref0 (cunsetcall); _vala_ccode_node_unref0 (ccond); } - _tmp1057_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); - _tmp1058_ = _tmp1057_; - if (VALA_IS_CLASS (_tmp1058_)) { - ValaCCodeIdentifier* _tmp1059_; + _tmp1053_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp1054_ = _tmp1053_; + if (VALA_IS_CLASS (_tmp1054_)) { + ValaCCodeIdentifier* _tmp1055_; ValaCCodeExpression* cresult; - ValaMethod* _tmp1060_; - gchar* _tmp1061_ = NULL; - gchar* _tmp1062_; - gboolean _tmp1063_; - ValaCCodeFunction* _tmp1069_; - ValaCCodeFunction* _tmp1070_; - ValaCCodeExpression* _tmp1071_; - _tmp1059_ = vala_ccode_identifier_new ("self"); - cresult = (ValaCCodeExpression*) _tmp1059_; - _tmp1060_ = m; - _tmp1061_ = vala_ccode_base_module_get_ccode_type ((ValaCodeNode*) _tmp1060_); - _tmp1062_ = _tmp1061_; - _tmp1063_ = _tmp1062_ != NULL; - _g_free0 (_tmp1062_); - if (_tmp1063_) { - ValaCCodeExpression* _tmp1064_; - ValaMethod* _tmp1065_; - gchar* _tmp1066_ = NULL; - gchar* _tmp1067_; - ValaCCodeCastExpression* _tmp1068_; - _tmp1064_ = cresult; - _tmp1065_ = m; - _tmp1066_ = vala_ccode_base_module_get_ccode_type ((ValaCodeNode*) _tmp1065_); - _tmp1067_ = _tmp1066_; - _tmp1068_ = vala_ccode_cast_expression_new (_tmp1064_, _tmp1067_); + ValaMethod* _tmp1056_; + gchar* _tmp1057_ = NULL; + gchar* _tmp1058_; + gboolean _tmp1059_; + ValaCCodeFunction* _tmp1065_; + ValaCCodeFunction* _tmp1066_; + ValaCCodeExpression* _tmp1067_; + _tmp1055_ = vala_ccode_identifier_new ("self"); + cresult = (ValaCCodeExpression*) _tmp1055_; + _tmp1056_ = m; + _tmp1057_ = vala_ccode_base_module_get_ccode_type ((ValaCodeNode*) _tmp1056_); + _tmp1058_ = _tmp1057_; + _tmp1059_ = _tmp1058_ != NULL; + _g_free0 (_tmp1058_); + if (_tmp1059_) { + ValaCCodeExpression* _tmp1060_; + ValaMethod* _tmp1061_; + gchar* _tmp1062_ = NULL; + gchar* _tmp1063_; + ValaCCodeCastExpression* _tmp1064_; + _tmp1060_ = cresult; + _tmp1061_ = m; + _tmp1062_ = vala_ccode_base_module_get_ccode_type ((ValaCodeNode*) _tmp1061_); + _tmp1063_ = _tmp1062_; + _tmp1064_ = vala_ccode_cast_expression_new (_tmp1060_, _tmp1063_); _vala_ccode_node_unref0 (cresult); - cresult = (ValaCCodeExpression*) _tmp1068_; - _g_free0 (_tmp1067_); + cresult = (ValaCCodeExpression*) _tmp1064_; + _g_free0 (_tmp1063_); } - _tmp1069_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1070_ = _tmp1069_; - _tmp1071_ = cresult; - vala_ccode_function_add_return (_tmp1070_, _tmp1071_); + _tmp1065_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1066_ = _tmp1065_; + _tmp1067_ = cresult; + vala_ccode_function_add_return (_tmp1066_, _tmp1067_); _vala_ccode_node_unref0 (cresult); } } - _tmp1072_ = ((ValaCCodeBaseModule*) self)->cfile; - _tmp1073_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1074_ = _tmp1073_; - vala_ccode_file_add_function (_tmp1072_, _tmp1074_); + _tmp1068_ = ((ValaCCodeBaseModule*) self)->cfile; + _tmp1069_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1070_ = _tmp1069_; + vala_ccode_file_add_function (_tmp1068_, _tmp1070_); } } - _tmp1076_ = m; - _tmp1077_ = vala_method_get_is_abstract (_tmp1076_); - _tmp1078_ = _tmp1077_; - if (_tmp1078_) { - ValaTypeSymbol* _tmp1079_; - ValaTypeSymbol* _tmp1080_; - _tmp1079_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); - _tmp1080_ = _tmp1079_; - _tmp1075_ = VALA_IS_CLASS (_tmp1080_); + _tmp1072_ = m; + _tmp1073_ = vala_method_get_is_abstract (_tmp1072_); + _tmp1074_ = _tmp1073_; + if (_tmp1074_) { + ValaTypeSymbol* _tmp1075_; + ValaTypeSymbol* _tmp1076_; + _tmp1075_ = vala_ccode_base_module_get_current_type_symbol ((ValaCCodeBaseModule*) self); + _tmp1076_ = _tmp1075_; + _tmp1071_ = VALA_IS_CLASS (_tmp1076_); } else { - _tmp1075_ = FALSE; + _tmp1071_ = FALSE; } - _tmp1081_ = _tmp1075_; - if (_tmp1081_) { - ValaCCodeIdentifier* _tmp1082_; - ValaCCodeIdentifier* _tmp1083_; - ValaCCodeFunctionCall* _tmp1084_; - ValaCCodeFunctionCall* _tmp1085_; + _tmp1077_ = _tmp1071_; + if (_tmp1077_) { + ValaCCodeIdentifier* _tmp1078_; + ValaCCodeIdentifier* _tmp1079_; + ValaCCodeFunctionCall* _tmp1080_; + ValaCCodeFunctionCall* _tmp1081_; ValaCCodeFunctionCall* type_from_instance_call; - ValaCCodeFunctionCall* _tmp1086_; - ValaCCodeIdentifier* _tmp1087_; - ValaCCodeIdentifier* _tmp1088_; - ValaCCodeIdentifier* _tmp1089_; - ValaCCodeIdentifier* _tmp1090_; - ValaCCodeFunctionCall* _tmp1091_; - ValaCCodeFunctionCall* _tmp1092_; + ValaCCodeFunctionCall* _tmp1082_; + ValaCCodeIdentifier* _tmp1083_; + ValaCCodeIdentifier* _tmp1084_; + ValaCCodeIdentifier* _tmp1085_; + ValaCCodeIdentifier* _tmp1086_; + ValaCCodeFunctionCall* _tmp1087_; + ValaCCodeFunctionCall* _tmp1088_; ValaCCodeFunctionCall* type_name_call; - ValaCCodeFunctionCall* _tmp1093_; - ValaCCodeFunctionCall* _tmp1094_; - ValaMethod* _tmp1095_; - gchar* _tmp1096_ = NULL; - gchar* _tmp1097_; - gchar* _tmp1098_ = NULL; - gchar* _tmp1099_; + ValaCCodeFunctionCall* _tmp1089_; + ValaCCodeFunctionCall* _tmp1090_; + ValaMethod* _tmp1091_; + gchar* _tmp1092_ = NULL; + gchar* _tmp1093_; + gchar* _tmp1094_ = NULL; + gchar* _tmp1095_; gchar* error_string; - ValaCCodeIdentifier* _tmp1100_; - ValaCCodeIdentifier* _tmp1101_; - ValaCCodeFunctionCall* _tmp1102_; - ValaCCodeFunctionCall* _tmp1103_; + ValaCCodeIdentifier* _tmp1096_; + ValaCCodeIdentifier* _tmp1097_; + ValaCCodeFunctionCall* _tmp1098_; + ValaCCodeFunctionCall* _tmp1099_; ValaCCodeFunctionCall* cerrorcall; + ValaCCodeFunctionCall* _tmp1100_; + const gchar* _tmp1101_; + ValaCCodeConstant* _tmp1102_; + ValaCCodeConstant* _tmp1103_; ValaCCodeFunctionCall* _tmp1104_; - const gchar* _tmp1105_; - ValaCCodeConstant* _tmp1106_; - ValaCCodeConstant* _tmp1107_; + ValaCCodeFunctionCall* _tmp1105_; + ValaCCodeFunction* _tmp1106_; + ValaCCodeFunction* _tmp1107_; ValaCCodeFunctionCall* _tmp1108_; - ValaCCodeFunctionCall* _tmp1109_; - ValaCCodeFunction* _tmp1110_; + ValaDataType* _tmp1109_; + ValaCCodeFile* _tmp1110_; ValaCCodeFunction* _tmp1111_; - ValaCCodeFunctionCall* _tmp1112_; - ValaDataType* _tmp1113_; - ValaCCodeFile* _tmp1114_; - ValaCCodeFunction* _tmp1115_; - ValaCCodeFunction* _tmp1116_; - _tmp1082_ = vala_ccode_identifier_new ("G_TYPE_FROM_INSTANCE"); - _tmp1083_ = _tmp1082_; - _tmp1084_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1083_); - _tmp1085_ = _tmp1084_; - _vala_ccode_node_unref0 (_tmp1083_); - type_from_instance_call = _tmp1085_; - _tmp1086_ = type_from_instance_call; - _tmp1087_ = vala_ccode_identifier_new ("self"); + ValaCCodeFunction* _tmp1112_; + _tmp1078_ = vala_ccode_identifier_new ("G_TYPE_FROM_INSTANCE"); + _tmp1079_ = _tmp1078_; + _tmp1080_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1079_); + _tmp1081_ = _tmp1080_; + _vala_ccode_node_unref0 (_tmp1079_); + type_from_instance_call = _tmp1081_; + _tmp1082_ = type_from_instance_call; + _tmp1083_ = vala_ccode_identifier_new ("self"); + _tmp1084_ = _tmp1083_; + vala_ccode_function_call_add_argument (_tmp1082_, (ValaCCodeExpression*) _tmp1084_); + _vala_ccode_node_unref0 (_tmp1084_); + _tmp1085_ = vala_ccode_identifier_new ("g_type_name"); + _tmp1086_ = _tmp1085_; + _tmp1087_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1086_); _tmp1088_ = _tmp1087_; - vala_ccode_function_call_add_argument (_tmp1086_, (ValaCCodeExpression*) _tmp1088_); - _vala_ccode_node_unref0 (_tmp1088_); - _tmp1089_ = vala_ccode_identifier_new ("g_type_name"); - _tmp1090_ = _tmp1089_; - _tmp1091_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1090_); - _tmp1092_ = _tmp1091_; - _vala_ccode_node_unref0 (_tmp1090_); - type_name_call = _tmp1092_; - _tmp1093_ = type_name_call; - _tmp1094_ = type_from_instance_call; - vala_ccode_function_call_add_argument (_tmp1093_, (ValaCCodeExpression*) _tmp1094_); - _tmp1095_ = m; - _tmp1096_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp1095_); + _vala_ccode_node_unref0 (_tmp1086_); + type_name_call = _tmp1088_; + _tmp1089_ = type_name_call; + _tmp1090_ = type_from_instance_call; + vala_ccode_function_call_add_argument (_tmp1089_, (ValaCCodeExpression*) _tmp1090_); + _tmp1091_ = m; + _tmp1092_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp1091_); + _tmp1093_ = _tmp1092_; + _tmp1094_ = g_strdup_printf ("\"Type `%%s' does not implement abstract method `%s'\"", _tmp1093_); + _tmp1095_ = _tmp1094_; + _g_free0 (_tmp1093_); + error_string = _tmp1095_; + _tmp1096_ = vala_ccode_identifier_new ("g_critical"); _tmp1097_ = _tmp1096_; - _tmp1098_ = g_strdup_printf ("\"Type `%%s' does not implement abstract method `%s'\"", _tmp1097_); + _tmp1098_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1097_); _tmp1099_ = _tmp1098_; - _g_free0 (_tmp1097_); - error_string = _tmp1099_; - _tmp1100_ = vala_ccode_identifier_new ("g_critical"); - _tmp1101_ = _tmp1100_; - _tmp1102_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1101_); + _vala_ccode_node_unref0 (_tmp1097_); + cerrorcall = _tmp1099_; + _tmp1100_ = cerrorcall; + _tmp1101_ = error_string; + _tmp1102_ = vala_ccode_constant_new (_tmp1101_); _tmp1103_ = _tmp1102_; - _vala_ccode_node_unref0 (_tmp1101_); - cerrorcall = _tmp1103_; + vala_ccode_function_call_add_argument (_tmp1100_, (ValaCCodeExpression*) _tmp1103_); + _vala_ccode_node_unref0 (_tmp1103_); _tmp1104_ = cerrorcall; - _tmp1105_ = error_string; - _tmp1106_ = vala_ccode_constant_new (_tmp1105_); + _tmp1105_ = type_name_call; + vala_ccode_function_call_add_argument (_tmp1104_, (ValaCCodeExpression*) _tmp1105_); + _tmp1106_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); _tmp1107_ = _tmp1106_; - vala_ccode_function_call_add_argument (_tmp1104_, (ValaCCodeExpression*) _tmp1107_); - _vala_ccode_node_unref0 (_tmp1107_); _tmp1108_ = cerrorcall; - _tmp1109_ = type_name_call; - vala_ccode_function_call_add_argument (_tmp1108_, (ValaCCodeExpression*) _tmp1109_); - _tmp1110_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1111_ = _tmp1110_; - _tmp1112_ = cerrorcall; - vala_ccode_function_add_expression (_tmp1111_, (ValaCCodeExpression*) _tmp1112_); - _tmp1113_ = creturn_type; - vala_ccode_base_module_return_default_value ((ValaCCodeBaseModule*) self, _tmp1113_); - _tmp1114_ = ((ValaCCodeBaseModule*) self)->cfile; - _tmp1115_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1116_ = _tmp1115_; - vala_ccode_file_add_function (_tmp1114_, _tmp1116_); + vala_ccode_function_add_expression (_tmp1107_, (ValaCCodeExpression*) _tmp1108_); + _tmp1109_ = creturn_type; + vala_ccode_base_module_return_default_value ((ValaCCodeBaseModule*) self, _tmp1109_); + _tmp1110_ = ((ValaCCodeBaseModule*) self)->cfile; + _tmp1111_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1112_ = _tmp1111_; + vala_ccode_file_add_function (_tmp1110_, _tmp1112_); _vala_ccode_node_unref0 (cerrorcall); _g_free0 (error_string); _vala_ccode_node_unref0 (type_name_call); _vala_ccode_node_unref0 (type_from_instance_call); } vala_ccode_base_module_pop_context ((ValaCCodeBaseModule*) self); - _tmp1120_ = m; - _tmp1121_ = vala_method_get_is_abstract (_tmp1120_); - _tmp1122_ = _tmp1121_; - if (_tmp1122_) { - _tmp1119_ = TRUE; + _tmp1116_ = m; + _tmp1117_ = vala_method_get_is_abstract (_tmp1116_); + _tmp1118_ = _tmp1117_; + if (_tmp1118_) { + _tmp1115_ = TRUE; } else { + ValaMethod* _tmp1119_; + gboolean _tmp1120_; + gboolean _tmp1121_; + _tmp1119_ = m; + _tmp1120_ = vala_method_get_is_virtual (_tmp1119_); + _tmp1121_ = _tmp1120_; + _tmp1115_ = _tmp1121_; + } + _tmp1122_ = _tmp1115_; + if (_tmp1122_) { ValaMethod* _tmp1123_; gboolean _tmp1124_; gboolean _tmp1125_; _tmp1123_ = m; - _tmp1124_ = vala_method_get_is_virtual (_tmp1123_); + _tmp1124_ = vala_method_get_coroutine (_tmp1123_); _tmp1125_ = _tmp1124_; - _tmp1119_ = _tmp1125_; + _tmp1114_ = !_tmp1125_; + } else { + _tmp1114_ = FALSE; } - _tmp1126_ = _tmp1119_; + _tmp1126_ = _tmp1114_; if (_tmp1126_) { ValaMethod* _tmp1127_; - gboolean _tmp1128_; - gboolean _tmp1129_; + ValaSignal* _tmp1128_; + ValaSignal* _tmp1129_; _tmp1127_ = m; - _tmp1128_ = vala_method_get_coroutine (_tmp1127_); + _tmp1128_ = vala_method_get_signal_reference (_tmp1127_); _tmp1129_ = _tmp1128_; - _tmp1118_ = !_tmp1129_; + _tmp1113_ = _tmp1129_ == NULL; } else { - _tmp1118_ = FALSE; + _tmp1113_ = FALSE; } - _tmp1130_ = _tmp1118_; + _tmp1130_ = _tmp1113_; if (_tmp1130_) { - ValaMethod* _tmp1131_; - ValaSignal* _tmp1132_; - ValaSignal* _tmp1133_; - _tmp1131_ = m; - _tmp1132_ = vala_method_get_signal_reference (_tmp1131_); - _tmp1133_ = _tmp1132_; - _tmp1117_ = _tmp1133_ == NULL; - } else { - _tmp1117_ = FALSE; - } - _tmp1134_ = _tmp1117_; - if (_tmp1134_) { + GHashFunc _tmp1131_; + GEqualFunc _tmp1132_; + GEqualFunc _tmp1133_; + ValaHashMap* _tmp1134_; GHashFunc _tmp1135_; GEqualFunc _tmp1136_; GEqualFunc _tmp1137_; ValaHashMap* _tmp1138_; - GHashFunc _tmp1139_; - GEqualFunc _tmp1140_; - GEqualFunc _tmp1141_; - ValaHashMap* _tmp1142_; ValaHashMap* carg_map; - ValaMethod* _tmp1143_; - ValaDataType* _tmp1144_; - ValaHashMap* _tmp1145_; - ValaHashMap* _tmp1146_; + ValaMethod* _tmp1139_; + ValaDataType* _tmp1140_; + ValaHashMap* _tmp1141_; + ValaHashMap* _tmp1142_; + _tmp1131_ = g_direct_hash; + _tmp1132_ = g_direct_equal; + _tmp1133_ = g_direct_equal; + _tmp1134_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_PARAMETER, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp1131_, _tmp1132_, _tmp1133_); + _vala_map_unref0 (cparam_map); + cparam_map = _tmp1134_; _tmp1135_ = g_direct_hash; _tmp1136_ = g_direct_equal; _tmp1137_ = g_direct_equal; - _tmp1138_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_PARAMETER, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp1135_, _tmp1136_, _tmp1137_); - _vala_map_unref0 (cparam_map); - cparam_map = _tmp1138_; - _tmp1139_ = g_direct_hash; - _tmp1140_ = g_direct_equal; - _tmp1141_ = g_direct_equal; - _tmp1142_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_EXPRESSION, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp1139_, _tmp1140_, _tmp1141_); - carg_map = _tmp1142_; - _tmp1143_ = m; - _tmp1144_ = creturn_type; - _tmp1145_ = cparam_map; - _tmp1146_ = carg_map; - vala_ccode_method_module_generate_vfunc (self, _tmp1143_, _tmp1144_, (ValaMap*) _tmp1145_, (ValaMap*) _tmp1146_, "", 3); + _tmp1138_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_EXPRESSION, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp1135_, _tmp1136_, _tmp1137_); + carg_map = _tmp1138_; + _tmp1139_ = m; + _tmp1140_ = creturn_type; + _tmp1141_ = cparam_map; + _tmp1142_ = carg_map; + vala_ccode_method_module_generate_vfunc (self, _tmp1139_, _tmp1140_, (ValaMap*) _tmp1141_, (ValaMap*) _tmp1142_, "", 3); _vala_map_unref0 (carg_map); } - _tmp1147_ = m; - _tmp1148_ = vala_method_get_entry_point (_tmp1147_); - _tmp1149_ = _tmp1148_; - if (_tmp1149_) { - ValaCCodeFunction* _tmp1150_; + _tmp1143_ = m; + _tmp1144_ = vala_method_get_entry_point (_tmp1143_); + _tmp1145_ = _tmp1144_; + if (_tmp1145_) { + ValaCCodeFunction* _tmp1146_; ValaCCodeFunction* cmain; + ValaCCodeFunction* _tmp1147_; + ValaCCodeFunction* _tmp1148_; + ValaCCodeLineDirective* _tmp1149_; + ValaCCodeLineDirective* _tmp1150_; ValaCCodeFunction* _tmp1151_; - ValaCCodeFunction* _tmp1152_; - ValaCCodeLineDirective* _tmp1153_; - ValaCCodeLineDirective* _tmp1154_; - ValaCCodeFunction* _tmp1155_; + ValaCCodeParameter* _tmp1152_; + ValaCCodeParameter* _tmp1153_; + ValaCCodeFunction* _tmp1154_; + ValaCCodeParameter* _tmp1155_; ValaCCodeParameter* _tmp1156_; - ValaCCodeParameter* _tmp1157_; - ValaCCodeFunction* _tmp1158_; - ValaCCodeParameter* _tmp1159_; - ValaCCodeParameter* _tmp1160_; - ValaCCodeFunction* _tmp1161_; - ValaCodeContext* _tmp1162_; - ValaCodeContext* _tmp1163_; - ValaProfile _tmp1164_; - ValaProfile _tmp1165_; - ValaCCodeFunction* _tmp1208_; - const gchar* _tmp1209_; - const gchar* _tmp1210_; - ValaCCodeIdentifier* _tmp1211_; - ValaCCodeIdentifier* _tmp1212_; - ValaCCodeFunctionCall* _tmp1213_; - ValaCCodeFunctionCall* _tmp1214_; + ValaCCodeFunction* _tmp1157_; + ValaCodeContext* _tmp1158_; + ValaCodeContext* _tmp1159_; + ValaProfile _tmp1160_; + ValaProfile _tmp1161_; + ValaCCodeFunction* _tmp1204_; + const gchar* _tmp1205_; + const gchar* _tmp1206_; + ValaCCodeIdentifier* _tmp1207_; + ValaCCodeIdentifier* _tmp1208_; + ValaCCodeFunctionCall* _tmp1209_; + ValaCCodeFunctionCall* _tmp1210_; ValaCCodeFunctionCall* main_call; - ValaMethod* _tmp1215_; - ValaList* _tmp1216_ = NULL; - ValaList* _tmp1217_; - gint _tmp1218_; - gint _tmp1219_; - gboolean _tmp1220_; - ValaMethod* _tmp1227_; - ValaDataType* _tmp1228_; - ValaDataType* _tmp1229_; - ValaCCodeFile* _tmp1240_; - ValaCCodeFunction* _tmp1241_; - _tmp1150_ = vala_ccode_function_new ("main", "int"); - cmain = _tmp1150_; + ValaMethod* _tmp1211_; + ValaList* _tmp1212_ = NULL; + ValaList* _tmp1213_; + gint _tmp1214_; + gint _tmp1215_; + gboolean _tmp1216_; + ValaMethod* _tmp1223_; + ValaDataType* _tmp1224_; + ValaDataType* _tmp1225_; + ValaCCodeFile* _tmp1236_; + ValaCCodeFunction* _tmp1237_; + _tmp1146_ = vala_ccode_function_new ("main", "int"); + cmain = _tmp1146_; + _tmp1147_ = cmain; + _tmp1148_ = function; + _tmp1149_ = vala_ccode_node_get_line ((ValaCCodeNode*) _tmp1148_); + _tmp1150_ = _tmp1149_; + vala_ccode_node_set_line ((ValaCCodeNode*) _tmp1147_, _tmp1150_); _tmp1151_ = cmain; - _tmp1152_ = function; - _tmp1153_ = vala_ccode_node_get_line ((ValaCCodeNode*) _tmp1152_); - _tmp1154_ = _tmp1153_; - vala_ccode_node_set_line ((ValaCCodeNode*) _tmp1151_, _tmp1154_); - _tmp1155_ = cmain; - _tmp1156_ = vala_ccode_parameter_new ("argc", "int"); - _tmp1157_ = _tmp1156_; - vala_ccode_function_add_parameter (_tmp1155_, _tmp1157_); - _vala_ccode_node_unref0 (_tmp1157_); - _tmp1158_ = cmain; - _tmp1159_ = vala_ccode_parameter_new ("argv", "char **"); - _tmp1160_ = _tmp1159_; - vala_ccode_function_add_parameter (_tmp1158_, _tmp1160_); - _vala_ccode_node_unref0 (_tmp1160_); - _tmp1161_ = cmain; - vala_ccode_base_module_push_function ((ValaCCodeBaseModule*) self, _tmp1161_); - _tmp1162_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp1163_ = _tmp1162_; - _tmp1164_ = vala_code_context_get_profile (_tmp1163_); - _tmp1165_ = _tmp1164_; - if (_tmp1165_ == VALA_PROFILE_GOBJECT) { - ValaCodeContext* _tmp1166_; - ValaCodeContext* _tmp1167_; - gboolean _tmp1168_; - gboolean _tmp1169_; - ValaCodeContext* _tmp1184_; - ValaCodeContext* _tmp1185_; - gboolean _tmp1186_; - gboolean _tmp1187_; - ValaCCodeFunction* _tmp1202_; - ValaCCodeFunction* _tmp1203_; - ValaCCodeIdentifier* _tmp1204_; - ValaCCodeIdentifier* _tmp1205_; - ValaCCodeFunctionCall* _tmp1206_; - ValaCCodeFunctionCall* _tmp1207_; - _tmp1166_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp1167_ = _tmp1166_; - _tmp1168_ = vala_code_context_get_mem_profiler (_tmp1167_); - _tmp1169_ = _tmp1168_; - if (_tmp1169_) { - ValaCCodeIdentifier* _tmp1170_; - ValaCCodeIdentifier* _tmp1171_; - ValaCCodeFunctionCall* _tmp1172_; - ValaCCodeFunctionCall* _tmp1173_; + _tmp1152_ = vala_ccode_parameter_new ("argc", "int"); + _tmp1153_ = _tmp1152_; + vala_ccode_function_add_parameter (_tmp1151_, _tmp1153_); + _vala_ccode_node_unref0 (_tmp1153_); + _tmp1154_ = cmain; + _tmp1155_ = vala_ccode_parameter_new ("argv", "char **"); + _tmp1156_ = _tmp1155_; + vala_ccode_function_add_parameter (_tmp1154_, _tmp1156_); + _vala_ccode_node_unref0 (_tmp1156_); + _tmp1157_ = cmain; + vala_ccode_base_module_push_function ((ValaCCodeBaseModule*) self, _tmp1157_); + _tmp1158_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp1159_ = _tmp1158_; + _tmp1160_ = vala_code_context_get_profile (_tmp1159_); + _tmp1161_ = _tmp1160_; + if (_tmp1161_ == VALA_PROFILE_GOBJECT) { + ValaCodeContext* _tmp1162_; + ValaCodeContext* _tmp1163_; + gboolean _tmp1164_; + gboolean _tmp1165_; + ValaCodeContext* _tmp1180_; + ValaCodeContext* _tmp1181_; + gboolean _tmp1182_; + gboolean _tmp1183_; + ValaCCodeFunction* _tmp1198_; + ValaCCodeFunction* _tmp1199_; + ValaCCodeIdentifier* _tmp1200_; + ValaCCodeIdentifier* _tmp1201_; + ValaCCodeFunctionCall* _tmp1202_; + ValaCCodeFunctionCall* _tmp1203_; + _tmp1162_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp1163_ = _tmp1162_; + _tmp1164_ = vala_code_context_get_mem_profiler (_tmp1163_); + _tmp1165_ = _tmp1164_; + if (_tmp1165_) { + ValaCCodeIdentifier* _tmp1166_; + ValaCCodeIdentifier* _tmp1167_; + ValaCCodeFunctionCall* _tmp1168_; + ValaCCodeFunctionCall* _tmp1169_; ValaCCodeFunctionCall* mem_profiler_init_call; + ValaCCodeFunctionCall* _tmp1170_; + ValaCCodeFunction* _tmp1171_; + ValaCCodeLineDirective* _tmp1172_; + ValaCCodeLineDirective* _tmp1173_; ValaCCodeFunctionCall* _tmp1174_; - ValaCCodeFunction* _tmp1175_; - ValaCCodeLineDirective* _tmp1176_; - ValaCCodeLineDirective* _tmp1177_; - ValaCCodeFunctionCall* _tmp1178_; - ValaCCodeConstant* _tmp1179_; - ValaCCodeConstant* _tmp1180_; - ValaCCodeFunction* _tmp1181_; - ValaCCodeFunction* _tmp1182_; - ValaCCodeFunctionCall* _tmp1183_; - _tmp1170_ = vala_ccode_identifier_new ("g_mem_set_vtable"); - _tmp1171_ = _tmp1170_; - _tmp1172_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1171_); + ValaCCodeConstant* _tmp1175_; + ValaCCodeConstant* _tmp1176_; + ValaCCodeFunction* _tmp1177_; + ValaCCodeFunction* _tmp1178_; + ValaCCodeFunctionCall* _tmp1179_; + _tmp1166_ = vala_ccode_identifier_new ("g_mem_set_vtable"); + _tmp1167_ = _tmp1166_; + _tmp1168_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1167_); + _tmp1169_ = _tmp1168_; + _vala_ccode_node_unref0 (_tmp1167_); + mem_profiler_init_call = _tmp1169_; + _tmp1170_ = mem_profiler_init_call; + _tmp1171_ = cmain; + _tmp1172_ = vala_ccode_node_get_line ((ValaCCodeNode*) _tmp1171_); _tmp1173_ = _tmp1172_; - _vala_ccode_node_unref0 (_tmp1171_); - mem_profiler_init_call = _tmp1173_; + vala_ccode_node_set_line ((ValaCCodeNode*) _tmp1170_, _tmp1173_); _tmp1174_ = mem_profiler_init_call; - _tmp1175_ = cmain; - _tmp1176_ = vala_ccode_node_get_line ((ValaCCodeNode*) _tmp1175_); - _tmp1177_ = _tmp1176_; - vala_ccode_node_set_line ((ValaCCodeNode*) _tmp1174_, _tmp1177_); - _tmp1178_ = mem_profiler_init_call; - _tmp1179_ = vala_ccode_constant_new ("glib_mem_profiler_table"); - _tmp1180_ = _tmp1179_; - vala_ccode_function_call_add_argument (_tmp1178_, (ValaCCodeExpression*) _tmp1180_); - _vala_ccode_node_unref0 (_tmp1180_); - _tmp1181_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1182_ = _tmp1181_; - _tmp1183_ = mem_profiler_init_call; - vala_ccode_function_add_expression (_tmp1182_, (ValaCCodeExpression*) _tmp1183_); + _tmp1175_ = vala_ccode_constant_new ("glib_mem_profiler_table"); + _tmp1176_ = _tmp1175_; + vala_ccode_function_call_add_argument (_tmp1174_, (ValaCCodeExpression*) _tmp1176_); + _vala_ccode_node_unref0 (_tmp1176_); + _tmp1177_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1178_ = _tmp1177_; + _tmp1179_ = mem_profiler_init_call; + vala_ccode_function_add_expression (_tmp1178_, (ValaCCodeExpression*) _tmp1179_); _vala_ccode_node_unref0 (mem_profiler_init_call); } - _tmp1184_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp1185_ = _tmp1184_; - _tmp1186_ = vala_code_context_get_thread (_tmp1185_); - _tmp1187_ = _tmp1186_; - if (_tmp1187_) { - ValaCCodeIdentifier* _tmp1188_; - ValaCCodeIdentifier* _tmp1189_; - ValaCCodeFunctionCall* _tmp1190_; - ValaCCodeFunctionCall* _tmp1191_; + _tmp1180_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp1181_ = _tmp1180_; + _tmp1182_ = vala_code_context_get_thread (_tmp1181_); + _tmp1183_ = _tmp1182_; + if (_tmp1183_) { + ValaCCodeIdentifier* _tmp1184_; + ValaCCodeIdentifier* _tmp1185_; + ValaCCodeFunctionCall* _tmp1186_; + ValaCCodeFunctionCall* _tmp1187_; ValaCCodeFunctionCall* thread_init_call; + ValaCCodeFunctionCall* _tmp1188_; + ValaCCodeFunction* _tmp1189_; + ValaCCodeLineDirective* _tmp1190_; + ValaCCodeLineDirective* _tmp1191_; ValaCCodeFunctionCall* _tmp1192_; - ValaCCodeFunction* _tmp1193_; - ValaCCodeLineDirective* _tmp1194_; - ValaCCodeLineDirective* _tmp1195_; - ValaCCodeFunctionCall* _tmp1196_; - ValaCCodeConstant* _tmp1197_; - ValaCCodeConstant* _tmp1198_; - ValaCCodeFunction* _tmp1199_; - ValaCCodeFunction* _tmp1200_; - ValaCCodeFunctionCall* _tmp1201_; - _tmp1188_ = vala_ccode_identifier_new ("g_thread_init"); - _tmp1189_ = _tmp1188_; - _tmp1190_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1189_); + ValaCCodeConstant* _tmp1193_; + ValaCCodeConstant* _tmp1194_; + ValaCCodeFunction* _tmp1195_; + ValaCCodeFunction* _tmp1196_; + ValaCCodeFunctionCall* _tmp1197_; + _tmp1184_ = vala_ccode_identifier_new ("g_thread_init"); + _tmp1185_ = _tmp1184_; + _tmp1186_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1185_); + _tmp1187_ = _tmp1186_; + _vala_ccode_node_unref0 (_tmp1185_); + thread_init_call = _tmp1187_; + _tmp1188_ = thread_init_call; + _tmp1189_ = cmain; + _tmp1190_ = vala_ccode_node_get_line ((ValaCCodeNode*) _tmp1189_); _tmp1191_ = _tmp1190_; - _vala_ccode_node_unref0 (_tmp1189_); - thread_init_call = _tmp1191_; + vala_ccode_node_set_line ((ValaCCodeNode*) _tmp1188_, _tmp1191_); _tmp1192_ = thread_init_call; - _tmp1193_ = cmain; - _tmp1194_ = vala_ccode_node_get_line ((ValaCCodeNode*) _tmp1193_); - _tmp1195_ = _tmp1194_; - vala_ccode_node_set_line ((ValaCCodeNode*) _tmp1192_, _tmp1195_); - _tmp1196_ = thread_init_call; - _tmp1197_ = vala_ccode_constant_new ("NULL"); - _tmp1198_ = _tmp1197_; - vala_ccode_function_call_add_argument (_tmp1196_, (ValaCCodeExpression*) _tmp1198_); - _vala_ccode_node_unref0 (_tmp1198_); - _tmp1199_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1200_ = _tmp1199_; - _tmp1201_ = thread_init_call; - vala_ccode_function_add_expression (_tmp1200_, (ValaCCodeExpression*) _tmp1201_); + _tmp1193_ = vala_ccode_constant_new ("NULL"); + _tmp1194_ = _tmp1193_; + vala_ccode_function_call_add_argument (_tmp1192_, (ValaCCodeExpression*) _tmp1194_); + _vala_ccode_node_unref0 (_tmp1194_); + _tmp1195_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1196_ = _tmp1195_; + _tmp1197_ = thread_init_call; + vala_ccode_function_add_expression (_tmp1196_, (ValaCCodeExpression*) _tmp1197_); _vala_ccode_node_unref0 (thread_init_call); } - _tmp1202_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1198_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1199_ = _tmp1198_; + _tmp1200_ = vala_ccode_identifier_new ("g_type_init"); + _tmp1201_ = _tmp1200_; + _tmp1202_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1201_); _tmp1203_ = _tmp1202_; - _tmp1204_ = vala_ccode_identifier_new ("g_type_init"); - _tmp1205_ = _tmp1204_; - _tmp1206_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1205_); - _tmp1207_ = _tmp1206_; - vala_ccode_function_add_expression (_tmp1203_, (ValaCCodeExpression*) _tmp1207_); - _vala_ccode_node_unref0 (_tmp1207_); - _vala_ccode_node_unref0 (_tmp1205_); - } - _tmp1208_ = function; - _tmp1209_ = vala_ccode_function_get_name (_tmp1208_); + vala_ccode_function_add_expression (_tmp1199_, (ValaCCodeExpression*) _tmp1203_); + _vala_ccode_node_unref0 (_tmp1203_); + _vala_ccode_node_unref0 (_tmp1201_); + } + _tmp1204_ = function; + _tmp1205_ = vala_ccode_function_get_name (_tmp1204_); + _tmp1206_ = _tmp1205_; + _tmp1207_ = vala_ccode_identifier_new (_tmp1206_); + _tmp1208_ = _tmp1207_; + _tmp1209_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1208_); _tmp1210_ = _tmp1209_; - _tmp1211_ = vala_ccode_identifier_new (_tmp1210_); - _tmp1212_ = _tmp1211_; - _tmp1213_ = vala_ccode_function_call_new ((ValaCCodeExpression*) _tmp1212_); - _tmp1214_ = _tmp1213_; - _vala_ccode_node_unref0 (_tmp1212_); - main_call = _tmp1214_; - _tmp1215_ = m; - _tmp1216_ = vala_method_get_parameters (_tmp1215_); - _tmp1217_ = _tmp1216_; - _tmp1218_ = vala_collection_get_size ((ValaCollection*) _tmp1217_); - _tmp1219_ = _tmp1218_; - _tmp1220_ = _tmp1219_ == 1; - _vala_iterable_unref0 (_tmp1217_); - if (_tmp1220_) { - ValaCCodeFunctionCall* _tmp1221_; + _vala_ccode_node_unref0 (_tmp1208_); + main_call = _tmp1210_; + _tmp1211_ = m; + _tmp1212_ = vala_method_get_parameters (_tmp1211_); + _tmp1213_ = _tmp1212_; + _tmp1214_ = vala_collection_get_size ((ValaCollection*) _tmp1213_); + _tmp1215_ = _tmp1214_; + _tmp1216_ = _tmp1215_ == 1; + _vala_iterable_unref0 (_tmp1213_); + if (_tmp1216_) { + ValaCCodeFunctionCall* _tmp1217_; + ValaCCodeIdentifier* _tmp1218_; + ValaCCodeIdentifier* _tmp1219_; + ValaCCodeFunctionCall* _tmp1220_; + ValaCCodeIdentifier* _tmp1221_; ValaCCodeIdentifier* _tmp1222_; - ValaCCodeIdentifier* _tmp1223_; - ValaCCodeFunctionCall* _tmp1224_; - ValaCCodeIdentifier* _tmp1225_; - ValaCCodeIdentifier* _tmp1226_; - _tmp1221_ = main_call; - _tmp1222_ = vala_ccode_identifier_new ("argv"); - _tmp1223_ = _tmp1222_; - vala_ccode_function_call_add_argument (_tmp1221_, (ValaCCodeExpression*) _tmp1223_); - _vala_ccode_node_unref0 (_tmp1223_); - _tmp1224_ = main_call; - _tmp1225_ = vala_ccode_identifier_new ("argc"); - _tmp1226_ = _tmp1225_; - vala_ccode_function_call_add_argument (_tmp1224_, (ValaCCodeExpression*) _tmp1226_); - _vala_ccode_node_unref0 (_tmp1226_); - } - _tmp1227_ = m; - _tmp1228_ = vala_method_get_return_type (_tmp1227_); - _tmp1229_ = _tmp1228_; - if (VALA_IS_VOID_TYPE (_tmp1229_)) { + _tmp1217_ = main_call; + _tmp1218_ = vala_ccode_identifier_new ("argv"); + _tmp1219_ = _tmp1218_; + vala_ccode_function_call_add_argument (_tmp1217_, (ValaCCodeExpression*) _tmp1219_); + _vala_ccode_node_unref0 (_tmp1219_); + _tmp1220_ = main_call; + _tmp1221_ = vala_ccode_identifier_new ("argc"); + _tmp1222_ = _tmp1221_; + vala_ccode_function_call_add_argument (_tmp1220_, (ValaCCodeExpression*) _tmp1222_); + _vala_ccode_node_unref0 (_tmp1222_); + } + _tmp1223_ = m; + _tmp1224_ = vala_method_get_return_type (_tmp1223_); + _tmp1225_ = _tmp1224_; + if (VALA_IS_VOID_TYPE (_tmp1225_)) { + ValaCCodeFunction* _tmp1226_; + ValaCCodeFunction* _tmp1227_; + ValaCCodeFunctionCall* _tmp1228_; + ValaCCodeFunction* _tmp1229_; ValaCCodeFunction* _tmp1230_; - ValaCCodeFunction* _tmp1231_; - ValaCCodeFunctionCall* _tmp1232_; + ValaCCodeConstant* _tmp1231_; + ValaCCodeConstant* _tmp1232_; + _tmp1226_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1227_ = _tmp1226_; + _tmp1228_ = main_call; + vala_ccode_function_add_expression (_tmp1227_, (ValaCCodeExpression*) _tmp1228_); + _tmp1229_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); + _tmp1230_ = _tmp1229_; + _tmp1231_ = vala_ccode_constant_new ("0"); + _tmp1232_ = _tmp1231_; + vala_ccode_function_add_return (_tmp1230_, (ValaCCodeExpression*) _tmp1232_); + _vala_ccode_node_unref0 (_tmp1232_); + } else { ValaCCodeFunction* _tmp1233_; ValaCCodeFunction* _tmp1234_; - ValaCCodeConstant* _tmp1235_; - ValaCCodeConstant* _tmp1236_; - _tmp1230_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1231_ = _tmp1230_; - _tmp1232_ = main_call; - vala_ccode_function_add_expression (_tmp1231_, (ValaCCodeExpression*) _tmp1232_); + ValaCCodeFunctionCall* _tmp1235_; _tmp1233_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); _tmp1234_ = _tmp1233_; - _tmp1235_ = vala_ccode_constant_new ("0"); - _tmp1236_ = _tmp1235_; - vala_ccode_function_add_return (_tmp1234_, (ValaCCodeExpression*) _tmp1236_); - _vala_ccode_node_unref0 (_tmp1236_); - } else { - ValaCCodeFunction* _tmp1237_; - ValaCCodeFunction* _tmp1238_; - ValaCCodeFunctionCall* _tmp1239_; - _tmp1237_ = vala_ccode_base_module_get_ccode ((ValaCCodeBaseModule*) self); - _tmp1238_ = _tmp1237_; - _tmp1239_ = main_call; - vala_ccode_function_add_return (_tmp1238_, (ValaCCodeExpression*) _tmp1239_); + _tmp1235_ = main_call; + vala_ccode_function_add_return (_tmp1234_, (ValaCCodeExpression*) _tmp1235_); } vala_ccode_base_module_pop_function ((ValaCCodeBaseModule*) self); - _tmp1240_ = ((ValaCCodeBaseModule*) self)->cfile; - _tmp1241_ = cmain; - vala_ccode_file_add_function (_tmp1240_, _tmp1241_); + _tmp1236_ = ((ValaCCodeBaseModule*) self)->cfile; + _tmp1237_ = cmain; + vala_ccode_file_add_function (_tmp1236_, _tmp1237_); _vala_ccode_node_unref0 (main_call); _vala_ccode_node_unref0 (cmain); } diff -Nru vala-0.16-0.15.1/codegen/valaccodemethodmodule.vala vala-0.16-0.15.2/codegen/valaccodemethodmodule.vala --- vala-0.16-0.15.1/codegen/valaccodemethodmodule.vala 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodemethodmodule.vala 2012-02-09 18:32:59.000000000 +0000 @@ -469,7 +469,7 @@ var d = deleg_type.delegate_symbol; if (d.has_target) { // create variable to store delegate target - vardecl = new CCodeVariableDeclarator.zero (get_delegate_target_cname (get_variable_cname ("_vala_" + param.name)), new CCodeConstant ("NULL")); + vardecl = new CCodeVariableDeclarator.zero ("_vala_" + get_ccode_delegate_target_name (param), new CCodeConstant ("NULL")); ccode.add_declaration ("void *", vardecl); if (deleg_type.value_owned) { diff -Nru vala-0.16-0.15.1/codegen/valaccodestructmodule.c vala-0.16-0.15.2/codegen/valaccodestructmodule.c --- vala-0.16-0.15.1/codegen/valaccodestructmodule.c 2012-01-26 21:08:06.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodestructmodule.c 2012-02-25 16:21:59.000000000 +0000 @@ -306,7 +306,7 @@ gchar* vala_ccode_base_module_get_ccode_array_length_name (ValaCodeNode* node); gchar* vala_ccode_base_module_get_array_length_cname (ValaCCodeBaseModule* self, const gchar* array_cname, gint dim); gchar* vala_ccode_base_module_get_array_size_cname (ValaCCodeBaseModule* self, const gchar* array_cname); -gchar* vala_ccode_base_module_get_delegate_target_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); gchar* vala_ccode_base_module_get_delegate_target_destroy_notify_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); gchar* vala_ccode_base_module_get_ccode_dup_function (ValaTypeSymbol* sym); gchar* vala_ccode_base_module_get_ccode_free_function (ValaTypeSymbol* sym); @@ -371,52 +371,52 @@ ValaStruct* _tmp51_; gboolean _tmp52_; gboolean _tmp53_; + ValaStruct* _tmp178_; + ValaStruct* _tmp179_; ValaStruct* _tmp180_; - ValaStruct* _tmp181_; - ValaStruct* _tmp182_; - ValaStruct* _tmp211_; - gchar* _tmp212_ = NULL; - gchar* _tmp213_; - ValaStruct* _tmp214_; - gchar* _tmp215_ = NULL; + ValaStruct* _tmp209_; + gchar* _tmp210_ = NULL; + gchar* _tmp211_; + ValaStruct* _tmp212_; + gchar* _tmp213_ = NULL; + gchar* _tmp214_; + gchar* _tmp215_; gchar* _tmp216_; - gchar* _tmp217_; - gchar* _tmp218_; - ValaCCodeFunction* _tmp219_; - ValaCCodeFunction* _tmp220_; + ValaCCodeFunction* _tmp217_; + ValaCCodeFunction* _tmp218_; ValaCCodeFunction* function; - ValaStruct* _tmp221_; - gboolean _tmp222_ = FALSE; - ValaCCodeFunction* _tmp224_; - ValaStruct* _tmp225_; - gchar* _tmp226_ = NULL; + ValaStruct* _tmp219_; + gboolean _tmp220_ = FALSE; + ValaCCodeFunction* _tmp222_; + ValaStruct* _tmp223_; + gchar* _tmp224_ = NULL; + gchar* _tmp225_; + gchar* _tmp226_; gchar* _tmp227_; gchar* _tmp228_; gchar* _tmp229_; - gchar* _tmp230_; - gchar* _tmp231_; - ValaCCodeParameter* _tmp232_; - ValaCCodeParameter* _tmp233_; - ValaCCodeFile* _tmp234_; - ValaCCodeFunction* _tmp235_; - ValaStruct* _tmp236_; - gchar* _tmp237_ = NULL; - gchar* _tmp238_; - ValaCCodeFunction* _tmp239_; - ValaStruct* _tmp240_; - gboolean _tmp241_ = FALSE; - ValaCCodeFunction* _tmp243_; - ValaStruct* _tmp244_; - gchar* _tmp245_ = NULL; + ValaCCodeParameter* _tmp230_; + ValaCCodeParameter* _tmp231_; + ValaCCodeFile* _tmp232_; + ValaCCodeFunction* _tmp233_; + ValaStruct* _tmp234_; + gchar* _tmp235_ = NULL; + gchar* _tmp236_; + ValaCCodeFunction* _tmp237_; + ValaStruct* _tmp238_; + gboolean _tmp239_ = FALSE; + ValaCCodeFunction* _tmp241_; + ValaStruct* _tmp242_; + gchar* _tmp243_ = NULL; + gchar* _tmp244_; + gchar* _tmp245_; gchar* _tmp246_; - gchar* _tmp247_; - gchar* _tmp248_; - ValaCCodeParameter* _tmp249_; - ValaCCodeParameter* _tmp250_; - ValaCCodeFile* _tmp251_; - ValaCCodeFunction* _tmp252_; - ValaStruct* _tmp253_; - gboolean _tmp254_ = FALSE; + ValaCCodeParameter* _tmp247_; + ValaCCodeParameter* _tmp248_; + ValaCCodeFile* _tmp249_; + ValaCCodeFunction* _tmp250_; + ValaStruct* _tmp251_; + gboolean _tmp252_ = FALSE; self = (ValaCCodeStructModule*) base; g_return_if_fail (st != NULL); g_return_if_fail (decl_space != NULL); @@ -848,39 +848,35 @@ if (_tmp164_) { ValaCCodeStruct* _tmp165_; ValaField* _tmp166_; - const gchar* _tmp167_; - const gchar* _tmp168_; - gchar* _tmp169_ = NULL; - gchar* _tmp170_; - ValaDelegateType* _tmp171_; - gboolean _tmp172_; - gboolean _tmp173_; + gchar* _tmp167_ = NULL; + gchar* _tmp168_; + ValaDelegateType* _tmp169_; + gboolean _tmp170_; + gboolean _tmp171_; _tmp165_ = instance_struct; _tmp166_ = f; - _tmp167_ = vala_symbol_get_name ((ValaSymbol*) _tmp166_); + _tmp167_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp166_); _tmp168_ = _tmp167_; - _tmp169_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp168_); - _tmp170_ = _tmp169_; - vala_ccode_struct_add_field (_tmp165_, "gpointer", _tmp170_, NULL); - _g_free0 (_tmp170_); - _tmp171_ = delegate_type; - _tmp172_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp171_); - _tmp173_ = _tmp172_; - if (_tmp173_) { - ValaCCodeStruct* _tmp174_; - ValaField* _tmp175_; - const gchar* _tmp176_; - const gchar* _tmp177_; - gchar* _tmp178_ = NULL; - gchar* _tmp179_; - _tmp174_ = instance_struct; - _tmp175_ = f; - _tmp176_ = vala_symbol_get_name ((ValaSymbol*) _tmp175_); + vala_ccode_struct_add_field (_tmp165_, "gpointer", _tmp168_, NULL); + _g_free0 (_tmp168_); + _tmp169_ = delegate_type; + _tmp170_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp169_); + _tmp171_ = _tmp170_; + if (_tmp171_) { + ValaCCodeStruct* _tmp172_; + ValaField* _tmp173_; + const gchar* _tmp174_; + const gchar* _tmp175_; + gchar* _tmp176_ = NULL; + gchar* _tmp177_; + _tmp172_ = instance_struct; + _tmp173_ = f; + _tmp174_ = vala_symbol_get_name ((ValaSymbol*) _tmp173_); + _tmp175_ = _tmp174_; + _tmp176_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp175_); _tmp177_ = _tmp176_; - _tmp178_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp177_); - _tmp179_ = _tmp178_; - vala_ccode_struct_add_field (_tmp174_, "GDestroyNotify", _tmp179_, NULL); - _g_free0 (_tmp179_); + vala_ccode_struct_add_field (_tmp172_, "GDestroyNotify", _tmp177_, NULL); + _g_free0 (_tmp177_); } } _vala_code_node_unref0 (delegate_type); @@ -892,266 +888,266 @@ } _vala_iterable_unref0 (_f_list); } - _tmp180_ = st; - _tmp181_ = vala_struct_get_base_struct (_tmp180_); - _tmp182_ = _tmp181_; - if (_tmp182_ == NULL) { - ValaCCodeFile* _tmp183_; - ValaStruct* _tmp184_; + _tmp178_ = st; + _tmp179_ = vala_struct_get_base_struct (_tmp178_); + _tmp180_ = _tmp179_; + if (_tmp180_ == NULL) { + ValaCCodeFile* _tmp181_; + ValaStruct* _tmp182_; + gchar* _tmp183_ = NULL; + gchar* _tmp184_; gchar* _tmp185_ = NULL; gchar* _tmp186_; - gchar* _tmp187_ = NULL; - gchar* _tmp188_; - ValaStruct* _tmp189_; - gchar* _tmp190_ = NULL; - gchar* _tmp191_; - ValaCCodeVariableDeclarator* _tmp192_; - ValaCCodeVariableDeclarator* _tmp193_; - ValaCCodeTypeDefinition* _tmp194_; - ValaCCodeTypeDefinition* _tmp195_; - ValaCCodeFile* _tmp196_; - ValaCCodeStruct* _tmp197_; - _tmp183_ = decl_space; - _tmp184_ = st; - _tmp185_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp184_); + ValaStruct* _tmp187_; + gchar* _tmp188_ = NULL; + gchar* _tmp189_; + ValaCCodeVariableDeclarator* _tmp190_; + ValaCCodeVariableDeclarator* _tmp191_; + ValaCCodeTypeDefinition* _tmp192_; + ValaCCodeTypeDefinition* _tmp193_; + ValaCCodeFile* _tmp194_; + ValaCCodeStruct* _tmp195_; + _tmp181_ = decl_space; + _tmp182_ = st; + _tmp183_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp182_); + _tmp184_ = _tmp183_; + _tmp185_ = g_strdup_printf ("struct _%s", _tmp184_); _tmp186_ = _tmp185_; - _tmp187_ = g_strdup_printf ("struct _%s", _tmp186_); - _tmp188_ = _tmp187_; - _tmp189_ = st; - _tmp190_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp189_); + _tmp187_ = st; + _tmp188_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp187_); + _tmp189_ = _tmp188_; + _tmp190_ = vala_ccode_variable_declarator_new (_tmp189_, NULL, NULL); _tmp191_ = _tmp190_; - _tmp192_ = vala_ccode_variable_declarator_new (_tmp191_, NULL, NULL); + _tmp192_ = vala_ccode_type_definition_new (_tmp186_, (ValaCCodeDeclarator*) _tmp191_); _tmp193_ = _tmp192_; - _tmp194_ = vala_ccode_type_definition_new (_tmp188_, (ValaCCodeDeclarator*) _tmp193_); - _tmp195_ = _tmp194_; - vala_ccode_file_add_type_declaration (_tmp183_, (ValaCCodeNode*) _tmp195_); - _vala_ccode_node_unref0 (_tmp195_); + vala_ccode_file_add_type_declaration (_tmp181_, (ValaCCodeNode*) _tmp193_); _vala_ccode_node_unref0 (_tmp193_); - _g_free0 (_tmp191_); - _g_free0 (_tmp188_); + _vala_ccode_node_unref0 (_tmp191_); + _g_free0 (_tmp189_); _g_free0 (_tmp186_); - _tmp196_ = decl_space; - _tmp197_ = instance_struct; - vala_ccode_file_add_type_definition (_tmp196_, (ValaCCodeNode*) _tmp197_); + _g_free0 (_tmp184_); + _tmp194_ = decl_space; + _tmp195_ = instance_struct; + vala_ccode_file_add_type_definition (_tmp194_, (ValaCCodeNode*) _tmp195_); } else { - ValaCCodeFile* _tmp198_; + ValaCCodeFile* _tmp196_; + ValaStruct* _tmp197_; + ValaStruct* _tmp198_; ValaStruct* _tmp199_; - ValaStruct* _tmp200_; - ValaStruct* _tmp201_; - gchar* _tmp202_ = NULL; - gchar* _tmp203_; - ValaStruct* _tmp204_; - gchar* _tmp205_ = NULL; - gchar* _tmp206_; - ValaCCodeVariableDeclarator* _tmp207_; - ValaCCodeVariableDeclarator* _tmp208_; - ValaCCodeTypeDefinition* _tmp209_; - ValaCCodeTypeDefinition* _tmp210_; - _tmp198_ = decl_space; - _tmp199_ = st; - _tmp200_ = vala_struct_get_base_struct (_tmp199_); + gchar* _tmp200_ = NULL; + gchar* _tmp201_; + ValaStruct* _tmp202_; + gchar* _tmp203_ = NULL; + gchar* _tmp204_; + ValaCCodeVariableDeclarator* _tmp205_; + ValaCCodeVariableDeclarator* _tmp206_; + ValaCCodeTypeDefinition* _tmp207_; + ValaCCodeTypeDefinition* _tmp208_; + _tmp196_ = decl_space; + _tmp197_ = st; + _tmp198_ = vala_struct_get_base_struct (_tmp197_); + _tmp199_ = _tmp198_; + _tmp200_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp199_); _tmp201_ = _tmp200_; - _tmp202_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp201_); - _tmp203_ = _tmp202_; - _tmp204_ = st; - _tmp205_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp204_); + _tmp202_ = st; + _tmp203_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp202_); + _tmp204_ = _tmp203_; + _tmp205_ = vala_ccode_variable_declarator_new (_tmp204_, NULL, NULL); _tmp206_ = _tmp205_; - _tmp207_ = vala_ccode_variable_declarator_new (_tmp206_, NULL, NULL); + _tmp207_ = vala_ccode_type_definition_new (_tmp201_, (ValaCCodeDeclarator*) _tmp206_); _tmp208_ = _tmp207_; - _tmp209_ = vala_ccode_type_definition_new (_tmp203_, (ValaCCodeDeclarator*) _tmp208_); - _tmp210_ = _tmp209_; - vala_ccode_file_add_type_declaration (_tmp198_, (ValaCCodeNode*) _tmp210_); - _vala_ccode_node_unref0 (_tmp210_); + vala_ccode_file_add_type_declaration (_tmp196_, (ValaCCodeNode*) _tmp208_); _vala_ccode_node_unref0 (_tmp208_); - _g_free0 (_tmp206_); - _g_free0 (_tmp203_); - } - _tmp211_ = st; - _tmp212_ = vala_ccode_base_module_get_ccode_dup_function ((ValaTypeSymbol*) _tmp211_); - _tmp213_ = _tmp212_; - _tmp214_ = st; - _tmp215_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp214_); + _vala_ccode_node_unref0 (_tmp206_); + _g_free0 (_tmp204_); + _g_free0 (_tmp201_); + } + _tmp209_ = st; + _tmp210_ = vala_ccode_base_module_get_ccode_dup_function ((ValaTypeSymbol*) _tmp209_); + _tmp211_ = _tmp210_; + _tmp212_ = st; + _tmp213_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp212_); + _tmp214_ = _tmp213_; + _tmp215_ = g_strconcat (_tmp214_, "*", NULL); _tmp216_ = _tmp215_; - _tmp217_ = g_strconcat (_tmp216_, "*", NULL); + _tmp217_ = vala_ccode_function_new (_tmp211_, _tmp216_); _tmp218_ = _tmp217_; - _tmp219_ = vala_ccode_function_new (_tmp213_, _tmp218_); - _tmp220_ = _tmp219_; - _g_free0 (_tmp218_); _g_free0 (_tmp216_); - _g_free0 (_tmp213_); - function = _tmp220_; - _tmp221_ = st; - _tmp222_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp221_); - if (_tmp222_) { - ValaCCodeFunction* _tmp223_; - _tmp223_ = function; - vala_ccode_function_set_modifiers (_tmp223_, VALA_CCODE_MODIFIERS_STATIC); - } - _tmp224_ = function; - _tmp225_ = st; - _tmp226_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp225_); + _g_free0 (_tmp214_); + _g_free0 (_tmp211_); + function = _tmp218_; + _tmp219_ = st; + _tmp220_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp219_); + if (_tmp220_) { + ValaCCodeFunction* _tmp221_; + _tmp221_ = function; + vala_ccode_function_set_modifiers (_tmp221_, VALA_CCODE_MODIFIERS_STATIC); + } + _tmp222_ = function; + _tmp223_ = st; + _tmp224_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp223_); + _tmp225_ = _tmp224_; + _tmp226_ = g_strconcat ("const ", _tmp225_, NULL); _tmp227_ = _tmp226_; - _tmp228_ = g_strconcat ("const ", _tmp227_, NULL); + _tmp228_ = g_strconcat (_tmp227_, "*", NULL); _tmp229_ = _tmp228_; - _tmp230_ = g_strconcat (_tmp229_, "*", NULL); + _tmp230_ = vala_ccode_parameter_new ("self", _tmp229_); _tmp231_ = _tmp230_; - _tmp232_ = vala_ccode_parameter_new ("self", _tmp231_); - _tmp233_ = _tmp232_; - vala_ccode_function_add_parameter (_tmp224_, _tmp233_); - _vala_ccode_node_unref0 (_tmp233_); - _g_free0 (_tmp231_); + vala_ccode_function_add_parameter (_tmp222_, _tmp231_); + _vala_ccode_node_unref0 (_tmp231_); _g_free0 (_tmp229_); _g_free0 (_tmp227_); - _tmp234_ = decl_space; - _tmp235_ = function; - vala_ccode_file_add_function_declaration (_tmp234_, _tmp235_); - _tmp236_ = st; - _tmp237_ = vala_ccode_base_module_get_ccode_free_function ((ValaTypeSymbol*) _tmp236_); - _tmp238_ = _tmp237_; - _tmp239_ = vala_ccode_function_new (_tmp238_, "void"); + _g_free0 (_tmp225_); + _tmp232_ = decl_space; + _tmp233_ = function; + vala_ccode_file_add_function_declaration (_tmp232_, _tmp233_); + _tmp234_ = st; + _tmp235_ = vala_ccode_base_module_get_ccode_free_function ((ValaTypeSymbol*) _tmp234_); + _tmp236_ = _tmp235_; + _tmp237_ = vala_ccode_function_new (_tmp236_, "void"); _vala_ccode_node_unref0 (function); - function = _tmp239_; - _g_free0 (_tmp238_); - _tmp240_ = st; - _tmp241_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp240_); - if (_tmp241_) { - ValaCCodeFunction* _tmp242_; - _tmp242_ = function; - vala_ccode_function_set_modifiers (_tmp242_, VALA_CCODE_MODIFIERS_STATIC); - } - _tmp243_ = function; - _tmp244_ = st; - _tmp245_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp244_); + function = _tmp237_; + _g_free0 (_tmp236_); + _tmp238_ = st; + _tmp239_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp238_); + if (_tmp239_) { + ValaCCodeFunction* _tmp240_; + _tmp240_ = function; + vala_ccode_function_set_modifiers (_tmp240_, VALA_CCODE_MODIFIERS_STATIC); + } + _tmp241_ = function; + _tmp242_ = st; + _tmp243_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp242_); + _tmp244_ = _tmp243_; + _tmp245_ = g_strconcat (_tmp244_, "*", NULL); _tmp246_ = _tmp245_; - _tmp247_ = g_strconcat (_tmp246_, "*", NULL); + _tmp247_ = vala_ccode_parameter_new ("self", _tmp246_); _tmp248_ = _tmp247_; - _tmp249_ = vala_ccode_parameter_new ("self", _tmp248_); - _tmp250_ = _tmp249_; - vala_ccode_function_add_parameter (_tmp243_, _tmp250_); - _vala_ccode_node_unref0 (_tmp250_); - _g_free0 (_tmp248_); + vala_ccode_function_add_parameter (_tmp241_, _tmp248_); + _vala_ccode_node_unref0 (_tmp248_); _g_free0 (_tmp246_); - _tmp251_ = decl_space; - _tmp252_ = function; - vala_ccode_file_add_function_declaration (_tmp251_, _tmp252_); - _tmp253_ = st; - _tmp254_ = vala_struct_is_disposable (_tmp253_); - if (_tmp254_) { - ValaStruct* _tmp255_; - gchar* _tmp256_ = NULL; - gchar* _tmp257_; - ValaCCodeFunction* _tmp258_; - ValaStruct* _tmp259_; - gboolean _tmp260_ = FALSE; - ValaCCodeFunction* _tmp262_; - ValaStruct* _tmp263_; - gchar* _tmp264_ = NULL; + _g_free0 (_tmp244_); + _tmp249_ = decl_space; + _tmp250_ = function; + vala_ccode_file_add_function_declaration (_tmp249_, _tmp250_); + _tmp251_ = st; + _tmp252_ = vala_struct_is_disposable (_tmp251_); + if (_tmp252_) { + ValaStruct* _tmp253_; + gchar* _tmp254_ = NULL; + gchar* _tmp255_; + ValaCCodeFunction* _tmp256_; + ValaStruct* _tmp257_; + gboolean _tmp258_ = FALSE; + ValaCCodeFunction* _tmp260_; + ValaStruct* _tmp261_; + gchar* _tmp262_ = NULL; + gchar* _tmp263_; + gchar* _tmp264_; gchar* _tmp265_; gchar* _tmp266_; gchar* _tmp267_; - gchar* _tmp268_; - gchar* _tmp269_; - ValaCCodeParameter* _tmp270_; - ValaCCodeParameter* _tmp271_; - ValaCCodeFunction* _tmp272_; - ValaStruct* _tmp273_; - gchar* _tmp274_ = NULL; + ValaCCodeParameter* _tmp268_; + ValaCCodeParameter* _tmp269_; + ValaCCodeFunction* _tmp270_; + ValaStruct* _tmp271_; + gchar* _tmp272_ = NULL; + gchar* _tmp273_; + gchar* _tmp274_; gchar* _tmp275_; - gchar* _tmp276_; - gchar* _tmp277_; - ValaCCodeParameter* _tmp278_; - ValaCCodeParameter* _tmp279_; - ValaCCodeFile* _tmp280_; - ValaCCodeFunction* _tmp281_; - ValaStruct* _tmp282_; - gchar* _tmp283_ = NULL; - gchar* _tmp284_; - ValaCCodeFunction* _tmp285_; - ValaStruct* _tmp286_; - gboolean _tmp287_ = FALSE; - ValaCCodeFunction* _tmp289_; - ValaStruct* _tmp290_; - gchar* _tmp291_ = NULL; + ValaCCodeParameter* _tmp276_; + ValaCCodeParameter* _tmp277_; + ValaCCodeFile* _tmp278_; + ValaCCodeFunction* _tmp279_; + ValaStruct* _tmp280_; + gchar* _tmp281_ = NULL; + gchar* _tmp282_; + ValaCCodeFunction* _tmp283_; + ValaStruct* _tmp284_; + gboolean _tmp285_ = FALSE; + ValaCCodeFunction* _tmp287_; + ValaStruct* _tmp288_; + gchar* _tmp289_ = NULL; + gchar* _tmp290_; + gchar* _tmp291_; gchar* _tmp292_; - gchar* _tmp293_; - gchar* _tmp294_; - ValaCCodeParameter* _tmp295_; - ValaCCodeParameter* _tmp296_; - ValaCCodeFile* _tmp297_; - ValaCCodeFunction* _tmp298_; - _tmp255_ = st; - _tmp256_ = vala_ccode_base_module_get_ccode_copy_function ((ValaTypeSymbol*) _tmp255_); - _tmp257_ = _tmp256_; - _tmp258_ = vala_ccode_function_new (_tmp257_, "void"); + ValaCCodeParameter* _tmp293_; + ValaCCodeParameter* _tmp294_; + ValaCCodeFile* _tmp295_; + ValaCCodeFunction* _tmp296_; + _tmp253_ = st; + _tmp254_ = vala_ccode_base_module_get_ccode_copy_function ((ValaTypeSymbol*) _tmp253_); + _tmp255_ = _tmp254_; + _tmp256_ = vala_ccode_function_new (_tmp255_, "void"); _vala_ccode_node_unref0 (function); - function = _tmp258_; - _g_free0 (_tmp257_); - _tmp259_ = st; - _tmp260_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp259_); - if (_tmp260_) { - ValaCCodeFunction* _tmp261_; - _tmp261_ = function; - vala_ccode_function_set_modifiers (_tmp261_, VALA_CCODE_MODIFIERS_STATIC); + function = _tmp256_; + _g_free0 (_tmp255_); + _tmp257_ = st; + _tmp258_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp257_); + if (_tmp258_) { + ValaCCodeFunction* _tmp259_; + _tmp259_ = function; + vala_ccode_function_set_modifiers (_tmp259_, VALA_CCODE_MODIFIERS_STATIC); } - _tmp262_ = function; - _tmp263_ = st; - _tmp264_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp263_); + _tmp260_ = function; + _tmp261_ = st; + _tmp262_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp261_); + _tmp263_ = _tmp262_; + _tmp264_ = g_strconcat ("const ", _tmp263_, NULL); _tmp265_ = _tmp264_; - _tmp266_ = g_strconcat ("const ", _tmp265_, NULL); + _tmp266_ = g_strconcat (_tmp265_, "*", NULL); _tmp267_ = _tmp266_; - _tmp268_ = g_strconcat (_tmp267_, "*", NULL); + _tmp268_ = vala_ccode_parameter_new ("self", _tmp267_); _tmp269_ = _tmp268_; - _tmp270_ = vala_ccode_parameter_new ("self", _tmp269_); - _tmp271_ = _tmp270_; - vala_ccode_function_add_parameter (_tmp262_, _tmp271_); - _vala_ccode_node_unref0 (_tmp271_); - _g_free0 (_tmp269_); + vala_ccode_function_add_parameter (_tmp260_, _tmp269_); + _vala_ccode_node_unref0 (_tmp269_); _g_free0 (_tmp267_); _g_free0 (_tmp265_); - _tmp272_ = function; - _tmp273_ = st; - _tmp274_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp273_); + _g_free0 (_tmp263_); + _tmp270_ = function; + _tmp271_ = st; + _tmp272_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp271_); + _tmp273_ = _tmp272_; + _tmp274_ = g_strconcat (_tmp273_, "*", NULL); _tmp275_ = _tmp274_; - _tmp276_ = g_strconcat (_tmp275_, "*", NULL); + _tmp276_ = vala_ccode_parameter_new ("dest", _tmp275_); _tmp277_ = _tmp276_; - _tmp278_ = vala_ccode_parameter_new ("dest", _tmp277_); - _tmp279_ = _tmp278_; - vala_ccode_function_add_parameter (_tmp272_, _tmp279_); - _vala_ccode_node_unref0 (_tmp279_); - _g_free0 (_tmp277_); + vala_ccode_function_add_parameter (_tmp270_, _tmp277_); + _vala_ccode_node_unref0 (_tmp277_); _g_free0 (_tmp275_); - _tmp280_ = decl_space; - _tmp281_ = function; - vala_ccode_file_add_function_declaration (_tmp280_, _tmp281_); - _tmp282_ = st; - _tmp283_ = vala_ccode_base_module_get_ccode_destroy_function ((ValaTypeSymbol*) _tmp282_); - _tmp284_ = _tmp283_; - _tmp285_ = vala_ccode_function_new (_tmp284_, "void"); + _g_free0 (_tmp273_); + _tmp278_ = decl_space; + _tmp279_ = function; + vala_ccode_file_add_function_declaration (_tmp278_, _tmp279_); + _tmp280_ = st; + _tmp281_ = vala_ccode_base_module_get_ccode_destroy_function ((ValaTypeSymbol*) _tmp280_); + _tmp282_ = _tmp281_; + _tmp283_ = vala_ccode_function_new (_tmp282_, "void"); _vala_ccode_node_unref0 (function); - function = _tmp285_; - _g_free0 (_tmp284_); - _tmp286_ = st; - _tmp287_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp286_); - if (_tmp287_) { - ValaCCodeFunction* _tmp288_; - _tmp288_ = function; - vala_ccode_function_set_modifiers (_tmp288_, VALA_CCODE_MODIFIERS_STATIC); + function = _tmp283_; + _g_free0 (_tmp282_); + _tmp284_ = st; + _tmp285_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp284_); + if (_tmp285_) { + ValaCCodeFunction* _tmp286_; + _tmp286_ = function; + vala_ccode_function_set_modifiers (_tmp286_, VALA_CCODE_MODIFIERS_STATIC); } - _tmp289_ = function; - _tmp290_ = st; - _tmp291_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp290_); + _tmp287_ = function; + _tmp288_ = st; + _tmp289_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp288_); + _tmp290_ = _tmp289_; + _tmp291_ = g_strconcat (_tmp290_, "*", NULL); _tmp292_ = _tmp291_; - _tmp293_ = g_strconcat (_tmp292_, "*", NULL); + _tmp293_ = vala_ccode_parameter_new ("self", _tmp292_); _tmp294_ = _tmp293_; - _tmp295_ = vala_ccode_parameter_new ("self", _tmp294_); - _tmp296_ = _tmp295_; - vala_ccode_function_add_parameter (_tmp289_, _tmp296_); - _vala_ccode_node_unref0 (_tmp296_); - _g_free0 (_tmp294_); + vala_ccode_function_add_parameter (_tmp287_, _tmp294_); + _vala_ccode_node_unref0 (_tmp294_); _g_free0 (_tmp292_); - _tmp297_ = decl_space; - _tmp298_ = function; - vala_ccode_file_add_function_declaration (_tmp297_, _tmp298_); + _g_free0 (_tmp290_); + _tmp295_ = decl_space; + _tmp296_ = function; + vala_ccode_file_add_function_declaration (_tmp295_, _tmp296_); } _vala_ccode_node_unref0 (function); _vala_ccode_node_unref0 (instance_struct); diff -Nru vala-0.16-0.15.1/codegen/valaccodestructmodule.vala vala-0.16-0.15.2/codegen/valaccodestructmodule.vala --- vala-0.16-0.15.1/codegen/valaccodestructmodule.vala 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valaccodestructmodule.vala 2012-02-09 18:32:59.000000000 +0000 @@ -90,7 +90,7 @@ var delegate_type = (DelegateType) f.variable_type; if (delegate_type.delegate_symbol.has_target) { // create field to store delegate target - instance_struct.add_field ("gpointer", get_delegate_target_cname (f.name)); + instance_struct.add_field ("gpointer", get_ccode_delegate_target_name (f)); if (delegate_type.value_owned) { instance_struct.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (f.name)); } diff -Nru vala-0.16-0.15.1/codegen/valacodegen.h vala-0.16-0.15.2/codegen/valacodegen.h --- vala-0.16-0.15.1/codegen/valacodegen.h 2012-01-26 21:08:08.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valacodegen.h 2012-02-25 16:22:01.000000000 +0000 @@ -1164,6 +1164,7 @@ const gchar* vala_ccode_attribute_get_finish_name (ValaCCodeAttribute* self); const gchar* vala_ccode_attribute_get_finish_vfunc_name (ValaCCodeAttribute* self); const gchar* vala_ccode_attribute_get_finish_real_name (ValaCCodeAttribute* self); +const gchar* vala_ccode_attribute_get_delegate_target_name (ValaCCodeAttribute* self); gboolean vala_ccode_attribute_get_array_length (ValaCCodeAttribute* self); const gchar* vala_ccode_attribute_get_array_length_type (ValaCCodeAttribute* self); gboolean vala_ccode_attribute_get_array_null_terminated (ValaCCodeAttribute* self); @@ -1311,6 +1312,7 @@ gdouble vala_ccode_base_module_get_ccode_delegate_target_pos (ValaCodeNode* node); gdouble vala_ccode_base_module_get_ccode_destroy_notify_pos (ValaCodeNode* node); gboolean vala_ccode_base_module_get_ccode_delegate_target (ValaCodeNode* node); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); gdouble vala_ccode_base_module_get_ccode_pos (ValaParameter* param); gchar* vala_ccode_base_module_get_ccode_type (ValaCodeNode* node); gboolean vala_ccode_base_module_get_ccode_simple_generics (ValaMethod* m); diff -Nru vala-0.16-0.15.1/codegen/valagasyncmodule.c vala-0.16-0.15.2/codegen/valagasyncmodule.c --- vala-0.16-0.15.1/codegen/valagasyncmodule.c 2012-01-26 21:08:07.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valagasyncmodule.c 2012-02-25 16:21:59.000000000 +0000 @@ -498,9 +498,10 @@ gchar* vala_ccode_base_module_get_variable_cname (ValaCCodeBaseModule* self, const gchar* name); gboolean vala_ccode_base_module_get_ccode_array_length (ValaCodeNode* node); gchar* vala_ccode_base_module_get_parameter_array_length_cname (ValaCCodeBaseModule* self, ValaParameter* param, gint dim); -gchar* vala_ccode_base_module_get_delegate_target_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); gchar* vala_ccode_base_module_get_delegate_target_destroy_notify_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); gchar* vala_ccode_base_module_get_array_length_cname (ValaCCodeBaseModule* self, const gchar* array_cname, gint dim); +gchar* vala_ccode_base_module_get_delegate_target_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); static ValaCCodeFunction* vala_gasync_module_generate_free_function (ValaGAsyncModule* self, ValaMethod* m); gchar* vala_ccode_base_module_get_ccode_real_name (ValaSymbol* sym); void vala_ccode_base_module_push_context (ValaCCodeBaseModule* self, ValaCCodeBaseModuleEmitContext* emit_context); @@ -593,9 +594,9 @@ ValaMethod* _tmp16_; ValaMemberBinding _tmp17_; ValaMemberBinding _tmp18_; - ValaMethod* _tmp154_; - ValaDataType* _tmp155_; - ValaDataType* _tmp156_; + ValaMethod* _tmp150_; + ValaDataType* _tmp151_; + ValaDataType* _tmp152_; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (m != NULL, NULL); _tmp0_ = m; @@ -861,45 +862,36 @@ if (_tmp101_) { ValaCCodeStruct* _tmp102_; ValaParameter* _tmp103_; - const gchar* _tmp104_; - const gchar* _tmp105_; - gchar* _tmp106_ = NULL; - gchar* _tmp107_; - gchar* _tmp108_ = NULL; - gchar* _tmp109_; - gboolean _tmp110_; + gchar* _tmp104_ = NULL; + gchar* _tmp105_; + gboolean _tmp106_; _tmp102_ = data; _tmp103_ = param; - _tmp104_ = vala_symbol_get_name ((ValaSymbol*) _tmp103_); + _tmp104_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp103_); _tmp105_ = _tmp104_; - _tmp106_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp105_); - _tmp107_ = _tmp106_; - _tmp108_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp107_); - _tmp109_ = _tmp108_; - vala_ccode_struct_add_field (_tmp102_, "gpointer", _tmp109_, NULL); - _g_free0 (_tmp109_); - _g_free0 (_tmp107_); - _tmp110_ = is_unowned_delegate; - if (!_tmp110_) { - ValaCCodeStruct* _tmp111_; - ValaParameter* _tmp112_; - const gchar* _tmp113_; - const gchar* _tmp114_; - gchar* _tmp115_ = NULL; - gchar* _tmp116_; - gchar* _tmp117_ = NULL; - gchar* _tmp118_; - _tmp111_ = data; - _tmp112_ = param; - _tmp113_ = vala_symbol_get_name ((ValaSymbol*) _tmp112_); + vala_ccode_struct_add_field (_tmp102_, "gpointer", _tmp105_, NULL); + _g_free0 (_tmp105_); + _tmp106_ = is_unowned_delegate; + if (!_tmp106_) { + ValaCCodeStruct* _tmp107_; + ValaParameter* _tmp108_; + const gchar* _tmp109_; + const gchar* _tmp110_; + gchar* _tmp111_ = NULL; + gchar* _tmp112_; + gchar* _tmp113_ = NULL; + gchar* _tmp114_; + _tmp107_ = data; + _tmp108_ = param; + _tmp109_ = vala_symbol_get_name ((ValaSymbol*) _tmp108_); + _tmp110_ = _tmp109_; + _tmp111_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp110_); + _tmp112_ = _tmp111_; + _tmp113_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp112_); _tmp114_ = _tmp113_; - _tmp115_ = vala_ccode_base_module_get_variable_cname ((ValaCCodeBaseModule*) self, _tmp114_); - _tmp116_ = _tmp115_; - _tmp117_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp116_); - _tmp118_ = _tmp117_; - vala_ccode_struct_add_field (_tmp111_, "GDestroyNotify", _tmp118_, NULL); - _g_free0 (_tmp118_); - _g_free0 (_tmp116_); + vala_ccode_struct_add_field (_tmp107_, "GDestroyNotify", _tmp114_, NULL); + _g_free0 (_tmp114_); + _g_free0 (_tmp112_); } } _vala_code_node_unref0 (deleg_type); @@ -911,228 +903,228 @@ _vala_iterable_unref0 (_param_list); } { - ValaMethod* _tmp119_; - ValaList* _tmp120_ = NULL; + ValaMethod* _tmp115_; + ValaList* _tmp116_ = NULL; ValaList* _type_param_list; - ValaList* _tmp121_; - gint _tmp122_; - gint _tmp123_; + ValaList* _tmp117_; + gint _tmp118_; + gint _tmp119_; gint _type_param_size; gint _type_param_index; - _tmp119_ = m; - _tmp120_ = vala_method_get_type_parameters (_tmp119_); - _type_param_list = _tmp120_; - _tmp121_ = _type_param_list; - _tmp122_ = vala_collection_get_size ((ValaCollection*) _tmp121_); - _tmp123_ = _tmp122_; - _type_param_size = _tmp123_; + _tmp115_ = m; + _tmp116_ = vala_method_get_type_parameters (_tmp115_); + _type_param_list = _tmp116_; + _tmp117_ = _type_param_list; + _tmp118_ = vala_collection_get_size ((ValaCollection*) _tmp117_); + _tmp119_ = _tmp118_; + _type_param_size = _tmp119_; _type_param_index = -1; while (TRUE) { + gint _tmp120_; + gint _tmp121_; + gint _tmp122_; + ValaList* _tmp123_; gint _tmp124_; - gint _tmp125_; - gint _tmp126_; - ValaList* _tmp127_; - gint _tmp128_; - gpointer _tmp129_ = NULL; + gpointer _tmp125_ = NULL; ValaTypeParameter* type_param; - ValaCCodeStruct* _tmp130_; - ValaTypeParameter* _tmp131_; - const gchar* _tmp132_; - const gchar* _tmp133_; - gchar* _tmp134_ = NULL; - gchar* _tmp135_; - gchar* _tmp136_ = NULL; - gchar* _tmp137_; - ValaCCodeStruct* _tmp138_; - ValaTypeParameter* _tmp139_; - const gchar* _tmp140_; - const gchar* _tmp141_; - gchar* _tmp142_ = NULL; - gchar* _tmp143_; - gchar* _tmp144_ = NULL; - gchar* _tmp145_; - ValaCCodeStruct* _tmp146_; - ValaTypeParameter* _tmp147_; - const gchar* _tmp148_; - const gchar* _tmp149_; - gchar* _tmp150_ = NULL; - gchar* _tmp151_; - gchar* _tmp152_ = NULL; - gchar* _tmp153_; - _tmp124_ = _type_param_index; - _type_param_index = _tmp124_ + 1; - _tmp125_ = _type_param_index; - _tmp126_ = _type_param_size; - if (!(_tmp125_ < _tmp126_)) { + ValaCCodeStruct* _tmp126_; + ValaTypeParameter* _tmp127_; + const gchar* _tmp128_; + const gchar* _tmp129_; + gchar* _tmp130_ = NULL; + gchar* _tmp131_; + gchar* _tmp132_ = NULL; + gchar* _tmp133_; + ValaCCodeStruct* _tmp134_; + ValaTypeParameter* _tmp135_; + const gchar* _tmp136_; + const gchar* _tmp137_; + gchar* _tmp138_ = NULL; + gchar* _tmp139_; + gchar* _tmp140_ = NULL; + gchar* _tmp141_; + ValaCCodeStruct* _tmp142_; + ValaTypeParameter* _tmp143_; + const gchar* _tmp144_; + const gchar* _tmp145_; + gchar* _tmp146_ = NULL; + gchar* _tmp147_; + gchar* _tmp148_ = NULL; + gchar* _tmp149_; + _tmp120_ = _type_param_index; + _type_param_index = _tmp120_ + 1; + _tmp121_ = _type_param_index; + _tmp122_ = _type_param_size; + if (!(_tmp121_ < _tmp122_)) { break; } - _tmp127_ = _type_param_list; - _tmp128_ = _type_param_index; - _tmp129_ = vala_list_get (_tmp127_, _tmp128_); - type_param = (ValaTypeParameter*) _tmp129_; - _tmp130_ = data; - _tmp131_ = type_param; - _tmp132_ = vala_symbol_get_name ((ValaSymbol*) _tmp131_); + _tmp123_ = _type_param_list; + _tmp124_ = _type_param_index; + _tmp125_ = vala_list_get (_tmp123_, _tmp124_); + type_param = (ValaTypeParameter*) _tmp125_; + _tmp126_ = data; + _tmp127_ = type_param; + _tmp128_ = vala_symbol_get_name ((ValaSymbol*) _tmp127_); + _tmp129_ = _tmp128_; + _tmp130_ = g_utf8_strdown (_tmp129_, (gssize) (-1)); + _tmp131_ = _tmp130_; + _tmp132_ = g_strdup_printf ("%s_type", _tmp131_); _tmp133_ = _tmp132_; - _tmp134_ = g_utf8_strdown (_tmp133_, (gssize) (-1)); - _tmp135_ = _tmp134_; - _tmp136_ = g_strdup_printf ("%s_type", _tmp135_); + vala_ccode_struct_add_field (_tmp126_, "GType", _tmp133_, NULL); + _g_free0 (_tmp133_); + _g_free0 (_tmp131_); + _tmp134_ = data; + _tmp135_ = type_param; + _tmp136_ = vala_symbol_get_name ((ValaSymbol*) _tmp135_); _tmp137_ = _tmp136_; - vala_ccode_struct_add_field (_tmp130_, "GType", _tmp137_, NULL); - _g_free0 (_tmp137_); - _g_free0 (_tmp135_); - _tmp138_ = data; - _tmp139_ = type_param; - _tmp140_ = vala_symbol_get_name ((ValaSymbol*) _tmp139_); + _tmp138_ = g_utf8_strdown (_tmp137_, (gssize) (-1)); + _tmp139_ = _tmp138_; + _tmp140_ = g_strdup_printf ("%s_dup_func", _tmp139_); _tmp141_ = _tmp140_; - _tmp142_ = g_utf8_strdown (_tmp141_, (gssize) (-1)); - _tmp143_ = _tmp142_; - _tmp144_ = g_strdup_printf ("%s_dup_func", _tmp143_); + vala_ccode_struct_add_field (_tmp134_, "GBoxedCopyFunc", _tmp141_, NULL); + _g_free0 (_tmp141_); + _g_free0 (_tmp139_); + _tmp142_ = data; + _tmp143_ = type_param; + _tmp144_ = vala_symbol_get_name ((ValaSymbol*) _tmp143_); _tmp145_ = _tmp144_; - vala_ccode_struct_add_field (_tmp138_, "GBoxedCopyFunc", _tmp145_, NULL); - _g_free0 (_tmp145_); - _g_free0 (_tmp143_); - _tmp146_ = data; - _tmp147_ = type_param; - _tmp148_ = vala_symbol_get_name ((ValaSymbol*) _tmp147_); + _tmp146_ = g_utf8_strdown (_tmp145_, (gssize) (-1)); + _tmp147_ = _tmp146_; + _tmp148_ = g_strdup_printf ("%s_destroy_func", _tmp147_); _tmp149_ = _tmp148_; - _tmp150_ = g_utf8_strdown (_tmp149_, (gssize) (-1)); - _tmp151_ = _tmp150_; - _tmp152_ = g_strdup_printf ("%s_destroy_func", _tmp151_); - _tmp153_ = _tmp152_; - vala_ccode_struct_add_field (_tmp146_, "GDestroyNotify", _tmp153_, NULL); - _g_free0 (_tmp153_); - _g_free0 (_tmp151_); + vala_ccode_struct_add_field (_tmp142_, "GDestroyNotify", _tmp149_, NULL); + _g_free0 (_tmp149_); + _g_free0 (_tmp147_); _vala_code_node_unref0 (type_param); } _vala_iterable_unref0 (_type_param_list); } - _tmp154_ = m; - _tmp155_ = vala_method_get_return_type (_tmp154_); - _tmp156_ = _tmp155_; - if (!VALA_IS_VOID_TYPE (_tmp156_)) { - ValaCCodeStruct* _tmp157_; - ValaMethod* _tmp158_; - ValaDataType* _tmp159_; + _tmp150_ = m; + _tmp151_ = vala_method_get_return_type (_tmp150_); + _tmp152_ = _tmp151_; + if (!VALA_IS_VOID_TYPE (_tmp152_)) { + ValaCCodeStruct* _tmp153_; + ValaMethod* _tmp154_; + ValaDataType* _tmp155_; + ValaDataType* _tmp156_; + gchar* _tmp157_ = NULL; + gchar* _tmp158_; + ValaMethod* _tmp159_; ValaDataType* _tmp160_; - gchar* _tmp161_ = NULL; - gchar* _tmp162_; - ValaMethod* _tmp163_; - ValaDataType* _tmp164_; - ValaDataType* _tmp165_; - _tmp157_ = data; - _tmp158_ = m; - _tmp159_ = vala_method_get_return_type (_tmp158_); - _tmp160_ = _tmp159_; - _tmp161_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp160_); - _tmp162_ = _tmp161_; - vala_ccode_struct_add_field (_tmp157_, _tmp162_, "result", NULL); - _g_free0 (_tmp162_); - _tmp163_ = m; - _tmp164_ = vala_method_get_return_type (_tmp163_); - _tmp165_ = _tmp164_; - if (VALA_IS_ARRAY_TYPE (_tmp165_)) { - ValaMethod* _tmp166_; - ValaDataType* _tmp167_; - ValaDataType* _tmp168_; - ValaArrayType* _tmp169_; + ValaDataType* _tmp161_; + _tmp153_ = data; + _tmp154_ = m; + _tmp155_ = vala_method_get_return_type (_tmp154_); + _tmp156_ = _tmp155_; + _tmp157_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp156_); + _tmp158_ = _tmp157_; + vala_ccode_struct_add_field (_tmp153_, _tmp158_, "result", NULL); + _g_free0 (_tmp158_); + _tmp159_ = m; + _tmp160_ = vala_method_get_return_type (_tmp159_); + _tmp161_ = _tmp160_; + if (VALA_IS_ARRAY_TYPE (_tmp161_)) { + ValaMethod* _tmp162_; + ValaDataType* _tmp163_; + ValaDataType* _tmp164_; + ValaArrayType* _tmp165_; ValaArrayType* array_type; - ValaMethod* _tmp170_; - gboolean _tmp171_ = FALSE; + ValaMethod* _tmp166_; + gboolean _tmp167_ = FALSE; + _tmp162_ = m; + _tmp163_ = vala_method_get_return_type (_tmp162_); + _tmp164_ = _tmp163_; + _tmp165_ = _vala_code_node_ref0 (VALA_ARRAY_TYPE (_tmp164_)); + array_type = _tmp165_; _tmp166_ = m; - _tmp167_ = vala_method_get_return_type (_tmp166_); - _tmp168_ = _tmp167_; - _tmp169_ = _vala_code_node_ref0 (VALA_ARRAY_TYPE (_tmp168_)); - array_type = _tmp169_; - _tmp170_ = m; - _tmp171_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp170_); - if (_tmp171_) { + _tmp167_ = vala_ccode_base_module_get_ccode_array_length ((ValaCodeNode*) _tmp166_); + if (_tmp167_) { { gint dim; dim = 1; { - gboolean _tmp172_; - _tmp172_ = TRUE; + gboolean _tmp168_; + _tmp168_ = TRUE; while (TRUE) { - gboolean _tmp173_; - gint _tmp175_; - ValaArrayType* _tmp176_; - gint _tmp177_; - gint _tmp178_; - ValaCCodeStruct* _tmp179_; - gint _tmp180_; - gchar* _tmp181_ = NULL; - gchar* _tmp182_; - _tmp173_ = _tmp172_; - if (!_tmp173_) { - gint _tmp174_; - _tmp174_ = dim; - dim = _tmp174_ + 1; + gboolean _tmp169_; + gint _tmp171_; + ValaArrayType* _tmp172_; + gint _tmp173_; + gint _tmp174_; + ValaCCodeStruct* _tmp175_; + gint _tmp176_; + gchar* _tmp177_ = NULL; + gchar* _tmp178_; + _tmp169_ = _tmp168_; + if (!_tmp169_) { + gint _tmp170_; + _tmp170_ = dim; + dim = _tmp170_ + 1; } - _tmp172_ = FALSE; - _tmp175_ = dim; - _tmp176_ = array_type; - _tmp177_ = vala_array_type_get_rank (_tmp176_); - _tmp178_ = _tmp177_; - if (!(_tmp175_ <= _tmp178_)) { + _tmp168_ = FALSE; + _tmp171_ = dim; + _tmp172_ = array_type; + _tmp173_ = vala_array_type_get_rank (_tmp172_); + _tmp174_ = _tmp173_; + if (!(_tmp171_ <= _tmp174_)) { break; } - _tmp179_ = data; - _tmp180_ = dim; - _tmp181_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, "result", _tmp180_); - _tmp182_ = _tmp181_; - vala_ccode_struct_add_field (_tmp179_, "gint", _tmp182_, NULL); - _g_free0 (_tmp182_); + _tmp175_ = data; + _tmp176_ = dim; + _tmp177_ = vala_ccode_base_module_get_array_length_cname ((ValaCCodeBaseModule*) self, "result", _tmp176_); + _tmp178_ = _tmp177_; + vala_ccode_struct_add_field (_tmp175_, "gint", _tmp178_, NULL); + _g_free0 (_tmp178_); } } } } _vala_code_node_unref0 (array_type); } else { - ValaMethod* _tmp183_; - ValaDataType* _tmp184_; - ValaDataType* _tmp185_; - _tmp183_ = m; - _tmp184_ = vala_method_get_return_type (_tmp183_); - _tmp185_ = _tmp184_; - if (VALA_IS_DELEGATE_TYPE (_tmp185_)) { - ValaMethod* _tmp186_; - ValaDataType* _tmp187_; - ValaDataType* _tmp188_; - ValaDelegateType* _tmp189_; + ValaMethod* _tmp179_; + ValaDataType* _tmp180_; + ValaDataType* _tmp181_; + _tmp179_ = m; + _tmp180_ = vala_method_get_return_type (_tmp179_); + _tmp181_ = _tmp180_; + if (VALA_IS_DELEGATE_TYPE (_tmp181_)) { + ValaMethod* _tmp182_; + ValaDataType* _tmp183_; + ValaDataType* _tmp184_; + ValaDelegateType* _tmp185_; ValaDelegateType* deleg_type; - ValaDelegateType* _tmp190_; - ValaDelegate* _tmp191_; - ValaDelegate* _tmp192_; - gboolean _tmp193_; - gboolean _tmp194_; - _tmp186_ = m; - _tmp187_ = vala_method_get_return_type (_tmp186_); + ValaDelegateType* _tmp186_; + ValaDelegate* _tmp187_; + ValaDelegate* _tmp188_; + gboolean _tmp189_; + gboolean _tmp190_; + _tmp182_ = m; + _tmp183_ = vala_method_get_return_type (_tmp182_); + _tmp184_ = _tmp183_; + _tmp185_ = _vala_code_node_ref0 (VALA_DELEGATE_TYPE (_tmp184_)); + deleg_type = _tmp185_; + _tmp186_ = deleg_type; + _tmp187_ = vala_delegate_type_get_delegate_symbol (_tmp186_); _tmp188_ = _tmp187_; - _tmp189_ = _vala_code_node_ref0 (VALA_DELEGATE_TYPE (_tmp188_)); - deleg_type = _tmp189_; - _tmp190_ = deleg_type; - _tmp191_ = vala_delegate_type_get_delegate_symbol (_tmp190_); - _tmp192_ = _tmp191_; - _tmp193_ = vala_delegate_get_has_target (_tmp192_); - _tmp194_ = _tmp193_; - if (_tmp194_) { - ValaCCodeStruct* _tmp195_; - gchar* _tmp196_ = NULL; - gchar* _tmp197_; - ValaCCodeStruct* _tmp198_; - gchar* _tmp199_ = NULL; - gchar* _tmp200_; - _tmp195_ = data; - _tmp196_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, "result"); - _tmp197_ = _tmp196_; - vala_ccode_struct_add_field (_tmp195_, "gpointer", _tmp197_, NULL); - _g_free0 (_tmp197_); - _tmp198_ = data; - _tmp199_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, "result"); - _tmp200_ = _tmp199_; - vala_ccode_struct_add_field (_tmp198_, "GDestroyNotify", _tmp200_, NULL); - _g_free0 (_tmp200_); + _tmp189_ = vala_delegate_get_has_target (_tmp188_); + _tmp190_ = _tmp189_; + if (_tmp190_) { + ValaCCodeStruct* _tmp191_; + gchar* _tmp192_ = NULL; + gchar* _tmp193_; + ValaCCodeStruct* _tmp194_; + gchar* _tmp195_ = NULL; + gchar* _tmp196_; + _tmp191_ = data; + _tmp192_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, "result"); + _tmp193_ = _tmp192_; + vala_ccode_struct_add_field (_tmp191_, "gpointer", _tmp193_, NULL); + _g_free0 (_tmp193_); + _tmp194_ = data; + _tmp195_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, "result"); + _tmp196_ = _tmp195_; + vala_ccode_struct_add_field (_tmp194_, "GDestroyNotify", _tmp196_, NULL); + _g_free0 (_tmp196_); } _vala_code_node_unref0 (deleg_type); } diff -Nru vala-0.16-0.15.1/codegen/valagasyncmodule.vala vala-0.16-0.15.2/codegen/valagasyncmodule.vala --- vala-0.16-0.15.1/codegen/valagasyncmodule.vala 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valagasyncmodule.vala 2012-02-09 18:32:59.000000000 +0000 @@ -58,7 +58,7 @@ } else if (param.variable_type is DelegateType) { var deleg_type = (DelegateType) param.variable_type; if (deleg_type.delegate_symbol.has_target) { - data.add_field ("gpointer", get_delegate_target_cname (get_variable_cname (param.name))); + data.add_field ("gpointer", get_ccode_delegate_target_name (param)); if (!is_unowned_delegate) { data.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (get_variable_cname (param.name))); } diff -Nru vala-0.16-0.15.1/codegen/valagirwriter.c vala-0.16-0.15.2/codegen/valagirwriter.c --- vala-0.16-0.15.1/codegen/valagirwriter.c 2012-01-26 21:08:08.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valagirwriter.c 2012-02-25 16:22:00.000000000 +0000 @@ -582,6 +582,9 @@ FILE* _tmp42_; GString* _tmp43_; const gchar* _tmp44_; + ValaHashSet* _tmp80_; + gint _tmp81_; + gint _tmp82_; g_return_if_fail (self != NULL); g_return_if_fail (context != NULL); g_return_if_fail (directory != NULL); @@ -777,6 +780,12 @@ } _vala_iterator_unref0 (_ns_it); } + _tmp80_ = self->priv->our_namespaces; + _tmp81_ = vala_collection_get_size ((ValaCollection*) _tmp80_); + _tmp82_ = _tmp81_; + if (_tmp82_ == 0) { + vala_report_error (NULL, "No suitable namespace found to export for GIR"); + } _g_free0 (filename); _vala_code_node_unref0 (glib_ns); _vala_code_node_unref0 (root_symbol); diff -Nru vala-0.16-0.15.1/codegen/valagirwriter.vala vala-0.16-0.15.2/codegen/valagirwriter.vala --- vala-0.16-0.15.1/codegen/valagirwriter.vala 2012-01-26 20:10:00.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valagirwriter.vala 2012-02-09 18:32:59.000000000 +0000 @@ -188,6 +188,10 @@ ns.source_reference.file.gir_namespace = gir_namespace; ns.source_reference.file.gir_version = gir_version; } + + if (our_namespaces.size == 0) { + Report.error (null, "No suitable namespace found to export for GIR"); + } } private void write_doc (string? comment) { diff -Nru vala-0.16-0.15.1/codegen/valagtypemodule.c vala-0.16-0.15.2/codegen/valagtypemodule.c --- vala-0.16-0.15.1/codegen/valagtypemodule.c 2012-01-26 21:08:08.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valagtypemodule.c 2012-02-25 16:22:00.000000000 +0000 @@ -550,6 +550,7 @@ gboolean vala_ccode_base_module_get_ccode_array_length (ValaCodeNode* node); gchar* vala_ccode_base_module_get_ccode_array_length_name (ValaCodeNode* node); gchar* vala_ccode_base_module_get_array_size_cname (ValaCCodeBaseModule* self, const gchar* array_cname); +gchar* vala_ccode_base_module_get_ccode_delegate_target_name (ValaVariable* variable); gchar* vala_ccode_base_module_get_delegate_target_destroy_notify_cname (ValaCCodeBaseModule* self, const gchar* delegate_cname); static void vala_gtype_module_real_generate_virtual_method_declaration (ValaGTypeModule* self, ValaMethod* m, ValaCCodeFile* decl_space, ValaCCodeStruct* type_struct); gchar* vala_ccode_base_module_get_ccode_vfunc_name (ValaMethod* m); @@ -1639,12 +1640,12 @@ gboolean _tmp80_; gboolean _tmp86_; gboolean _tmp88_; - gboolean _tmp477_ = FALSE; - ValaClass* _tmp478_; - gboolean _tmp479_; - gboolean _tmp480_; - gboolean _tmp484_; - gboolean _tmp487_; + gboolean _tmp475_ = FALSE; + ValaClass* _tmp476_; + gboolean _tmp477_; + gboolean _tmp478_; + gboolean _tmp482_; + gboolean _tmp485_; self = (ValaGTypeModule*) base; g_return_if_fail (cl != NULL); g_return_if_fail (decl_space != NULL); @@ -2878,64 +2879,60 @@ if (_tmp453_) { ValaCCodeStruct* _tmp454_; ValaField* _tmp455_; - const gchar* _tmp456_; - const gchar* _tmp457_; - gchar* _tmp458_ = NULL; - gchar* _tmp459_; - ValaDelegateType* _tmp460_; - gboolean _tmp461_; - gboolean _tmp462_; + gchar* _tmp456_ = NULL; + gchar* _tmp457_; + ValaDelegateType* _tmp458_; + gboolean _tmp459_; + gboolean _tmp460_; _tmp454_ = instance_struct; _tmp455_ = f; - _tmp456_ = vala_symbol_get_name ((ValaSymbol*) _tmp455_); + _tmp456_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp455_); _tmp457_ = _tmp456_; - _tmp458_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp457_); - _tmp459_ = _tmp458_; - vala_ccode_struct_add_field (_tmp454_, "gpointer", _tmp459_, NULL); - _g_free0 (_tmp459_); - _tmp460_ = delegate_type; - _tmp461_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp460_); - _tmp462_ = _tmp461_; - if (_tmp462_) { - ValaCCodeStruct* _tmp463_; - ValaField* _tmp464_; - const gchar* _tmp465_; - const gchar* _tmp466_; - gchar* _tmp467_ = NULL; - gchar* _tmp468_; - _tmp463_ = instance_struct; - _tmp464_ = f; - _tmp465_ = vala_symbol_get_name ((ValaSymbol*) _tmp464_); + vala_ccode_struct_add_field (_tmp454_, "gpointer", _tmp457_, NULL); + _g_free0 (_tmp457_); + _tmp458_ = delegate_type; + _tmp459_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp458_); + _tmp460_ = _tmp459_; + if (_tmp460_) { + ValaCCodeStruct* _tmp461_; + ValaField* _tmp462_; + const gchar* _tmp463_; + const gchar* _tmp464_; + gchar* _tmp465_ = NULL; + gchar* _tmp466_; + _tmp461_ = instance_struct; + _tmp462_ = f; + _tmp463_ = vala_symbol_get_name ((ValaSymbol*) _tmp462_); + _tmp464_ = _tmp463_; + _tmp465_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp464_); _tmp466_ = _tmp465_; - _tmp467_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp466_); - _tmp468_ = _tmp467_; - vala_ccode_struct_add_field (_tmp463_, "GDestroyNotify", _tmp468_, NULL); - _g_free0 (_tmp468_); + vala_ccode_struct_add_field (_tmp461_, "GDestroyNotify", _tmp466_, NULL); + _g_free0 (_tmp466_); } } _vala_code_node_unref0 (delegate_type); } } } else { - ValaField* _tmp469_; - ValaMemberBinding _tmp470_; - ValaMemberBinding _tmp471_; - _tmp469_ = f; - _tmp470_ = vala_field_get_binding (_tmp469_); - _tmp471_ = _tmp470_; - if (_tmp471_ == VALA_MEMBER_BINDING_CLASS) { - ValaCCodeStruct* _tmp472_; - const gchar* _tmp473_; - ValaField* _tmp474_; - gchar* _tmp475_ = NULL; - gchar* _tmp476_; - _tmp472_ = type_struct; - _tmp473_ = field_ctype; - _tmp474_ = f; - _tmp475_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp474_); - _tmp476_ = _tmp475_; - vala_ccode_struct_add_field (_tmp472_, _tmp473_, _tmp476_, NULL); - _g_free0 (_tmp476_); + ValaField* _tmp467_; + ValaMemberBinding _tmp468_; + ValaMemberBinding _tmp469_; + _tmp467_ = f; + _tmp468_ = vala_field_get_binding (_tmp467_); + _tmp469_ = _tmp468_; + if (_tmp469_ == VALA_MEMBER_BINDING_CLASS) { + ValaCCodeStruct* _tmp470_; + const gchar* _tmp471_; + ValaField* _tmp472_; + gchar* _tmp473_ = NULL; + gchar* _tmp474_; + _tmp470_ = type_struct; + _tmp471_ = field_ctype; + _tmp472_ = f; + _tmp473_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp472_); + _tmp474_ = _tmp473_; + vala_ccode_struct_add_field (_tmp470_, _tmp471_, _tmp474_, NULL); + _g_free0 (_tmp474_); } } } @@ -2944,35 +2941,35 @@ } _vala_iterable_unref0 (_f_list); } - _tmp478_ = cl; - _tmp479_ = vala_class_get_is_compact (_tmp478_); - _tmp480_ = _tmp479_; - if (!_tmp480_) { - _tmp477_ = TRUE; + _tmp476_ = cl; + _tmp477_ = vala_class_get_is_compact (_tmp476_); + _tmp478_ = _tmp477_; + if (!_tmp478_) { + _tmp475_ = TRUE; } else { + ValaClass* _tmp479_; + ValaClass* _tmp480_; ValaClass* _tmp481_; - ValaClass* _tmp482_; - ValaClass* _tmp483_; - _tmp481_ = cl; - _tmp482_ = vala_class_get_base_class (_tmp481_); - _tmp483_ = _tmp482_; - _tmp477_ = _tmp483_ == NULL; - } - _tmp484_ = _tmp477_; - if (_tmp484_) { - ValaCCodeFile* _tmp485_; - ValaCCodeStruct* _tmp486_; - _tmp485_ = decl_space; - _tmp486_ = instance_struct; - vala_ccode_file_add_type_definition (_tmp485_, (ValaCCodeNode*) _tmp486_); - } - _tmp487_ = is_gtypeinstance; - if (_tmp487_) { - ValaCCodeFile* _tmp488_; - ValaCCodeStruct* _tmp489_; - _tmp488_ = decl_space; - _tmp489_ = type_struct; - vala_ccode_file_add_type_definition (_tmp488_, (ValaCCodeNode*) _tmp489_); + _tmp479_ = cl; + _tmp480_ = vala_class_get_base_class (_tmp479_); + _tmp481_ = _tmp480_; + _tmp475_ = _tmp481_ == NULL; + } + _tmp482_ = _tmp475_; + if (_tmp482_) { + ValaCCodeFile* _tmp483_; + ValaCCodeStruct* _tmp484_; + _tmp483_ = decl_space; + _tmp484_ = instance_struct; + vala_ccode_file_add_type_definition (_tmp483_, (ValaCCodeNode*) _tmp484_); + } + _tmp485_ = is_gtypeinstance; + if (_tmp485_) { + ValaCCodeFile* _tmp486_; + ValaCCodeStruct* _tmp487_; + _tmp486_ = decl_space; + _tmp487_ = type_struct; + vala_ccode_file_add_type_definition (_tmp486_, (ValaCCodeNode*) _tmp487_); } _vala_ccode_node_unref0 (type_struct); _vala_ccode_node_unref0 (instance_struct); @@ -3134,7 +3131,7 @@ ValaCCodeStruct* _tmp24_; ValaCCodeStruct* type_priv_struct; gboolean _tmp25_; - gboolean _tmp257_; + gboolean _tmp255_; g_return_if_fail (self != NULL); g_return_if_fail (cl != NULL); g_return_if_fail (decl_space != NULL); @@ -3351,8 +3348,8 @@ ValaField* _tmp84_; ValaSymbolAccessibility _tmp85_; ValaSymbolAccessibility _tmp86_; - ValaField* _tmp183_; - gboolean _tmp184_ = FALSE; + ValaField* _tmp181_; + gboolean _tmp182_ = FALSE; _tmp84_ = f; _tmp85_ = vala_symbol_get_access ((ValaSymbol*) _tmp84_); _tmp86_ = _tmp85_; @@ -3579,129 +3576,125 @@ if (_tmp167_) { ValaCCodeStruct* _tmp168_; ValaField* _tmp169_; - const gchar* _tmp170_; - const gchar* _tmp171_; - gchar* _tmp172_ = NULL; - gchar* _tmp173_; - ValaDelegateType* _tmp174_; - gboolean _tmp175_; - gboolean _tmp176_; + gchar* _tmp170_ = NULL; + gchar* _tmp171_; + ValaDelegateType* _tmp172_; + gboolean _tmp173_; + gboolean _tmp174_; _tmp168_ = instance_priv_struct; _tmp169_ = f; - _tmp170_ = vala_symbol_get_name ((ValaSymbol*) _tmp169_); + _tmp170_ = vala_ccode_base_module_get_ccode_delegate_target_name ((ValaVariable*) _tmp169_); _tmp171_ = _tmp170_; - _tmp172_ = vala_ccode_base_module_get_delegate_target_cname ((ValaCCodeBaseModule*) self, _tmp171_); - _tmp173_ = _tmp172_; - vala_ccode_struct_add_field (_tmp168_, "gpointer", _tmp173_, NULL); - _g_free0 (_tmp173_); - _tmp174_ = delegate_type; - _tmp175_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp174_); - _tmp176_ = _tmp175_; - if (_tmp176_) { - ValaCCodeStruct* _tmp177_; - ValaField* _tmp178_; - const gchar* _tmp179_; - const gchar* _tmp180_; - gchar* _tmp181_ = NULL; - gchar* _tmp182_; - _tmp177_ = instance_priv_struct; - _tmp178_ = f; - _tmp179_ = vala_symbol_get_name ((ValaSymbol*) _tmp178_); + vala_ccode_struct_add_field (_tmp168_, "gpointer", _tmp171_, NULL); + _g_free0 (_tmp171_); + _tmp172_ = delegate_type; + _tmp173_ = vala_data_type_get_value_owned ((ValaDataType*) _tmp172_); + _tmp174_ = _tmp173_; + if (_tmp174_) { + ValaCCodeStruct* _tmp175_; + ValaField* _tmp176_; + const gchar* _tmp177_; + const gchar* _tmp178_; + gchar* _tmp179_ = NULL; + gchar* _tmp180_; + _tmp175_ = instance_priv_struct; + _tmp176_ = f; + _tmp177_ = vala_symbol_get_name ((ValaSymbol*) _tmp176_); + _tmp178_ = _tmp177_; + _tmp179_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp178_); _tmp180_ = _tmp179_; - _tmp181_ = vala_ccode_base_module_get_delegate_target_destroy_notify_cname ((ValaCCodeBaseModule*) self, _tmp180_); - _tmp182_ = _tmp181_; - vala_ccode_struct_add_field (_tmp177_, "GDestroyNotify", _tmp182_, NULL); - _g_free0 (_tmp182_); + vala_ccode_struct_add_field (_tmp175_, "GDestroyNotify", _tmp180_, NULL); + _g_free0 (_tmp180_); } } _vala_code_node_unref0 (delegate_type); } } } - _tmp183_ = f; - _tmp184_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp183_); - if (_tmp184_) { - ValaClass* _tmp185_; - ValaCCodeStruct* _tmp186_; - ValaStruct* _tmp187_; - gchar* _tmp188_ = NULL; - gchar* _tmp189_; - ValaField* _tmp190_; - const gchar* _tmp191_; - const gchar* _tmp192_; - gchar* _tmp193_ = NULL; - gchar* _tmp194_; - _tmp185_ = cl; - vala_class_set_has_private_fields (_tmp185_, TRUE); - _tmp186_ = instance_priv_struct; - _tmp187_ = ((ValaCCodeBaseModule*) self)->mutex_type; - _tmp188_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp187_); - _tmp189_ = _tmp188_; - _tmp190_ = f; - _tmp191_ = vala_symbol_get_name ((ValaSymbol*) _tmp190_); + _tmp181_ = f; + _tmp182_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp181_); + if (_tmp182_) { + ValaClass* _tmp183_; + ValaCCodeStruct* _tmp184_; + ValaStruct* _tmp185_; + gchar* _tmp186_ = NULL; + gchar* _tmp187_; + ValaField* _tmp188_; + const gchar* _tmp189_; + const gchar* _tmp190_; + gchar* _tmp191_ = NULL; + gchar* _tmp192_; + _tmp183_ = cl; + vala_class_set_has_private_fields (_tmp183_, TRUE); + _tmp184_ = instance_priv_struct; + _tmp185_ = ((ValaCCodeBaseModule*) self)->mutex_type; + _tmp186_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp185_); + _tmp187_ = _tmp186_; + _tmp188_ = f; + _tmp189_ = vala_symbol_get_name ((ValaSymbol*) _tmp188_); + _tmp190_ = _tmp189_; + _tmp191_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp190_); _tmp192_ = _tmp191_; - _tmp193_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp192_); - _tmp194_ = _tmp193_; - vala_ccode_struct_add_field (_tmp186_, _tmp189_, _tmp194_, NULL); - _g_free0 (_tmp194_); - _g_free0 (_tmp189_); + vala_ccode_struct_add_field (_tmp184_, _tmp187_, _tmp192_, NULL); + _g_free0 (_tmp192_); + _g_free0 (_tmp187_); } } else { - ValaField* _tmp195_; - ValaMemberBinding _tmp196_; - ValaMemberBinding _tmp197_; - _tmp195_ = f; - _tmp196_ = vala_field_get_binding (_tmp195_); - _tmp197_ = _tmp196_; - if (_tmp197_ == VALA_MEMBER_BINDING_CLASS) { - ValaField* _tmp198_; - ValaSymbolAccessibility _tmp199_; - ValaSymbolAccessibility _tmp200_; - ValaField* _tmp206_; - gboolean _tmp207_ = FALSE; - _tmp198_ = f; - _tmp199_ = vala_symbol_get_access ((ValaSymbol*) _tmp198_); - _tmp200_ = _tmp199_; - if (_tmp200_ == VALA_SYMBOL_ACCESSIBILITY_PRIVATE) { - ValaCCodeStruct* _tmp201_; - const gchar* _tmp202_; - ValaField* _tmp203_; - gchar* _tmp204_ = NULL; - gchar* _tmp205_; - _tmp201_ = type_priv_struct; - _tmp202_ = field_ctype; - _tmp203_ = f; - _tmp204_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp203_); - _tmp205_ = _tmp204_; - vala_ccode_struct_add_field (_tmp201_, _tmp202_, _tmp205_, NULL); - _g_free0 (_tmp205_); + ValaField* _tmp193_; + ValaMemberBinding _tmp194_; + ValaMemberBinding _tmp195_; + _tmp193_ = f; + _tmp194_ = vala_field_get_binding (_tmp193_); + _tmp195_ = _tmp194_; + if (_tmp195_ == VALA_MEMBER_BINDING_CLASS) { + ValaField* _tmp196_; + ValaSymbolAccessibility _tmp197_; + ValaSymbolAccessibility _tmp198_; + ValaField* _tmp204_; + gboolean _tmp205_ = FALSE; + _tmp196_ = f; + _tmp197_ = vala_symbol_get_access ((ValaSymbol*) _tmp196_); + _tmp198_ = _tmp197_; + if (_tmp198_ == VALA_SYMBOL_ACCESSIBILITY_PRIVATE) { + ValaCCodeStruct* _tmp199_; + const gchar* _tmp200_; + ValaField* _tmp201_; + gchar* _tmp202_ = NULL; + gchar* _tmp203_; + _tmp199_ = type_priv_struct; + _tmp200_ = field_ctype; + _tmp201_ = f; + _tmp202_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp201_); + _tmp203_ = _tmp202_; + vala_ccode_struct_add_field (_tmp199_, _tmp200_, _tmp203_, NULL); + _g_free0 (_tmp203_); } - _tmp206_ = f; - _tmp207_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp206_); - if (_tmp207_) { - ValaCCodeStruct* _tmp208_; - ValaStruct* _tmp209_; - gchar* _tmp210_ = NULL; - gchar* _tmp211_; - ValaField* _tmp212_; + _tmp204_ = f; + _tmp205_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp204_); + if (_tmp205_) { + ValaCCodeStruct* _tmp206_; + ValaStruct* _tmp207_; + gchar* _tmp208_ = NULL; + gchar* _tmp209_; + ValaField* _tmp210_; + gchar* _tmp211_ = NULL; + gchar* _tmp212_; gchar* _tmp213_ = NULL; gchar* _tmp214_; - gchar* _tmp215_ = NULL; - gchar* _tmp216_; has_class_locks = TRUE; - _tmp208_ = type_priv_struct; - _tmp209_ = ((ValaCCodeBaseModule*) self)->mutex_type; - _tmp210_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp209_); - _tmp211_ = _tmp210_; - _tmp212_ = f; - _tmp213_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp212_); + _tmp206_ = type_priv_struct; + _tmp207_ = ((ValaCCodeBaseModule*) self)->mutex_type; + _tmp208_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp207_); + _tmp209_ = _tmp208_; + _tmp210_ = f; + _tmp211_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp210_); + _tmp212_ = _tmp211_; + _tmp213_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp212_); _tmp214_ = _tmp213_; - _tmp215_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp214_); - _tmp216_ = _tmp215_; - vala_ccode_struct_add_field (_tmp208_, _tmp211_, _tmp216_, NULL); - _g_free0 (_tmp216_); + vala_ccode_struct_add_field (_tmp206_, _tmp209_, _tmp214_, NULL); _g_free0 (_tmp214_); - _g_free0 (_tmp211_); + _g_free0 (_tmp212_); + _g_free0 (_tmp209_); } } } @@ -3711,113 +3704,113 @@ _vala_iterable_unref0 (_f_list); } { - ValaClass* _tmp217_; - ValaList* _tmp218_ = NULL; + ValaClass* _tmp215_; + ValaList* _tmp216_ = NULL; ValaList* _prop_list; - ValaList* _tmp219_; - gint _tmp220_; - gint _tmp221_; + ValaList* _tmp217_; + gint _tmp218_; + gint _tmp219_; gint _prop_size; gint _prop_index; - _tmp217_ = cl; - _tmp218_ = vala_object_type_symbol_get_properties ((ValaObjectTypeSymbol*) _tmp217_); - _prop_list = _tmp218_; - _tmp219_ = _prop_list; - _tmp220_ = vala_collection_get_size ((ValaCollection*) _tmp219_); - _tmp221_ = _tmp220_; - _prop_size = _tmp221_; + _tmp215_ = cl; + _tmp216_ = vala_object_type_symbol_get_properties ((ValaObjectTypeSymbol*) _tmp215_); + _prop_list = _tmp216_; + _tmp217_ = _prop_list; + _tmp218_ = vala_collection_get_size ((ValaCollection*) _tmp217_); + _tmp219_ = _tmp218_; + _prop_size = _tmp219_; _prop_index = -1; while (TRUE) { + gint _tmp220_; + gint _tmp221_; gint _tmp222_; - gint _tmp223_; + ValaList* _tmp223_; gint _tmp224_; - ValaList* _tmp225_; - gint _tmp226_; - gpointer _tmp227_ = NULL; + gpointer _tmp225_ = NULL; ValaProperty* prop; - ValaProperty* _tmp228_; - ValaMemberBinding _tmp229_; - ValaMemberBinding _tmp230_; - _tmp222_ = _prop_index; - _prop_index = _tmp222_ + 1; - _tmp223_ = _prop_index; - _tmp224_ = _prop_size; - if (!(_tmp223_ < _tmp224_)) { + ValaProperty* _tmp226_; + ValaMemberBinding _tmp227_; + ValaMemberBinding _tmp228_; + _tmp220_ = _prop_index; + _prop_index = _tmp220_ + 1; + _tmp221_ = _prop_index; + _tmp222_ = _prop_size; + if (!(_tmp221_ < _tmp222_)) { break; } - _tmp225_ = _prop_list; - _tmp226_ = _prop_index; - _tmp227_ = vala_list_get (_tmp225_, _tmp226_); - prop = (ValaProperty*) _tmp227_; - _tmp228_ = prop; - _tmp229_ = vala_property_get_binding (_tmp228_); - _tmp230_ = _tmp229_; - if (_tmp230_ == VALA_MEMBER_BINDING_INSTANCE) { - ValaProperty* _tmp231_; - gboolean _tmp232_ = FALSE; - _tmp231_ = prop; - _tmp232_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp231_); - if (_tmp232_) { - ValaClass* _tmp233_; - ValaCCodeStruct* _tmp234_; - ValaStruct* _tmp235_; - gchar* _tmp236_ = NULL; - gchar* _tmp237_; - ValaProperty* _tmp238_; - const gchar* _tmp239_; - const gchar* _tmp240_; - gchar* _tmp241_ = NULL; - gchar* _tmp242_; - _tmp233_ = cl; - vala_class_set_has_private_fields (_tmp233_, TRUE); - _tmp234_ = instance_priv_struct; - _tmp235_ = ((ValaCCodeBaseModule*) self)->mutex_type; - _tmp236_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp235_); - _tmp237_ = _tmp236_; - _tmp238_ = prop; - _tmp239_ = vala_symbol_get_name ((ValaSymbol*) _tmp238_); + _tmp223_ = _prop_list; + _tmp224_ = _prop_index; + _tmp225_ = vala_list_get (_tmp223_, _tmp224_); + prop = (ValaProperty*) _tmp225_; + _tmp226_ = prop; + _tmp227_ = vala_property_get_binding (_tmp226_); + _tmp228_ = _tmp227_; + if (_tmp228_ == VALA_MEMBER_BINDING_INSTANCE) { + ValaProperty* _tmp229_; + gboolean _tmp230_ = FALSE; + _tmp229_ = prop; + _tmp230_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp229_); + if (_tmp230_) { + ValaClass* _tmp231_; + ValaCCodeStruct* _tmp232_; + ValaStruct* _tmp233_; + gchar* _tmp234_ = NULL; + gchar* _tmp235_; + ValaProperty* _tmp236_; + const gchar* _tmp237_; + const gchar* _tmp238_; + gchar* _tmp239_ = NULL; + gchar* _tmp240_; + _tmp231_ = cl; + vala_class_set_has_private_fields (_tmp231_, TRUE); + _tmp232_ = instance_priv_struct; + _tmp233_ = ((ValaCCodeBaseModule*) self)->mutex_type; + _tmp234_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp233_); + _tmp235_ = _tmp234_; + _tmp236_ = prop; + _tmp237_ = vala_symbol_get_name ((ValaSymbol*) _tmp236_); + _tmp238_ = _tmp237_; + _tmp239_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp238_); _tmp240_ = _tmp239_; - _tmp241_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp240_); - _tmp242_ = _tmp241_; - vala_ccode_struct_add_field (_tmp234_, _tmp237_, _tmp242_, NULL); - _g_free0 (_tmp242_); - _g_free0 (_tmp237_); + vala_ccode_struct_add_field (_tmp232_, _tmp235_, _tmp240_, NULL); + _g_free0 (_tmp240_); + _g_free0 (_tmp235_); } } else { - ValaProperty* _tmp243_; - ValaMemberBinding _tmp244_; - ValaMemberBinding _tmp245_; - _tmp243_ = prop; - _tmp244_ = vala_property_get_binding (_tmp243_); - _tmp245_ = _tmp244_; - if (_tmp245_ == VALA_MEMBER_BINDING_CLASS) { - ValaProperty* _tmp246_; - gboolean _tmp247_ = FALSE; - _tmp246_ = prop; - _tmp247_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp246_); - if (_tmp247_) { - ValaCCodeStruct* _tmp248_; - ValaStruct* _tmp249_; - gchar* _tmp250_ = NULL; - gchar* _tmp251_; - ValaProperty* _tmp252_; - const gchar* _tmp253_; - const gchar* _tmp254_; - gchar* _tmp255_ = NULL; - gchar* _tmp256_; + ValaProperty* _tmp241_; + ValaMemberBinding _tmp242_; + ValaMemberBinding _tmp243_; + _tmp241_ = prop; + _tmp242_ = vala_property_get_binding (_tmp241_); + _tmp243_ = _tmp242_; + if (_tmp243_ == VALA_MEMBER_BINDING_CLASS) { + ValaProperty* _tmp244_; + gboolean _tmp245_ = FALSE; + _tmp244_ = prop; + _tmp245_ = vala_lockable_get_lock_used ((ValaLockable*) _tmp244_); + if (_tmp245_) { + ValaCCodeStruct* _tmp246_; + ValaStruct* _tmp247_; + gchar* _tmp248_ = NULL; + gchar* _tmp249_; + ValaProperty* _tmp250_; + const gchar* _tmp251_; + const gchar* _tmp252_; + gchar* _tmp253_ = NULL; + gchar* _tmp254_; has_class_locks = TRUE; - _tmp248_ = type_priv_struct; - _tmp249_ = ((ValaCCodeBaseModule*) self)->mutex_type; - _tmp250_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp249_); - _tmp251_ = _tmp250_; - _tmp252_ = prop; - _tmp253_ = vala_symbol_get_name ((ValaSymbol*) _tmp252_); + _tmp246_ = type_priv_struct; + _tmp247_ = ((ValaCCodeBaseModule*) self)->mutex_type; + _tmp248_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp247_); + _tmp249_ = _tmp248_; + _tmp250_ = prop; + _tmp251_ = vala_symbol_get_name ((ValaSymbol*) _tmp250_); + _tmp252_ = _tmp251_; + _tmp253_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp252_); _tmp254_ = _tmp253_; - _tmp255_ = vala_ccode_base_module_get_symbol_lock_name ((ValaCCodeBaseModule*) self, _tmp254_); - _tmp256_ = _tmp255_; - vala_ccode_struct_add_field (_tmp248_, _tmp251_, _tmp256_, NULL); - _g_free0 (_tmp256_); - _g_free0 (_tmp251_); + vala_ccode_struct_add_field (_tmp246_, _tmp249_, _tmp254_, NULL); + _g_free0 (_tmp254_); + _g_free0 (_tmp249_); } } } @@ -3825,296 +3818,296 @@ } _vala_iterable_unref0 (_prop_list); } - _tmp257_ = is_gtypeinstance; - if (_tmp257_) { - gboolean _tmp258_ = FALSE; - ValaClass* _tmp259_; - gboolean _tmp260_; + _tmp255_ = is_gtypeinstance; + if (_tmp255_) { + gboolean _tmp256_ = FALSE; + ValaClass* _tmp257_; + gboolean _tmp258_; + gboolean _tmp259_; gboolean _tmp261_; - gboolean _tmp263_; - gboolean _tmp296_ = FALSE; - ValaClass* _tmp297_; - gboolean _tmp298_; - gboolean _tmp299_; - gboolean _tmp305_; - gboolean _tmp325_ = FALSE; - ValaClass* _tmp326_; - gboolean _tmp327_; + gboolean _tmp294_ = FALSE; + ValaClass* _tmp295_; + gboolean _tmp296_; + gboolean _tmp297_; + gboolean _tmp303_; + gboolean _tmp323_ = FALSE; + ValaClass* _tmp324_; + gboolean _tmp325_; + gboolean _tmp326_; gboolean _tmp328_; - gboolean _tmp330_; - ValaCCodeFile* _tmp359_; - ValaCCodeEnum* _tmp360_; - _tmp259_ = cl; - _tmp260_ = vala_class_get_has_class_private_fields (_tmp259_); - _tmp261_ = _tmp260_; - if (_tmp261_) { - _tmp258_ = TRUE; + ValaCCodeFile* _tmp357_; + ValaCCodeEnum* _tmp358_; + _tmp257_ = cl; + _tmp258_ = vala_class_get_has_class_private_fields (_tmp257_); + _tmp259_ = _tmp258_; + if (_tmp259_) { + _tmp256_ = TRUE; } else { - gboolean _tmp262_; - _tmp262_ = has_class_locks; - _tmp258_ = _tmp262_; - } - _tmp263_ = _tmp258_; - if (_tmp263_) { - ValaCCodeFile* _tmp264_; - ValaCCodeStruct* _tmp265_; - const gchar* _tmp266_; - const gchar* _tmp267_; - gchar* _tmp268_ = NULL; - gchar* _tmp269_; - ValaClass* _tmp270_; + gboolean _tmp260_; + _tmp260_ = has_class_locks; + _tmp256_ = _tmp260_; + } + _tmp261_ = _tmp256_; + if (_tmp261_) { + ValaCCodeFile* _tmp262_; + ValaCCodeStruct* _tmp263_; + const gchar* _tmp264_; + const gchar* _tmp265_; + gchar* _tmp266_ = NULL; + gchar* _tmp267_; + ValaClass* _tmp268_; + gchar* _tmp269_ = NULL; + gchar* _tmp270_; gchar* _tmp271_ = NULL; gchar* _tmp272_; - gchar* _tmp273_ = NULL; - gchar* _tmp274_; - ValaCCodeVariableDeclarator* _tmp275_; - ValaCCodeVariableDeclarator* _tmp276_; - ValaCCodeTypeDefinition* _tmp277_; - ValaCCodeTypeDefinition* _tmp278_; - ValaCodeContext* _tmp279_; - ValaCodeContext* _tmp280_; - gboolean _tmp281_ = FALSE; - _tmp264_ = decl_space; - _tmp265_ = type_priv_struct; - _tmp266_ = vala_ccode_struct_get_name (_tmp265_); + ValaCCodeVariableDeclarator* _tmp273_; + ValaCCodeVariableDeclarator* _tmp274_; + ValaCCodeTypeDefinition* _tmp275_; + ValaCCodeTypeDefinition* _tmp276_; + ValaCodeContext* _tmp277_; + ValaCodeContext* _tmp278_; + gboolean _tmp279_ = FALSE; + _tmp262_ = decl_space; + _tmp263_ = type_priv_struct; + _tmp264_ = vala_ccode_struct_get_name (_tmp263_); + _tmp265_ = _tmp264_; + _tmp266_ = g_strdup_printf ("struct %s", _tmp265_); _tmp267_ = _tmp266_; - _tmp268_ = g_strdup_printf ("struct %s", _tmp267_); - _tmp269_ = _tmp268_; - _tmp270_ = cl; - _tmp271_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp270_); + _tmp268_ = cl; + _tmp269_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp268_); + _tmp270_ = _tmp269_; + _tmp271_ = g_strdup_printf ("%sClassPrivate", _tmp270_); _tmp272_ = _tmp271_; - _tmp273_ = g_strdup_printf ("%sClassPrivate", _tmp272_); + _tmp273_ = vala_ccode_variable_declarator_new (_tmp272_, NULL, NULL); _tmp274_ = _tmp273_; - _tmp275_ = vala_ccode_variable_declarator_new (_tmp274_, NULL, NULL); + _tmp275_ = vala_ccode_type_definition_new (_tmp267_, (ValaCCodeDeclarator*) _tmp274_); _tmp276_ = _tmp275_; - _tmp277_ = vala_ccode_type_definition_new (_tmp269_, (ValaCCodeDeclarator*) _tmp276_); - _tmp278_ = _tmp277_; - vala_ccode_file_add_type_declaration (_tmp264_, (ValaCCodeNode*) _tmp278_); - _vala_ccode_node_unref0 (_tmp278_); + vala_ccode_file_add_type_declaration (_tmp262_, (ValaCCodeNode*) _tmp276_); _vala_ccode_node_unref0 (_tmp276_); - _g_free0 (_tmp274_); + _vala_ccode_node_unref0 (_tmp274_); _g_free0 (_tmp272_); - _g_free0 (_tmp269_); - _tmp279_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp280_ = _tmp279_; - _tmp281_ = vala_code_context_require_glib_version (_tmp280_, 2, 24); - if (!_tmp281_) { - ValaCCodeDeclaration* _tmp282_; + _g_free0 (_tmp270_); + _g_free0 (_tmp267_); + _tmp277_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp278_ = _tmp277_; + _tmp279_ = vala_code_context_require_glib_version (_tmp278_, 2, 24); + if (!_tmp279_) { + ValaCCodeDeclaration* _tmp280_; ValaCCodeDeclaration* _cdecl_; - ValaCCodeDeclaration* _tmp283_; - ValaClass* _tmp284_; + ValaCCodeDeclaration* _tmp281_; + ValaClass* _tmp282_; + gchar* _tmp283_ = NULL; + gchar* _tmp284_; gchar* _tmp285_ = NULL; gchar* _tmp286_; - gchar* _tmp287_ = NULL; - gchar* _tmp288_; - ValaCCodeConstant* _tmp289_; - ValaCCodeConstant* _tmp290_; - ValaCCodeVariableDeclarator* _tmp291_; - ValaCCodeVariableDeclarator* _tmp292_; + ValaCCodeConstant* _tmp287_; + ValaCCodeConstant* _tmp288_; + ValaCCodeVariableDeclarator* _tmp289_; + ValaCCodeVariableDeclarator* _tmp290_; + ValaCCodeDeclaration* _tmp291_; + ValaCCodeFile* _tmp292_; ValaCCodeDeclaration* _tmp293_; - ValaCCodeFile* _tmp294_; - ValaCCodeDeclaration* _tmp295_; - _tmp282_ = vala_ccode_declaration_new ("GQuark"); - _cdecl_ = _tmp282_; - _tmp283_ = _cdecl_; - _tmp284_ = cl; - _tmp285_ = vala_ccode_base_module_get_ccode_lower_case_name ((ValaCodeNode*) _tmp284_, NULL); + _tmp280_ = vala_ccode_declaration_new ("GQuark"); + _cdecl_ = _tmp280_; + _tmp281_ = _cdecl_; + _tmp282_ = cl; + _tmp283_ = vala_ccode_base_module_get_ccode_lower_case_name ((ValaCodeNode*) _tmp282_, NULL); + _tmp284_ = _tmp283_; + _tmp285_ = g_strdup_printf ("_vala_%s_class_private_quark", _tmp284_); _tmp286_ = _tmp285_; - _tmp287_ = g_strdup_printf ("_vala_%s_class_private_quark", _tmp286_); + _tmp287_ = vala_ccode_constant_new ("0"); _tmp288_ = _tmp287_; - _tmp289_ = vala_ccode_constant_new ("0"); + _tmp289_ = vala_ccode_variable_declarator_new (_tmp286_, (ValaCCodeExpression*) _tmp288_, NULL); _tmp290_ = _tmp289_; - _tmp291_ = vala_ccode_variable_declarator_new (_tmp288_, (ValaCCodeExpression*) _tmp290_, NULL); - _tmp292_ = _tmp291_; - vala_ccode_declaration_add_declarator (_tmp283_, (ValaCCodeDeclarator*) _tmp292_); - _vala_ccode_node_unref0 (_tmp292_); + vala_ccode_declaration_add_declarator (_tmp281_, (ValaCCodeDeclarator*) _tmp290_); _vala_ccode_node_unref0 (_tmp290_); - _g_free0 (_tmp288_); + _vala_ccode_node_unref0 (_tmp288_); _g_free0 (_tmp286_); + _g_free0 (_tmp284_); + _tmp291_ = _cdecl_; + vala_ccode_declaration_set_modifiers (_tmp291_, VALA_CCODE_MODIFIERS_STATIC); + _tmp292_ = decl_space; _tmp293_ = _cdecl_; - vala_ccode_declaration_set_modifiers (_tmp293_, VALA_CCODE_MODIFIERS_STATIC); - _tmp294_ = decl_space; - _tmp295_ = _cdecl_; - vala_ccode_file_add_type_declaration (_tmp294_, (ValaCCodeNode*) _tmp295_); + vala_ccode_file_add_type_declaration (_tmp292_, (ValaCCodeNode*) _tmp293_); _vala_ccode_node_unref0 (_cdecl_); } } - _tmp297_ = cl; - _tmp298_ = vala_class_get_has_private_fields (_tmp297_); - _tmp299_ = _tmp298_; - if (_tmp299_) { - _tmp296_ = TRUE; + _tmp295_ = cl; + _tmp296_ = vala_class_get_has_private_fields (_tmp295_); + _tmp297_ = _tmp296_; + if (_tmp297_) { + _tmp294_ = TRUE; } else { - ValaClass* _tmp300_; - ValaList* _tmp301_ = NULL; - ValaList* _tmp302_; - gint _tmp303_; - gint _tmp304_; - _tmp300_ = cl; - _tmp301_ = vala_object_type_symbol_get_type_parameters ((ValaObjectTypeSymbol*) _tmp300_); + ValaClass* _tmp298_; + ValaList* _tmp299_ = NULL; + ValaList* _tmp300_; + gint _tmp301_; + gint _tmp302_; + _tmp298_ = cl; + _tmp299_ = vala_object_type_symbol_get_type_parameters ((ValaObjectTypeSymbol*) _tmp298_); + _tmp300_ = _tmp299_; + _tmp301_ = vala_collection_get_size ((ValaCollection*) _tmp300_); _tmp302_ = _tmp301_; - _tmp303_ = vala_collection_get_size ((ValaCollection*) _tmp302_); - _tmp304_ = _tmp303_; - _tmp296_ = _tmp304_ > 0; - _vala_iterable_unref0 (_tmp302_); - } - _tmp305_ = _tmp296_; - if (_tmp305_) { - ValaCCodeFile* _tmp306_; - ValaCCodeStruct* _tmp307_; - ValaClass* _tmp308_; - gchar* _tmp309_ = NULL; - gchar* _tmp310_; - ValaClass* _tmp311_; + _tmp294_ = _tmp302_ > 0; + _vala_iterable_unref0 (_tmp300_); + } + _tmp303_ = _tmp294_; + if (_tmp303_) { + ValaCCodeFile* _tmp304_; + ValaCCodeStruct* _tmp305_; + ValaClass* _tmp306_; + gchar* _tmp307_ = NULL; + gchar* _tmp308_; + ValaClass* _tmp309_; + gchar* _tmp310_ = NULL; + gchar* _tmp311_; gchar* _tmp312_ = NULL; gchar* _tmp313_; - gchar* _tmp314_ = NULL; - gchar* _tmp315_; gchar* macro; - ValaCCodeFile* _tmp316_; - ValaClass* _tmp317_; + ValaCCodeFile* _tmp314_; + ValaClass* _tmp315_; + gchar* _tmp316_ = NULL; + gchar* _tmp317_; gchar* _tmp318_ = NULL; gchar* _tmp319_; - gchar* _tmp320_ = NULL; - gchar* _tmp321_; - const gchar* _tmp322_; - ValaCCodeMacroReplacement* _tmp323_; - ValaCCodeMacroReplacement* _tmp324_; - _tmp306_ = decl_space; - _tmp307_ = instance_priv_struct; - vala_ccode_file_add_type_definition (_tmp306_, (ValaCCodeNode*) _tmp307_); - _tmp308_ = cl; - _tmp309_ = vala_ccode_base_module_get_ccode_type_id ((ValaCodeNode*) _tmp308_); - _tmp310_ = _tmp309_; - _tmp311_ = cl; - _tmp312_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp311_); + const gchar* _tmp320_; + ValaCCodeMacroReplacement* _tmp321_; + ValaCCodeMacroReplacement* _tmp322_; + _tmp304_ = decl_space; + _tmp305_ = instance_priv_struct; + vala_ccode_file_add_type_definition (_tmp304_, (ValaCCodeNode*) _tmp305_); + _tmp306_ = cl; + _tmp307_ = vala_ccode_base_module_get_ccode_type_id ((ValaCodeNode*) _tmp306_); + _tmp308_ = _tmp307_; + _tmp309_ = cl; + _tmp310_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp309_); + _tmp311_ = _tmp310_; + _tmp312_ = g_strdup_printf ("(G_TYPE_INSTANCE_GET_PRIVATE ((o), %s, %sPrivate))", _tmp308_, _tmp311_); _tmp313_ = _tmp312_; - _tmp314_ = g_strdup_printf ("(G_TYPE_INSTANCE_GET_PRIVATE ((o), %s, %sPrivate))", _tmp310_, _tmp313_); - _tmp315_ = _tmp314_; - _g_free0 (_tmp313_); - _g_free0 (_tmp310_); - macro = _tmp315_; - _tmp316_ = decl_space; - _tmp317_ = cl; - _tmp318_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp317_, NULL); + _g_free0 (_tmp311_); + _g_free0 (_tmp308_); + macro = _tmp313_; + _tmp314_ = decl_space; + _tmp315_ = cl; + _tmp316_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp315_, NULL); + _tmp317_ = _tmp316_; + _tmp318_ = g_strdup_printf ("%s_GET_PRIVATE(o)", _tmp317_); _tmp319_ = _tmp318_; - _tmp320_ = g_strdup_printf ("%s_GET_PRIVATE(o)", _tmp319_); - _tmp321_ = _tmp320_; - _tmp322_ = macro; - _tmp323_ = vala_ccode_macro_replacement_new (_tmp321_, _tmp322_); - _tmp324_ = _tmp323_; - vala_ccode_file_add_type_member_declaration (_tmp316_, (ValaCCodeNode*) _tmp324_); - _vala_ccode_node_unref0 (_tmp324_); - _g_free0 (_tmp321_); + _tmp320_ = macro; + _tmp321_ = vala_ccode_macro_replacement_new (_tmp319_, _tmp320_); + _tmp322_ = _tmp321_; + vala_ccode_file_add_type_member_declaration (_tmp314_, (ValaCCodeNode*) _tmp322_); + _vala_ccode_node_unref0 (_tmp322_); _g_free0 (_tmp319_); + _g_free0 (_tmp317_); _g_free0 (macro); } - _tmp326_ = cl; - _tmp327_ = vala_class_get_has_class_private_fields (_tmp326_); - _tmp328_ = _tmp327_; - if (_tmp328_) { - _tmp325_ = TRUE; + _tmp324_ = cl; + _tmp325_ = vala_class_get_has_class_private_fields (_tmp324_); + _tmp326_ = _tmp325_; + if (_tmp326_) { + _tmp323_ = TRUE; } else { - gboolean _tmp329_; - _tmp329_ = has_class_locks; - _tmp325_ = _tmp329_; - } - _tmp330_ = _tmp325_; - if (_tmp330_) { - ValaCCodeFile* _tmp331_; - ValaCCodeStruct* _tmp332_; + gboolean _tmp327_; + _tmp327_ = has_class_locks; + _tmp323_ = _tmp327_; + } + _tmp328_ = _tmp323_; + if (_tmp328_) { + ValaCCodeFile* _tmp329_; + ValaCCodeStruct* _tmp330_; gchar* macro = NULL; - ValaCodeContext* _tmp333_; - ValaCodeContext* _tmp334_; - gboolean _tmp335_ = FALSE; - ValaCCodeFile* _tmp350_; - ValaClass* _tmp351_; + ValaCodeContext* _tmp331_; + ValaCodeContext* _tmp332_; + gboolean _tmp333_ = FALSE; + ValaCCodeFile* _tmp348_; + ValaClass* _tmp349_; + gchar* _tmp350_ = NULL; + gchar* _tmp351_; gchar* _tmp352_ = NULL; gchar* _tmp353_; - gchar* _tmp354_ = NULL; - gchar* _tmp355_; - const gchar* _tmp356_; - ValaCCodeMacroReplacement* _tmp357_; - ValaCCodeMacroReplacement* _tmp358_; - _tmp331_ = decl_space; - _tmp332_ = type_priv_struct; - vala_ccode_file_add_type_member_declaration (_tmp331_, (ValaCCodeNode*) _tmp332_); - _tmp333_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp334_ = _tmp333_; - _tmp335_ = vala_code_context_require_glib_version (_tmp334_, 2, 24); - if (_tmp335_) { - ValaClass* _tmp336_; - gchar* _tmp337_ = NULL; - gchar* _tmp338_; - ValaClass* _tmp339_; + const gchar* _tmp354_; + ValaCCodeMacroReplacement* _tmp355_; + ValaCCodeMacroReplacement* _tmp356_; + _tmp329_ = decl_space; + _tmp330_ = type_priv_struct; + vala_ccode_file_add_type_member_declaration (_tmp329_, (ValaCCodeNode*) _tmp330_); + _tmp331_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp332_ = _tmp331_; + _tmp333_ = vala_code_context_require_glib_version (_tmp332_, 2, 24); + if (_tmp333_) { + ValaClass* _tmp334_; + gchar* _tmp335_ = NULL; + gchar* _tmp336_; + ValaClass* _tmp337_; + gchar* _tmp338_ = NULL; + gchar* _tmp339_; gchar* _tmp340_ = NULL; - gchar* _tmp341_; - gchar* _tmp342_ = NULL; - _tmp336_ = cl; - _tmp337_ = vala_ccode_base_module_get_ccode_type_id ((ValaCodeNode*) _tmp336_); - _tmp338_ = _tmp337_; - _tmp339_ = cl; - _tmp340_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp339_); - _tmp341_ = _tmp340_; - _tmp342_ = g_strdup_printf ("(G_TYPE_CLASS_GET_PRIVATE (klass, %s, %sClassPrivate))", _tmp338_, _tmp341_); + _tmp334_ = cl; + _tmp335_ = vala_ccode_base_module_get_ccode_type_id ((ValaCodeNode*) _tmp334_); + _tmp336_ = _tmp335_; + _tmp337_ = cl; + _tmp338_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp337_); + _tmp339_ = _tmp338_; + _tmp340_ = g_strdup_printf ("(G_TYPE_CLASS_GET_PRIVATE (klass, %s, %sClassPrivate))", _tmp336_, _tmp339_); _g_free0 (macro); - macro = _tmp342_; - _g_free0 (_tmp341_); - _g_free0 (_tmp338_); + macro = _tmp340_; + _g_free0 (_tmp339_); + _g_free0 (_tmp336_); } else { - ValaClass* _tmp343_; - gchar* _tmp344_ = NULL; - gchar* _tmp345_; - ValaClass* _tmp346_; + ValaClass* _tmp341_; + gchar* _tmp342_ = NULL; + gchar* _tmp343_; + ValaClass* _tmp344_; + gchar* _tmp345_ = NULL; + gchar* _tmp346_; gchar* _tmp347_ = NULL; - gchar* _tmp348_; - gchar* _tmp349_ = NULL; - _tmp343_ = cl; - _tmp344_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp343_); - _tmp345_ = _tmp344_; - _tmp346_ = cl; - _tmp347_ = vala_ccode_base_module_get_ccode_lower_case_name ((ValaCodeNode*) _tmp346_, NULL); - _tmp348_ = _tmp347_; - _tmp349_ = g_strdup_printf ("((%sClassPrivate *) g_type_get_qdata (G_TYPE_FROM_CLASS (klass), _vala" \ -"_%s_class_private_quark))", _tmp345_, _tmp348_); + _tmp341_ = cl; + _tmp342_ = vala_ccode_base_module_get_ccode_name ((ValaCodeNode*) _tmp341_); + _tmp343_ = _tmp342_; + _tmp344_ = cl; + _tmp345_ = vala_ccode_base_module_get_ccode_lower_case_name ((ValaCodeNode*) _tmp344_, NULL); + _tmp346_ = _tmp345_; + _tmp347_ = g_strdup_printf ("((%sClassPrivate *) g_type_get_qdata (G_TYPE_FROM_CLASS (klass), _vala" \ +"_%s_class_private_quark))", _tmp343_, _tmp346_); _g_free0 (macro); - macro = _tmp349_; - _g_free0 (_tmp348_); - _g_free0 (_tmp345_); - } - _tmp350_ = decl_space; - _tmp351_ = cl; - _tmp352_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp351_, NULL); + macro = _tmp347_; + _g_free0 (_tmp346_); + _g_free0 (_tmp343_); + } + _tmp348_ = decl_space; + _tmp349_ = cl; + _tmp350_ = vala_ccode_base_module_get_ccode_upper_case_name ((ValaSymbol*) _tmp349_, NULL); + _tmp351_ = _tmp350_; + _tmp352_ = g_strdup_printf ("%s_GET_CLASS_PRIVATE(klass)", _tmp351_); _tmp353_ = _tmp352_; - _tmp354_ = g_strdup_printf ("%s_GET_CLASS_PRIVATE(klass)", _tmp353_); - _tmp355_ = _tmp354_; - _tmp356_ = macro; - _tmp357_ = vala_ccode_macro_replacement_new (_tmp355_, _tmp356_); - _tmp358_ = _tmp357_; - vala_ccode_file_add_type_member_declaration (_tmp350_, (ValaCCodeNode*) _tmp358_); - _vala_ccode_node_unref0 (_tmp358_); - _g_free0 (_tmp355_); + _tmp354_ = macro; + _tmp355_ = vala_ccode_macro_replacement_new (_tmp353_, _tmp354_); + _tmp356_ = _tmp355_; + vala_ccode_file_add_type_member_declaration (_tmp348_, (ValaCCodeNode*) _tmp356_); + _vala_ccode_node_unref0 (_tmp356_); _g_free0 (_tmp353_); + _g_free0 (_tmp351_); _g_free0 (macro); } - _tmp359_ = decl_space; - _tmp360_ = ((ValaCCodeBaseModule*) self)->prop_enum; - vala_ccode_file_add_type_member_declaration (_tmp359_, (ValaCCodeNode*) _tmp360_); + _tmp357_ = decl_space; + _tmp358_ = ((ValaCCodeBaseModule*) self)->prop_enum; + vala_ccode_file_add_type_member_declaration (_tmp357_, (ValaCCodeNode*) _tmp358_); } else { - ValaClass* _tmp361_; - gboolean _tmp362_; - gboolean _tmp363_; - _tmp361_ = cl; - _tmp362_ = vala_class_get_has_private_fields (_tmp361_); - _tmp363_ = _tmp362_; - if (_tmp363_) { - ValaClass* _tmp364_; - ValaSourceReference* _tmp365_; - ValaSourceReference* _tmp366_; - _tmp364_ = cl; - _tmp365_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp364_); - _tmp366_ = _tmp365_; - vala_report_error (_tmp366_, "Private fields not supported in compact classes"); + ValaClass* _tmp359_; + gboolean _tmp360_; + gboolean _tmp361_; + _tmp359_ = cl; + _tmp360_ = vala_class_get_has_private_fields (_tmp359_); + _tmp361_ = _tmp360_; + if (_tmp361_) { + ValaClass* _tmp362_; + ValaSourceReference* _tmp363_; + ValaSourceReference* _tmp364_; + _tmp362_ = cl; + _tmp363_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp362_); + _tmp364_ = _tmp363_; + vala_report_error (_tmp364_, "Private fields not supported in compact classes"); } } _vala_ccode_node_unref0 (type_priv_struct); diff -Nru vala-0.16-0.15.1/codegen/valagtypemodule.vala vala-0.16-0.15.2/codegen/valagtypemodule.vala --- vala-0.16-0.15.1/codegen/valagtypemodule.vala 2011-10-03 09:19:41.000000000 +0000 +++ vala-0.16-0.15.2/codegen/valagtypemodule.vala 2012-02-09 18:32:59.000000000 +0000 @@ -338,7 +338,7 @@ var delegate_type = (DelegateType) f.variable_type; if (delegate_type.delegate_symbol.has_target) { // create field to store delegate target - instance_struct.add_field ("gpointer", get_delegate_target_cname (f.name)); + instance_struct.add_field ("gpointer", get_ccode_delegate_target_name (f)); if (delegate_type.value_owned) { instance_struct.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (f.name)); } @@ -444,7 +444,7 @@ var delegate_type = (DelegateType) f.variable_type; if (delegate_type.delegate_symbol.has_target) { // create field to store delegate target - instance_priv_struct.add_field ("gpointer", get_delegate_target_cname (f.name)); + instance_priv_struct.add_field ("gpointer", get_ccode_delegate_target_name (f)); if (delegate_type.value_owned) { instance_priv_struct.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (f.name)); } diff -Nru vala-0.16-0.15.1/compiler/Makefile.in vala-0.16-0.15.2/compiler/Makefile.in --- vala-0.16-0.15.1/compiler/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/compiler/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -57,8 +57,8 @@ am__DEPENDENCIES_1 = valac_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ../codegen/libvala@PACKAGE_SUFFIX@.la $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -70,21 +70,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(valac_SOURCES) DIST_SOURCES = $(valac_SOURCES) @@ -343,7 +343,7 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -valac$(EXEEXT): $(valac_OBJECTS) $(valac_DEPENDENCIES) +valac$(EXEEXT): $(valac_OBJECTS) $(valac_DEPENDENCIES) $(EXTRA_valac_DEPENDENCIES) @rm -f valac$(EXEEXT) $(AM_V_CCLD)$(LINK) $(valac_OBJECTS) $(valac_LDADD) $(LIBS) diff -Nru vala-0.16-0.15.1/compiler/valacompiler.c vala-0.16-0.15.2/compiler/valacompiler.c --- vala-0.16-0.15.1/compiler/valacompiler.c 2012-01-26 21:08:15.000000000 +0000 +++ vala-0.16-0.15.2/compiler/valacompiler.c 2012-02-25 16:22:52.000000000 +0000 @@ -204,7 +204,7 @@ ValaCompiler* vala_compiler_construct (GType object_type); static void _vala_array_add1 (gchar*** array, int* length, int* size, gchar* value); static Block1Data* block1_data_ref (Block1Data* _data1_); -static void block1_data_unref (Block1Data* _data1_); +static void block1_data_unref (void * _userdata_); static void ___lambda2_ (Block1Data* _data1_, GPid pid, gint status); static void ____lambda2__gchild_watch_func (GPid pid, gint status, gpointer self); static gint vala_compiler_main (gchar** args, int args_length1); @@ -2029,7 +2029,9 @@ } -static void block1_data_unref (Block1Data* _data1_) { +static void block1_data_unref (void * _userdata_) { + Block1Data* _data1_; + _data1_ = (Block1Data*) _userdata_; if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { _g_main_loop_unref0 (_data1_->loop); g_slice_free (Block1Data, _data1_); diff -Nru vala-0.16-0.15.1/configure vala-0.16-0.15.2/configure --- vala-0.16-0.15.1/configure 2012-01-26 21:07:36.000000000 +0000 +++ vala-0.16-0.15.2/configure 2012-02-25 16:17:42.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for vala 0.15.1. +# Generated by GNU Autoconf 2.68 for vala 0.15.2. # # Report bugs to . # @@ -569,8 +569,8 @@ # Identity of this package. PACKAGE_NAME='vala' PACKAGE_TARNAME='vala' -PACKAGE_VERSION='0.15.1' -PACKAGE_STRING='vala 0.15.1' +PACKAGE_VERSION='0.15.2' +PACKAGE_STRING='vala 0.15.2' PACKAGE_BUGREPORT='j@bitron.ch' PACKAGE_URL='' @@ -617,6 +617,8 @@ LIBOBJS AM_BACKSLASH AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V HAVE_XSLTPROC_FALSE HAVE_XSLTPROC_TRUE XSLTPROC @@ -1337,7 +1339,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 vala 0.15.1 to adapt to many kinds of systems. +\`configure' configures vala 0.15.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1407,7 +1409,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vala 0.15.1:";; + short | recursive ) echo "Configuration of vala 0.15.2:";; esac cat <<\_ACEOF @@ -1530,7 +1532,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vala configure 0.15.1 +vala configure 0.15.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1808,7 +1810,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vala $as_me 0.15.1, which was +It was created by vala $as_me 0.15.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2627,7 +2629,7 @@ # Define the identity of the package. PACKAGE='vala' - VERSION='0.15.1' + VERSION='0.15.2' cat >>confdefs.h <<_ACEOF @@ -2657,11 +2659,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -12207,6 +12209,33 @@ no) AM_DEFAULT_VERBOSITY=1;; *) AM_DEFAULT_VERBOSITY=0;; 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='\' @@ -12767,7 +12796,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vala $as_me 0.15.1, which was +This file was extended by vala $as_me 0.15.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12833,7 +12862,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vala config.status 0.15.1 +vala config.status 0.15.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru vala-0.16-0.15.1/debian/changelog vala-0.16-0.15.2/debian/changelog --- vala-0.16-0.15.1/debian/changelog 2012-01-26 22:28:12.000000000 +0000 +++ vala-0.16-0.15.2/debian/changelog 2012-02-28 19:21:52.000000000 +0000 @@ -1,3 +1,9 @@ +vala-0.16 (0.15.2-0ubuntu1) precise; urgency=low + + * New upstream release + + -- Rico Tzschichholz Tue, 28 Feb 2012 20:20:50 +0100 + vala-0.16 (0.15.1-0ubuntu2) precise; urgency=low * debian/libvala-0.16-dev.install: updated, upstream stopped installing diff -Nru vala-0.16-0.15.1/doc/Makefile.in vala-0.16-0.15.2/doc/Makefile.in --- vala-0.16-0.15.1/doc/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/doc/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -45,11 +45,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = diff -Nru vala-0.16-0.15.1/doc/vala/Makefile.in vala-0.16-0.15.2/doc/vala/Makefile.in --- vala-0.16-0.15.1/doc/vala/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/doc/vala/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -46,11 +46,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = diff -Nru vala-0.16-0.15.1/gee/Makefile.in vala-0.16-0.15.2/gee/Makefile.in --- vala-0.16-0.15.1/gee/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/gee/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -58,8 +58,8 @@ $(am__objects_1) am_libgee_la_OBJECTS = $(am__objects_2) $(am__objects_1) libgee_la_OBJECTS = $(am_libgee_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -71,21 +71,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgee_la_SOURCES) DIST_SOURCES = $(libgee_la_SOURCES) @@ -352,7 +352,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgee.la: $(libgee_la_OBJECTS) $(libgee_la_DEPENDENCIES) +libgee.la: $(libgee_la_OBJECTS) $(libgee_la_DEPENDENCIES) $(EXTRA_libgee_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libgee_la_OBJECTS) $(libgee_la_LIBADD) $(LIBS) mostlyclean-compile: diff -Nru vala-0.16-0.15.1/gobject-introspection/Makefile.in vala-0.16-0.15.2/gobject-introspection/Makefile.in --- vala-0.16-0.15.1/gobject-introspection/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/gobject-introspection/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -56,8 +56,8 @@ am_libgidl_la_OBJECTS = gidlmodule.lo gidlnode.lo gidlparser.lo \ gmetadata.lo $(am__objects_1) libgidl_la_OBJECTS = $(am_libgidl_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__installdirs = "$(DESTDIR)$(pkglibexecdir)" PROGRAMS = $(pkglibexec_PROGRAMS) @@ -78,36 +78,36 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; @MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ || LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS) LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS) -AM_V_LEX = $(am__v_LEX_$(V)) -am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY)) +AM_V_LEX = $(am__v_LEX_@AM_V@) +am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@) am__v_LEX_0 = @echo " LEX " $@; YLWRAP = $(top_srcdir)/build-aux/ylwrap @MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ || YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS) LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS) -AM_V_YACC = $(am__v_YACC_$(V)) -am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY)) +AM_V_YACC = $(am__v_YACC_@AM_V@) +am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) am__v_YACC_0 = @echo " YACC " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgidl_la_SOURCES) $(gen_introspect_SOURCES) DIST_SOURCES = $(libgidl_la_SOURCES) $(gen_introspect_SOURCES) @@ -344,7 +344,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libgidl.la: $(libgidl_la_OBJECTS) $(libgidl_la_DEPENDENCIES) +libgidl.la: $(libgidl_la_OBJECTS) $(libgidl_la_DEPENDENCIES) $(EXTRA_libgidl_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libgidl_la_OBJECTS) $(libgidl_la_LIBADD) $(LIBS) install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) @$(NORMAL_INSTALL) @@ -392,7 +392,7 @@ scannerparser.h: scannerparser.c @if test ! -f $@; then rm -f scannerparser.c; else :; fi @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) scannerparser.c; else :; fi -gen-introspect$(EXEEXT): $(gen_introspect_OBJECTS) $(gen_introspect_DEPENDENCIES) +gen-introspect$(EXEEXT): $(gen_introspect_OBJECTS) $(gen_introspect_DEPENDENCIES) $(EXTRA_gen_introspect_DEPENDENCIES) @rm -f gen-introspect$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gen_introspect_OBJECTS) $(gen_introspect_LDADD) $(LIBS) diff -Nru vala-0.16-0.15.1/Makefile.in vala-0.16-0.15.2/Makefile.in --- vala-0.16-0.15.1/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -54,11 +54,11 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libvala.pc CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -110,9 +110,11 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -649,6 +651,10 @@ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__remove_distdir) + dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) @@ -686,6 +692,8 @@ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -879,11 +887,11 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma 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-aclocalDATA install-am install-data \ + dist-gzip dist-hook dist-lzip dist-lzma 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-aclocalDATA 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 \ diff -Nru vala-0.16-0.15.1/NEWS vala-0.16-0.15.2/NEWS --- vala-0.16-0.15.1/NEWS 2012-01-26 21:04:44.000000000 +0000 +++ vala-0.16-0.15.2/NEWS 2012-02-25 16:14:37.000000000 +0000 @@ -1,3 +1,9 @@ +Vala 0.15.2 +=========== + + * Switch poppler-glib bindings to .gir. + * Many bug fixes and binding updates. + Vala 0.15.1 =========== diff -Nru vala-0.16-0.15.1/.tarball-version vala-0.16-0.15.2/.tarball-version --- vala-0.16-0.15.1/.tarball-version 2012-01-26 21:11:29.000000000 +0000 +++ vala-0.16-0.15.2/.tarball-version 2012-02-25 16:30:24.000000000 +0000 @@ -1 +1 @@ -0.15.1 +0.15.2 diff -Nru vala-0.16-0.15.1/tests/Makefile.am vala-0.16-0.15.2/tests/Makefile.am --- vala-0.16-0.15.1/tests/Makefile.am 2012-01-24 14:59:30.000000000 +0000 +++ vala-0.16-0.15.2/tests/Makefile.am 2012-02-09 18:32:59.000000000 +0000 @@ -12,7 +12,7 @@ noinst_PROGRAMS = \ $(NULL) -TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) $(srcdir)/testrunner.sh +TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(srcdir)/testrunner.sh TESTS = \ basic-types/integers.vala \ @@ -84,6 +84,7 @@ structs/bug660426.vala \ structs/bug661945.vala \ structs/bug667890.vala \ + structs/bug669580.vala \ delegates/delegates.vala \ delegates/bug539166.vala \ delegates/bug595610.vala \ @@ -168,7 +169,7 @@ $(NULL) check-TESTS: $(TESTS) - @EXEEXT=$(EXEEXT) $(srcdir)/testrunner.sh $(TESTS) + @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(srcdir)/testrunner.sh $(TESTS) EXTRA_DIST = \ testrunner.sh \ diff -Nru vala-0.16-0.15.1/tests/Makefile.in vala-0.16-0.15.2/tests/Makefile.in --- vala-0.16-0.15.1/tests/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/tests/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -68,13 +68,14 @@ structs/bug654753.vala structs/bug656693.vala \ structs/bug657378.vala structs/bug658048.vala \ structs/bug660426.vala structs/bug661945.vala \ - structs/bug667890.vala delegates/delegates.vala \ - delegates/bug539166.vala delegates/bug595610.vala \ - delegates/bug595639.vala delegates/bug638415.vala \ - delegates/bug639751.vala objects/classes.vala \ - objects/fields.vala objects/interfaces.vala \ - objects/methods.vala objects/properties.vala \ - objects/regex.vala objects/signals.vala objects/test-025.vala \ + structs/bug667890.vala structs/bug669580.vala \ + delegates/delegates.vala delegates/bug539166.vala \ + delegates/bug595610.vala delegates/bug595639.vala \ + delegates/bug638415.vala delegates/bug639751.vala \ + objects/classes.vala objects/fields.vala \ + objects/interfaces.vala objects/methods.vala \ + objects/properties.vala objects/regex.vala \ + objects/signals.vala objects/test-025.vala \ objects/test-026.vala objects/test-029.vala \ objects/test-034.vala objects/bug566909.vala \ objects/bug588203.vala objects/bug589928.vala \ @@ -122,11 +123,11 @@ CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = PROGRAMS = $(noinst_PROGRAMS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -284,7 +285,7 @@ BUILT_SOURCES = \ $(NULL) -TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) $(srcdir)/testrunner.sh +TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(srcdir)/testrunner.sh EXTRA_DIST = \ testrunner.sh \ $(TESTS) \ @@ -497,7 +498,7 @@ check-TESTS: $(TESTS) - @EXEEXT=$(EXEEXT) $(srcdir)/testrunner.sh $(TESTS) + @EXEEXT=$(EXEEXT) EXEEXT=$(EXEEXT) CFLAGS='$(CFLAGS)' CPPFLAGS='$(CPPFLAGS)' LDFLAGS='$(LDFLAGS)' $(srcdir)/testrunner.sh $(TESTS) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru vala-0.16-0.15.1/tests/objects/properties.vala vala-0.16-0.15.2/tests/objects/properties.vala --- vala-0.16-0.15.1/tests/objects/properties.vala 2011-06-14 11:30:14.000000000 +0000 +++ vala-0.16-0.15.2/tests/objects/properties.vala 2012-02-09 18:32:59.000000000 +0000 @@ -2,6 +2,15 @@ public delegate void Delegate (); +public struct RealStruct { + public int field; +} + +public class NonPrivAccess : Object { + [NoAccessorMethod] + public RealStruct real_struct { get; set; } +} + public class Sample : Object { private string automatic { get; set; } @@ -62,6 +71,10 @@ stdout.printf (" 3\n"); + var nonpriv = new NonPrivAccess (); + nonpriv.real_struct = { 10 }; + assert (nonpriv.real_struct.field == 10); + return 0; } } diff -Nru vala-0.16-0.15.1/tests/structs/bug669580.vala vala-0.16-0.15.2/tests/structs/bug669580.vala --- vala-0.16-0.15.1/tests/structs/bug669580.vala 1970-01-01 00:00:00.000000000 +0000 +++ vala-0.16-0.15.2/tests/structs/bug669580.vala 2012-02-09 18:32:59.000000000 +0000 @@ -0,0 +1,10 @@ +struct Foo { + int i; +} + +struct Bar : Foo { +} + +void main() { + Bar bar = { 0 }; +} diff -Nru vala-0.16-0.15.1/tests/testrunner.sh vala-0.16-0.15.2/tests/testrunner.sh --- vala-0.16-0.15.1/tests/testrunner.sh 2011-06-09 11:43:49.000000000 +0000 +++ vala-0.16-0.15.2/tests/testrunner.sh 2012-02-09 18:32:59.000000000 +0000 @@ -33,6 +33,12 @@ VAPIGEN=$topbuilddir/vapigen/vapigen VAPIGENFLAGS="--vapidir $vapidir" +# Incorporate the user's CFLAGS. Matters if the user decided to insert +# -m32 in CFLAGS, for example. +for cflag in ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do + VALAFLAGS="${VALAFLAGS} -X ${cflag}" +done + function testheader() { if [ "$1" = "Packages:" ]; then shift diff -Nru vala-0.16-0.15.1/vala/Makefile.in vala-0.16-0.15.2/vala/Makefile.in --- vala-0.16-0.15.1/vala/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/vala/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -111,8 +111,8 @@ $(am__objects_1) am_libvalacore_la_OBJECTS = $(am__objects_2) $(am__objects_1) libvalacore_la_OBJECTS = $(am_libvalacore_la_OBJECTS) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp @@ -124,21 +124,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libvalacore_la_SOURCES) DIST_SOURCES = $(libvalacore_la_SOURCES) @@ -546,7 +546,7 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libvalacore.la: $(libvalacore_la_OBJECTS) $(libvalacore_la_DEPENDENCIES) +libvalacore.la: $(libvalacore_la_OBJECTS) $(libvalacore_la_DEPENDENCIES) $(EXTRA_libvalacore_la_DEPENDENCIES) $(AM_V_CCLD)$(LINK) $(libvalacore_la_OBJECTS) $(libvalacore_la_LIBADD) $(LIBS) mostlyclean-compile: diff -Nru vala-0.16-0.15.1/vala/valagirparser.c vala-0.16-0.15.2/vala/valagirparser.c --- vala-0.16-0.15.1/vala/valagirparser.c 2012-01-26 21:08:40.000000000 +0000 +++ vala-0.16-0.15.2/vala/valagirparser.c 2012-02-25 16:21:45.000000000 +0000 @@ -1414,7 +1414,8 @@ VALA_GIR_PARSER_ARGUMENT_TYPE_CLOSURE, VALA_GIR_PARSER_ARGUMENT_TYPE_CPREFIX, VALA_GIR_PARSER_ARGUMENT_TYPE_LOWER_CASE_CPREFIX, - VALA_GIR_PARSER_ARGUMENT_TYPE_ERRORDOMAIN + VALA_GIR_PARSER_ARGUMENT_TYPE_ERRORDOMAIN, + VALA_GIR_PARSER_ARGUMENT_TYPE_DESTROYS_INSTANCE } ValaGirParserArgumentType; struct _ValaGirParserNode { @@ -2478,7 +2479,7 @@ static GType vala_gir_parser_argument_type_get_type (void) { static volatile gsize vala_gir_parser_argument_type_type_id__volatile = 0; if (g_once_init_enter (&vala_gir_parser_argument_type_type_id__volatile)) { - static const GEnumValue values[] = {{VALA_GIR_PARSER_ARGUMENT_TYPE_SKIP, "VALA_GIR_PARSER_ARGUMENT_TYPE_SKIP", "skip"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_HIDDEN, "VALA_GIR_PARSER_ARGUMENT_TYPE_HIDDEN", "hidden"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE, "VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE", "type"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE_ARGUMENTS, "VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE_ARGUMENTS", "type-arguments"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME, "VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME", "cheader-filename"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_NAME, "VALA_GIR_PARSER_ARGUMENT_TYPE_NAME", "name"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_OWNED, "VALA_GIR_PARSER_ARGUMENT_TYPE_OWNED", "owned"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_UNOWNED, "VALA_GIR_PARSER_ARGUMENT_TYPE_UNOWNED", "unowned"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_PARENT, "VALA_GIR_PARSER_ARGUMENT_TYPE_PARENT", "parent"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_NULLABLE, "VALA_GIR_PARSER_ARGUMENT_TYPE_NULLABLE", "nullable"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED, "VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED", "deprecated"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT, "VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT", "replacement"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE, "VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE", "deprecated-since"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY, "VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY", "array"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_IDX, "VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_IDX", "array-length-idx"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_DEFAULT, "VALA_GIR_PARSER_ARGUMENT_TYPE_DEFAULT", "default"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_OUT, "VALA_GIR_PARSER_ARGUMENT_TYPE_OUT", "out"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_REF, "VALA_GIR_PARSER_ARGUMENT_TYPE_REF", "ref"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME, "VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME", "vfunc-name"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_VIRTUAL, "VALA_GIR_PARSER_ARGUMENT_TYPE_VIRTUAL", "virtual"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ABSTRACT, "VALA_GIR_PARSER_ARGUMENT_TYPE_ABSTRACT", "abstract"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_SCOPE, "VALA_GIR_PARSER_ARGUMENT_TYPE_SCOPE", "scope"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_STRUCT, "VALA_GIR_PARSER_ARGUMENT_TYPE_STRUCT", "struct"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_THROWS, "VALA_GIR_PARSER_ARGUMENT_TYPE_THROWS", "throws"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_PRINTF_FORMAT, "VALA_GIR_PARSER_ARGUMENT_TYPE_PRINTF_FORMAT", "printf-format"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD, "VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD", "array-length-field"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_SENTINEL, "VALA_GIR_PARSER_ARGUMENT_TYPE_SENTINEL", "sentinel"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_CLOSURE, "VALA_GIR_PARSER_ARGUMENT_TYPE_CLOSURE", "closure"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_CPREFIX, "VALA_GIR_PARSER_ARGUMENT_TYPE_CPREFIX", "cprefix"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_LOWER_CASE_CPREFIX, "VALA_GIR_PARSER_ARGUMENT_TYPE_LOWER_CASE_CPREFIX", "lower-case-cprefix"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ERRORDOMAIN, "VALA_GIR_PARSER_ARGUMENT_TYPE_ERRORDOMAIN", "errordomain"}, {0, NULL, NULL}}; + static const GEnumValue values[] = {{VALA_GIR_PARSER_ARGUMENT_TYPE_SKIP, "VALA_GIR_PARSER_ARGUMENT_TYPE_SKIP", "skip"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_HIDDEN, "VALA_GIR_PARSER_ARGUMENT_TYPE_HIDDEN", "hidden"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE, "VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE", "type"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE_ARGUMENTS, "VALA_GIR_PARSER_ARGUMENT_TYPE_TYPE_ARGUMENTS", "type-arguments"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME, "VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME", "cheader-filename"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_NAME, "VALA_GIR_PARSER_ARGUMENT_TYPE_NAME", "name"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_OWNED, "VALA_GIR_PARSER_ARGUMENT_TYPE_OWNED", "owned"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_UNOWNED, "VALA_GIR_PARSER_ARGUMENT_TYPE_UNOWNED", "unowned"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_PARENT, "VALA_GIR_PARSER_ARGUMENT_TYPE_PARENT", "parent"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_NULLABLE, "VALA_GIR_PARSER_ARGUMENT_TYPE_NULLABLE", "nullable"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED, "VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED", "deprecated"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT, "VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT", "replacement"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE, "VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE", "deprecated-since"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY, "VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY", "array"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_IDX, "VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_IDX", "array-length-idx"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_DEFAULT, "VALA_GIR_PARSER_ARGUMENT_TYPE_DEFAULT", "default"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_OUT, "VALA_GIR_PARSER_ARGUMENT_TYPE_OUT", "out"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_REF, "VALA_GIR_PARSER_ARGUMENT_TYPE_REF", "ref"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME, "VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME", "vfunc-name"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_VIRTUAL, "VALA_GIR_PARSER_ARGUMENT_TYPE_VIRTUAL", "virtual"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ABSTRACT, "VALA_GIR_PARSER_ARGUMENT_TYPE_ABSTRACT", "abstract"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_SCOPE, "VALA_GIR_PARSER_ARGUMENT_TYPE_SCOPE", "scope"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_STRUCT, "VALA_GIR_PARSER_ARGUMENT_TYPE_STRUCT", "struct"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_THROWS, "VALA_GIR_PARSER_ARGUMENT_TYPE_THROWS", "throws"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_PRINTF_FORMAT, "VALA_GIR_PARSER_ARGUMENT_TYPE_PRINTF_FORMAT", "printf-format"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD, "VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD", "array-length-field"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_SENTINEL, "VALA_GIR_PARSER_ARGUMENT_TYPE_SENTINEL", "sentinel"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_CLOSURE, "VALA_GIR_PARSER_ARGUMENT_TYPE_CLOSURE", "closure"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_CPREFIX, "VALA_GIR_PARSER_ARGUMENT_TYPE_CPREFIX", "cprefix"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_LOWER_CASE_CPREFIX, "VALA_GIR_PARSER_ARGUMENT_TYPE_LOWER_CASE_CPREFIX", "lower-case-cprefix"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_ERRORDOMAIN, "VALA_GIR_PARSER_ARGUMENT_TYPE_ERRORDOMAIN", "errordomain"}, {VALA_GIR_PARSER_ARGUMENT_TYPE_DESTROYS_INSTANCE, "VALA_GIR_PARSER_ARGUMENT_TYPE_DESTROYS_INSTANCE", "destroys-instance"}, {0, NULL, NULL}}; GType vala_gir_parser_argument_type_type_id; vala_gir_parser_argument_type_type_id = g_enum_register_static ("ValaGirParserArgumentType", values); g_once_init_leave (&vala_gir_parser_argument_type_type_id__volatile, vala_gir_parser_argument_type_type_id); @@ -4572,7 +4573,7 @@ e = _inner_error_; _inner_error_ = NULL; _tmp3_ = e->message; - g_error ("valagirparser.vala:1455: Unable to compile regex: %s", _tmp3_); + g_error ("valagirparser.vala:1459: Unable to compile regex: %s", _tmp3_); _g_error_free0 (e); } __finally4: @@ -9700,6 +9701,12 @@ gboolean _tmp103_ = FALSE; const gchar* _tmp104_; gboolean _tmp107_; + ValaGirParserNode* _tmp112_; + ValaMap* _tmp113_; + gpointer _tmp114_ = NULL; + gchar* _tmp115_; + const gchar* _tmp116_; + gboolean _tmp117_; _tmp98_ = self->priv->current; _tmp99_ = _tmp98_->parent; _tmp100_ = _tmp99_->symbol; @@ -9733,34 +9740,27 @@ _tmp110_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp109_); _tmp111_ = _tmp110_; vala_code_node_set_attribute ((ValaCodeNode*) _tmp108_, "NoWrapper", TRUE, _tmp111_); - } else { - ValaGirParserNode* _tmp112_; - ValaMap* _tmp113_; - gpointer _tmp114_ = NULL; - gchar* _tmp115_; - const gchar* _tmp116_; - gboolean _tmp117_; - _tmp112_ = self->priv->current; - _tmp113_ = _tmp112_->girdata; - _tmp114_ = vala_map_get (_tmp113_, "name"); - _tmp115_ = (gchar*) _tmp114_; - _tmp116_ = name; - _tmp117_ = g_strcmp0 (_tmp115_, _tmp116_) != 0; - _g_free0 (_tmp115_); - if (_tmp117_) { - ValaMethod* _tmp118_; - ValaGirParserNode* _tmp119_; - ValaMap* _tmp120_; - gpointer _tmp121_ = NULL; - gchar* _tmp122_; - _tmp118_ = m; - _tmp119_ = self->priv->current; - _tmp120_ = _tmp119_->girdata; - _tmp121_ = vala_map_get (_tmp120_, "name"); - _tmp122_ = (gchar*) _tmp121_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp118_, "CCode", "vfunc_name", _tmp122_, NULL); - _g_free0 (_tmp122_); - } + } + _tmp112_ = self->priv->current; + _tmp113_ = _tmp112_->girdata; + _tmp114_ = vala_map_get (_tmp113_, "name"); + _tmp115_ = (gchar*) _tmp114_; + _tmp116_ = name; + _tmp117_ = g_strcmp0 (_tmp115_, _tmp116_) != 0; + _g_free0 (_tmp115_); + if (_tmp117_) { + ValaMethod* _tmp118_; + ValaGirParserNode* _tmp119_; + ValaMap* _tmp120_; + gpointer _tmp121_ = NULL; + gchar* _tmp122_; + _tmp118_ = m; + _tmp119_ = self->priv->current; + _tmp120_ = _tmp119_->girdata; + _tmp121_ = vala_map_get (_tmp120_, "name"); + _tmp122_ = (gchar*) _tmp121_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp118_, "CCode", "vfunc_name", _tmp122_, NULL); + _g_free0 (_tmp122_); } } else { const gchar* _tmp123_; @@ -17006,11 +17006,11 @@ ValaSymbol* _tmp2_; gboolean _tmp6_; ValaMap* _tmp65_; - gboolean _tmp730_ = FALSE; - gboolean _tmp731_ = FALSE; - gboolean _tmp732_; - gboolean _tmp734_; + gboolean _tmp733_ = FALSE; + gboolean _tmp734_ = FALSE; + gboolean _tmp735_; gboolean _tmp737_; + gboolean _tmp740_; g_return_if_fail (self != NULL); g_return_if_fail (parser != NULL); _tmp0_ = self->processed; @@ -17224,35 +17224,35 @@ _tmp65_ = self->girdata; if (_tmp65_ != NULL) { ValaSymbol* _tmp66_; - ValaGirParserMetadata* _tmp655_; - gboolean _tmp656_ = FALSE; - ValaGirParserMetadata* _tmp661_; - gboolean _tmp662_ = FALSE; - ValaGirParserMetadata* _tmp675_; - gboolean _tmp676_ = FALSE; - ValaGirParserNode* _tmp678_; - ValaSymbol* _tmp679_; - gchar* _tmp689_ = NULL; - gchar* _tmp690_; - gchar* _tmp691_ = NULL; - gchar* _tmp692_; - gboolean _tmp693_; - gchar* _tmp697_ = NULL; - gchar* _tmp698_; - gchar* _tmp699_ = NULL; - gchar* _tmp700_; - gboolean _tmp701_; - gchar* _tmp709_ = NULL; - gchar* _tmp710_; - gchar* _tmp711_ = NULL; - gchar* _tmp712_; - gboolean _tmp713_; - gboolean _tmp717_ = FALSE; - gboolean _tmp718_ = FALSE; - ValaSymbol* _tmp719_; + ValaGirParserMetadata* _tmp658_; + gboolean _tmp659_ = FALSE; + ValaGirParserMetadata* _tmp664_; + gboolean _tmp665_ = FALSE; + ValaGirParserMetadata* _tmp678_; + gboolean _tmp679_ = FALSE; + ValaGirParserNode* _tmp681_; + ValaSymbol* _tmp682_; + gchar* _tmp692_ = NULL; + gchar* _tmp693_; + gchar* _tmp694_ = NULL; + gchar* _tmp695_; + gboolean _tmp696_; + gchar* _tmp700_ = NULL; + gchar* _tmp701_; + gchar* _tmp702_ = NULL; + gchar* _tmp703_; + gboolean _tmp704_; + gchar* _tmp712_ = NULL; + gchar* _tmp713_; + gchar* _tmp714_ = NULL; + gchar* _tmp715_; + gboolean _tmp716_; gboolean _tmp720_ = FALSE; - gboolean _tmp722_; - gboolean _tmp726_; + gboolean _tmp721_ = FALSE; + ValaSymbol* _tmp722_; + gboolean _tmp723_ = FALSE; + gboolean _tmp725_; + gboolean _tmp729_; _tmp66_ = self->symbol; if (VALA_IS_METHOD (_tmp66_)) { ValaSymbol* _tmp67_; @@ -17264,9 +17264,9 @@ ValaArrayList* _tmp72_ = NULL; ValaArrayList* colliding; ValaMethod* _tmp178_; - ValaMethod* _tmp193_; - gboolean _tmp194_; - gboolean _tmp195_; + ValaMethod* _tmp196_; + gboolean _tmp197_; + gboolean _tmp198_; _tmp67_ = self->symbol; _tmp68_ = _vala_code_node_ref0 (VALA_METHOD (_tmp67_)); m = _tmp68_; @@ -17590,377 +17590,386 @@ if (!VALA_IS_CREATION_METHOD (_tmp178_)) { ValaGirParserMetadata* _tmp179_; gboolean _tmp180_ = FALSE; + ValaGirParserMetadata* _tmp182_; + gboolean _tmp183_ = FALSE; _tmp179_ = self->metadata; - _tmp180_ = vala_gir_parser_metadata_has_argument (_tmp179_, VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME); + _tmp180_ = vala_gir_parser_metadata_has_argument (_tmp179_, VALA_GIR_PARSER_ARGUMENT_TYPE_DESTROYS_INSTANCE); if (_tmp180_) { - ValaGirParserNode* _tmp181_; - ValaGirParserMetadata* _tmp182_; - gchar* _tmp183_ = NULL; - gchar* _tmp184_; - ValaGirParserNode* _tmp185_ = NULL; - ValaGirParserNode* _tmp186_; + ValaMethod* _tmp181_; + _tmp181_ = m; + vala_code_node_set_attribute ((ValaCodeNode*) _tmp181_, "DestroysInstance", TRUE, NULL); + } + _tmp182_ = self->metadata; + _tmp183_ = vala_gir_parser_metadata_has_argument (_tmp182_, VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME); + if (_tmp183_) { + ValaGirParserNode* _tmp184_; + ValaGirParserMetadata* _tmp185_; + gchar* _tmp186_ = NULL; + gchar* _tmp187_; + ValaGirParserNode* _tmp188_ = NULL; + ValaGirParserNode* _tmp189_; ValaGirParserNode* vfunc; - gboolean _tmp187_ = FALSE; - ValaGirParserNode* _tmp188_; - gboolean _tmp190_; - _tmp181_ = self->parent; - _tmp182_ = self->metadata; - _tmp183_ = vala_gir_parser_metadata_get_string (_tmp182_, VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME); - _tmp184_ = _tmp183_; - _tmp185_ = vala_gir_parser_node_lookup (_tmp181_, _tmp184_, FALSE, NULL); - _tmp186_ = _tmp185_; - _g_free0 (_tmp184_); - vfunc = _tmp186_; - _tmp188_ = vfunc; - if (_tmp188_ != NULL) { - ValaGirParserNode* _tmp189_; - _tmp189_ = vfunc; - _tmp187_ = _tmp189_ != self; - } else { - _tmp187_ = FALSE; - } - _tmp190_ = _tmp187_; - if (_tmp190_) { - ValaGirParserNode* _tmp191_; + gboolean _tmp190_ = FALSE; + ValaGirParserNode* _tmp191_; + gboolean _tmp193_; + _tmp184_ = self->parent; + _tmp185_ = self->metadata; + _tmp186_ = vala_gir_parser_metadata_get_string (_tmp185_, VALA_GIR_PARSER_ARGUMENT_TYPE_VFUNC_NAME); + _tmp187_ = _tmp186_; + _tmp188_ = vala_gir_parser_node_lookup (_tmp184_, _tmp187_, FALSE, NULL); + _tmp189_ = _tmp188_; + _g_free0 (_tmp187_); + vfunc = _tmp189_; + _tmp191_ = vfunc; + if (_tmp191_ != NULL) { ValaGirParserNode* _tmp192_; - _tmp191_ = vfunc; - _tmp191_->processed = TRUE; _tmp192_ = vfunc; - _tmp192_->merged = TRUE; + _tmp190_ = _tmp192_ != self; + } else { + _tmp190_ = FALSE; + } + _tmp193_ = _tmp190_; + if (_tmp193_) { + ValaGirParserNode* _tmp194_; + ValaGirParserNode* _tmp195_; + _tmp194_ = vfunc; + _tmp194_->processed = TRUE; + _tmp195_ = vfunc; + _tmp195_->merged = TRUE; } _vala_gir_parser_node_unref0 (vfunc); } } - _tmp193_ = m; - _tmp194_ = vala_method_get_coroutine (_tmp193_); - _tmp195_ = _tmp194_; - if (_tmp195_) { - ValaGirParser* _tmp196_; - _tmp196_ = parser; - vala_gir_parser_process_async_method (_tmp196_, self); + _tmp196_ = m; + _tmp197_ = vala_method_get_coroutine (_tmp196_); + _tmp198_ = _tmp197_; + if (_tmp198_) { + ValaGirParser* _tmp199_; + _tmp199_ = parser; + vala_gir_parser_process_async_method (_tmp199_, self); } _vala_iterable_unref0 (colliding); _vala_code_node_unref0 (m); } else { - ValaSymbol* _tmp197_; - _tmp197_ = self->symbol; - if (VALA_IS_PROPERTY (_tmp197_)) { - ValaGirParserNode* _tmp198_; - const gchar* _tmp199_; - ValaArrayList* _tmp200_ = NULL; + ValaSymbol* _tmp200_; + _tmp200_ = self->symbol; + if (VALA_IS_PROPERTY (_tmp200_)) { + ValaGirParserNode* _tmp201_; + const gchar* _tmp202_; + ValaArrayList* _tmp203_ = NULL; ValaArrayList* colliding; - ValaSymbol* _tmp219_; - ValaProperty* _tmp220_; + ValaSymbol* _tmp222_; + ValaProperty* _tmp223_; ValaProperty* prop; - ValaMap* _tmp221_; - gpointer _tmp222_ = NULL; + ValaMap* _tmp224_; + gpointer _tmp225_ = NULL; gchar* readable; - ValaMap* _tmp223_; - gpointer _tmp224_ = NULL; + ValaMap* _tmp226_; + gpointer _tmp227_ = NULL; gchar* writable; - ValaMap* _tmp225_; - gpointer _tmp226_ = NULL; + ValaMap* _tmp228_; + gpointer _tmp229_ = NULL; gchar* construct_; - ValaMap* _tmp227_; - gpointer _tmp228_ = NULL; + ValaMap* _tmp230_; + gpointer _tmp231_ = NULL; gchar* construct_only; - const gchar* _tmp229_; - gboolean _tmp238_ = FALSE; - const gchar* _tmp239_; - gboolean _tmp241_; + const gchar* _tmp232_; + gboolean _tmp241_ = FALSE; + const gchar* _tmp242_; + gboolean _tmp244_; ValaGirParserNode* getter; - ValaGirParserNode* _tmp258_; - const gchar* _tmp259_; - gchar* _tmp260_ = NULL; - gchar* _tmp261_; - ValaArrayList* _tmp262_ = NULL; - ValaArrayList* _tmp263_; + ValaGirParserNode* _tmp261_; + const gchar* _tmp262_; + gchar* _tmp263_ = NULL; + gchar* _tmp264_; + ValaArrayList* _tmp265_ = NULL; + ValaArrayList* _tmp266_; ValaArrayList* getters; - ValaArrayList* _tmp264_; + ValaArrayList* _tmp267_; ValaGirParserNode* setter; - ValaGirParserNode* _tmp296_; - const gchar* _tmp297_; - gchar* _tmp298_ = NULL; - gchar* _tmp299_; - ValaArrayList* _tmp300_ = NULL; - ValaArrayList* _tmp301_; + ValaGirParserNode* _tmp299_; + const gchar* _tmp300_; + gchar* _tmp301_ = NULL; + gchar* _tmp302_; + ValaArrayList* _tmp303_ = NULL; + ValaArrayList* _tmp304_; ValaArrayList* setters; - ValaArrayList* _tmp302_; - ValaProperty* _tmp334_; - ValaProperty* _tmp335_; - ValaPropertyAccessor* _tmp336_; - ValaPropertyAccessor* _tmp337_; - gboolean _tmp401_ = FALSE; - gboolean _tmp402_ = FALSE; - ValaProperty* _tmp403_; - ValaAttribute* _tmp404_ = NULL; - ValaAttribute* _tmp405_; - gboolean _tmp406_; - gboolean _tmp410_; - gboolean _tmp416_; - ValaProperty* _tmp467_; - ValaAttribute* _tmp468_ = NULL; - ValaAttribute* _tmp469_; - gboolean _tmp470_; - _tmp198_ = self->parent; - _tmp199_ = self->name; - _tmp200_ = vala_gir_parser_node_lookup_all (_tmp198_, _tmp199_); - colliding = _tmp200_; + ValaArrayList* _tmp305_; + ValaProperty* _tmp337_; + ValaProperty* _tmp338_; + ValaPropertyAccessor* _tmp339_; + ValaPropertyAccessor* _tmp340_; + gboolean _tmp404_ = FALSE; + gboolean _tmp405_ = FALSE; + ValaProperty* _tmp406_; + ValaAttribute* _tmp407_ = NULL; + ValaAttribute* _tmp408_; + gboolean _tmp409_; + gboolean _tmp413_; + gboolean _tmp419_; + ValaProperty* _tmp470_; + ValaAttribute* _tmp471_ = NULL; + ValaAttribute* _tmp472_; + gboolean _tmp473_; + _tmp201_ = self->parent; + _tmp202_ = self->name; + _tmp203_ = vala_gir_parser_node_lookup_all (_tmp201_, _tmp202_); + colliding = _tmp203_; { - ValaArrayList* _tmp201_; - ValaArrayList* _tmp202_; + ValaArrayList* _tmp204_; + ValaArrayList* _tmp205_; ValaArrayList* _node_list; - ValaArrayList* _tmp203_; - gint _tmp204_; - gint _tmp205_; + ValaArrayList* _tmp206_; + gint _tmp207_; + gint _tmp208_; gint _node_size; gint _node_index; - _tmp201_ = colliding; - _tmp202_ = _vala_iterable_ref0 (_tmp201_); - _node_list = _tmp202_; - _tmp203_ = _node_list; - _tmp204_ = vala_collection_get_size ((ValaCollection*) _tmp203_); - _tmp205_ = _tmp204_; - _node_size = _tmp205_; + _tmp204_ = colliding; + _tmp205_ = _vala_iterable_ref0 (_tmp204_); + _node_list = _tmp205_; + _tmp206_ = _node_list; + _tmp207_ = vala_collection_get_size ((ValaCollection*) _tmp206_); + _tmp208_ = _tmp207_; + _node_size = _tmp208_; _node_index = -1; while (TRUE) { - gint _tmp206_; - gint _tmp207_; - gint _tmp208_; - ValaArrayList* _tmp209_; + gint _tmp209_; gint _tmp210_; - gpointer _tmp211_ = NULL; + gint _tmp211_; + ValaArrayList* _tmp212_; + gint _tmp213_; + gpointer _tmp214_ = NULL; ValaGirParserNode* node; - ValaGirParserNode* _tmp212_; - ValaSymbol* _tmp213_; - _tmp206_ = _node_index; - _node_index = _tmp206_ + 1; - _tmp207_ = _node_index; - _tmp208_ = _node_size; - if (!(_tmp207_ < _tmp208_)) { + ValaGirParserNode* _tmp215_; + ValaSymbol* _tmp216_; + _tmp209_ = _node_index; + _node_index = _tmp209_ + 1; + _tmp210_ = _node_index; + _tmp211_ = _node_size; + if (!(_tmp210_ < _tmp211_)) { break; } - _tmp209_ = _node_list; - _tmp210_ = _node_index; - _tmp211_ = vala_list_get ((ValaList*) _tmp209_, _tmp210_); - node = (ValaGirParserNode*) _tmp211_; - _tmp212_ = node; - _tmp213_ = _tmp212_->symbol; - if (VALA_IS_SIGNAL (_tmp213_)) { - ValaGirParserNode* _tmp214_; - ValaGirParserNode* _tmp215_; - _tmp214_ = node; - _tmp214_->processed = TRUE; - _tmp215_ = node; - _tmp215_->merged = TRUE; + _tmp212_ = _node_list; + _tmp213_ = _node_index; + _tmp214_ = vala_list_get ((ValaList*) _tmp212_, _tmp213_); + node = (ValaGirParserNode*) _tmp214_; + _tmp215_ = node; + _tmp216_ = _tmp215_->symbol; + if (VALA_IS_SIGNAL (_tmp216_)) { + ValaGirParserNode* _tmp217_; + ValaGirParserNode* _tmp218_; + _tmp217_ = node; + _tmp217_->processed = TRUE; + _tmp218_ = node; + _tmp218_->merged = TRUE; } else { - ValaGirParserNode* _tmp216_; - ValaSymbol* _tmp217_; - _tmp216_ = node; - _tmp217_ = _tmp216_->symbol; - if (VALA_IS_METHOD (_tmp217_)) { - ValaGirParserNode* _tmp218_; - _tmp218_ = node; - _tmp218_->merged = TRUE; + ValaGirParserNode* _tmp219_; + ValaSymbol* _tmp220_; + _tmp219_ = node; + _tmp220_ = _tmp219_->symbol; + if (VALA_IS_METHOD (_tmp220_)) { + ValaGirParserNode* _tmp221_; + _tmp221_ = node; + _tmp221_->merged = TRUE; } } _vala_gir_parser_node_unref0 (node); } _vala_iterable_unref0 (_node_list); } - _tmp219_ = self->symbol; - _tmp220_ = _vala_code_node_ref0 (VALA_PROPERTY (_tmp219_)); - prop = _tmp220_; - _tmp221_ = self->girdata; - _tmp222_ = vala_map_get (_tmp221_, "readable"); - readable = (gchar*) _tmp222_; - _tmp223_ = self->girdata; - _tmp224_ = vala_map_get (_tmp223_, "writable"); - writable = (gchar*) _tmp224_; - _tmp225_ = self->girdata; - _tmp226_ = vala_map_get (_tmp225_, "construct"); - construct_ = (gchar*) _tmp226_; - _tmp227_ = self->girdata; - _tmp228_ = vala_map_get (_tmp227_, "construct-only"); - construct_only = (gchar*) _tmp228_; - _tmp229_ = readable; - if (g_strcmp0 (_tmp229_, "0") != 0) { - ValaProperty* _tmp230_; - ValaProperty* _tmp231_; - ValaDataType* _tmp232_; - ValaDataType* _tmp233_; - ValaDataType* _tmp234_ = NULL; + _tmp222_ = self->symbol; + _tmp223_ = _vala_code_node_ref0 (VALA_PROPERTY (_tmp222_)); + prop = _tmp223_; + _tmp224_ = self->girdata; + _tmp225_ = vala_map_get (_tmp224_, "readable"); + readable = (gchar*) _tmp225_; + _tmp226_ = self->girdata; + _tmp227_ = vala_map_get (_tmp226_, "writable"); + writable = (gchar*) _tmp227_; + _tmp228_ = self->girdata; + _tmp229_ = vala_map_get (_tmp228_, "construct"); + construct_ = (gchar*) _tmp229_; + _tmp230_ = self->girdata; + _tmp231_ = vala_map_get (_tmp230_, "construct-only"); + construct_only = (gchar*) _tmp231_; + _tmp232_ = readable; + if (g_strcmp0 (_tmp232_, "0") != 0) { + ValaProperty* _tmp233_; + ValaProperty* _tmp234_; ValaDataType* _tmp235_; - ValaPropertyAccessor* _tmp236_; - ValaPropertyAccessor* _tmp237_; - _tmp230_ = prop; - _tmp231_ = prop; - _tmp232_ = vala_property_get_property_type (_tmp231_); - _tmp233_ = _tmp232_; - _tmp234_ = vala_data_type_copy (_tmp233_); - _tmp235_ = _tmp234_; - _tmp236_ = vala_property_accessor_new (TRUE, FALSE, FALSE, _tmp235_, NULL, NULL, NULL); - _tmp237_ = _tmp236_; - vala_property_set_get_accessor (_tmp230_, _tmp237_); - _vala_code_node_unref0 (_tmp237_); - _vala_code_node_unref0 (_tmp235_); - } - _tmp239_ = writable; - if (g_strcmp0 (_tmp239_, "1") == 0) { - _tmp238_ = TRUE; + ValaDataType* _tmp236_; + ValaDataType* _tmp237_ = NULL; + ValaDataType* _tmp238_; + ValaPropertyAccessor* _tmp239_; + ValaPropertyAccessor* _tmp240_; + _tmp233_ = prop; + _tmp234_ = prop; + _tmp235_ = vala_property_get_property_type (_tmp234_); + _tmp236_ = _tmp235_; + _tmp237_ = vala_data_type_copy (_tmp236_); + _tmp238_ = _tmp237_; + _tmp239_ = vala_property_accessor_new (TRUE, FALSE, FALSE, _tmp238_, NULL, NULL, NULL); + _tmp240_ = _tmp239_; + vala_property_set_get_accessor (_tmp233_, _tmp240_); + _vala_code_node_unref0 (_tmp240_); + _vala_code_node_unref0 (_tmp238_); + } + _tmp242_ = writable; + if (g_strcmp0 (_tmp242_, "1") == 0) { + _tmp241_ = TRUE; } else { - const gchar* _tmp240_; - _tmp240_ = construct_only; - _tmp238_ = g_strcmp0 (_tmp240_, "1") == 0; - } - _tmp241_ = _tmp238_; - if (_tmp241_) { - gboolean _tmp242_ = FALSE; const gchar* _tmp243_; + _tmp243_ = construct_only; + _tmp241_ = g_strcmp0 (_tmp243_, "1") == 0; + } + _tmp244_ = _tmp241_; + if (_tmp244_) { gboolean _tmp245_ = FALSE; const gchar* _tmp246_; - ValaProperty* _tmp248_; - gboolean _tmp249_; - gboolean _tmp250_; + gboolean _tmp248_ = FALSE; + const gchar* _tmp249_; ValaProperty* _tmp251_; - ValaDataType* _tmp252_; - ValaDataType* _tmp253_; - ValaDataType* _tmp254_ = NULL; + gboolean _tmp252_; + gboolean _tmp253_; + ValaProperty* _tmp254_; ValaDataType* _tmp255_; - ValaPropertyAccessor* _tmp256_; - ValaPropertyAccessor* _tmp257_; - _tmp243_ = construct_only; - if (g_strcmp0 (_tmp243_, "1") != 0) { - const gchar* _tmp244_; - _tmp244_ = writable; - _tmp242_ = g_strcmp0 (_tmp244_, "1") == 0; - } else { - _tmp242_ = FALSE; - } + ValaDataType* _tmp256_; + ValaDataType* _tmp257_ = NULL; + ValaDataType* _tmp258_; + ValaPropertyAccessor* _tmp259_; + ValaPropertyAccessor* _tmp260_; _tmp246_ = construct_only; - if (g_strcmp0 (_tmp246_, "1") == 0) { - _tmp245_ = TRUE; - } else { + if (g_strcmp0 (_tmp246_, "1") != 0) { const gchar* _tmp247_; - _tmp247_ = construct_; + _tmp247_ = writable; _tmp245_ = g_strcmp0 (_tmp247_, "1") == 0; + } else { + _tmp245_ = FALSE; + } + _tmp249_ = construct_only; + if (g_strcmp0 (_tmp249_, "1") == 0) { + _tmp248_ = TRUE; + } else { + const gchar* _tmp250_; + _tmp250_ = construct_; + _tmp248_ = g_strcmp0 (_tmp250_, "1") == 0; } - _tmp248_ = prop; - _tmp249_ = _tmp242_; - _tmp250_ = _tmp245_; _tmp251_ = prop; - _tmp252_ = vala_property_get_property_type (_tmp251_); - _tmp253_ = _tmp252_; - _tmp254_ = vala_data_type_copy (_tmp253_); - _tmp255_ = _tmp254_; - _tmp256_ = vala_property_accessor_new (FALSE, _tmp249_, _tmp250_, _tmp255_, NULL, NULL, NULL); - _tmp257_ = _tmp256_; - vala_property_set_set_accessor (_tmp248_, _tmp257_); - _vala_code_node_unref0 (_tmp257_); - _vala_code_node_unref0 (_tmp255_); + _tmp252_ = _tmp245_; + _tmp253_ = _tmp248_; + _tmp254_ = prop; + _tmp255_ = vala_property_get_property_type (_tmp254_); + _tmp256_ = _tmp255_; + _tmp257_ = vala_data_type_copy (_tmp256_); + _tmp258_ = _tmp257_; + _tmp259_ = vala_property_accessor_new (FALSE, _tmp252_, _tmp253_, _tmp258_, NULL, NULL, NULL); + _tmp260_ = _tmp259_; + vala_property_set_set_accessor (_tmp251_, _tmp260_); + _vala_code_node_unref0 (_tmp260_); + _vala_code_node_unref0 (_tmp258_); } getter = NULL; - _tmp258_ = self->parent; - _tmp259_ = self->name; - _tmp260_ = g_strdup_printf ("get_%s", _tmp259_); - _tmp261_ = _tmp260_; - _tmp262_ = vala_gir_parser_node_lookup_all (_tmp258_, _tmp261_); - _tmp263_ = _tmp262_; - _g_free0 (_tmp261_); - getters = _tmp263_; - _tmp264_ = getters; - if (_tmp264_ != NULL) { + _tmp261_ = self->parent; + _tmp262_ = self->name; + _tmp263_ = g_strdup_printf ("get_%s", _tmp262_); + _tmp264_ = _tmp263_; + _tmp265_ = vala_gir_parser_node_lookup_all (_tmp261_, _tmp264_); + _tmp266_ = _tmp265_; + _g_free0 (_tmp264_); + getters = _tmp266_; + _tmp267_ = getters; + if (_tmp267_ != NULL) { { - ValaArrayList* _tmp265_; - ValaArrayList* _tmp266_; + ValaArrayList* _tmp268_; + ValaArrayList* _tmp269_; ValaArrayList* _g_list; - ValaArrayList* _tmp267_; - gint _tmp268_; - gint _tmp269_; + ValaArrayList* _tmp270_; + gint _tmp271_; + gint _tmp272_; gint _g_size; gint _g_index; - _tmp265_ = getters; - _tmp266_ = _vala_iterable_ref0 (_tmp265_); - _g_list = _tmp266_; - _tmp267_ = _g_list; - _tmp268_ = vala_collection_get_size ((ValaCollection*) _tmp267_); - _tmp269_ = _tmp268_; - _g_size = _tmp269_; + _tmp268_ = getters; + _tmp269_ = _vala_iterable_ref0 (_tmp268_); + _g_list = _tmp269_; + _tmp270_ = _g_list; + _tmp271_ = vala_collection_get_size ((ValaCollection*) _tmp270_); + _tmp272_ = _tmp271_; + _g_size = _tmp272_; _g_index = -1; while (TRUE) { - gint _tmp270_; - gint _tmp271_; - gint _tmp272_; - ValaArrayList* _tmp273_; + gint _tmp273_; gint _tmp274_; - gpointer _tmp275_ = NULL; + gint _tmp275_; + ValaArrayList* _tmp276_; + gint _tmp277_; + gpointer _tmp278_ = NULL; ValaGirParserNode* g; - gboolean _tmp276_ = FALSE; - gboolean _tmp277_ = FALSE; - ValaGirParserNode* _tmp278_; - gboolean _tmp281_; - gboolean _tmp293_; - _tmp270_ = _g_index; - _g_index = _tmp270_ + 1; - _tmp271_ = _g_index; - _tmp272_ = _g_size; - if (!(_tmp271_ < _tmp272_)) { + gboolean _tmp279_ = FALSE; + gboolean _tmp280_ = FALSE; + ValaGirParserNode* _tmp281_; + gboolean _tmp284_; + gboolean _tmp296_; + _tmp273_ = _g_index; + _g_index = _tmp273_ + 1; + _tmp274_ = _g_index; + _tmp275_ = _g_size; + if (!(_tmp274_ < _tmp275_)) { break; } - _tmp273_ = _g_list; - _tmp274_ = _g_index; - _tmp275_ = vala_list_get ((ValaList*) _tmp273_, _tmp274_); - g = (ValaGirParserNode*) _tmp275_; - _tmp278_ = getter; - if (_tmp278_ == NULL) { - _tmp277_ = TRUE; + _tmp276_ = _g_list; + _tmp277_ = _g_index; + _tmp278_ = vala_list_get ((ValaList*) _tmp276_, _tmp277_); + g = (ValaGirParserNode*) _tmp278_; + _tmp281_ = getter; + if (_tmp281_ == NULL) { + _tmp280_ = TRUE; } else { - ValaGirParserNode* _tmp279_; - gboolean _tmp280_; - _tmp279_ = g; - _tmp280_ = _tmp279_->merged; - _tmp277_ = !_tmp280_; - } - _tmp281_ = _tmp277_; - if (_tmp281_) { ValaGirParserNode* _tmp282_; - gchar* _tmp283_ = NULL; - gchar* _tmp284_; + gboolean _tmp283_; + _tmp282_ = g; + _tmp283_ = _tmp282_->merged; + _tmp280_ = !_tmp283_; + } + _tmp284_ = _tmp280_; + if (_tmp284_) { ValaGirParserNode* _tmp285_; gchar* _tmp286_ = NULL; gchar* _tmp287_; - gchar* _tmp288_; - gchar* _tmp289_; - const gchar* _tmp290_; + ValaGirParserNode* _tmp288_; + gchar* _tmp289_ = NULL; + gchar* _tmp290_; gchar* _tmp291_; gchar* _tmp292_; - _tmp282_ = g; - _tmp283_ = vala_gir_parser_node_get_cname (_tmp282_); - _tmp284_ = _tmp283_; - _tmp285_ = self->parent; - _tmp286_ = vala_gir_parser_node_get_lower_case_cprefix (_tmp285_); + const gchar* _tmp293_; + gchar* _tmp294_; + gchar* _tmp295_; + _tmp285_ = g; + _tmp286_ = vala_gir_parser_node_get_cname (_tmp285_); _tmp287_ = _tmp286_; - _tmp288_ = g_strconcat (_tmp287_, "get_", NULL); - _tmp289_ = _tmp288_; - _tmp290_ = self->name; - _tmp291_ = g_strconcat (_tmp289_, _tmp290_, NULL); + _tmp288_ = self->parent; + _tmp289_ = vala_gir_parser_node_get_lower_case_cprefix (_tmp288_); + _tmp290_ = _tmp289_; + _tmp291_ = g_strconcat (_tmp290_, "get_", NULL); _tmp292_ = _tmp291_; - _tmp276_ = g_strcmp0 (_tmp284_, _tmp292_) == 0; + _tmp293_ = self->name; + _tmp294_ = g_strconcat (_tmp292_, _tmp293_, NULL); + _tmp295_ = _tmp294_; + _tmp279_ = g_strcmp0 (_tmp287_, _tmp295_) == 0; + _g_free0 (_tmp295_); _g_free0 (_tmp292_); - _g_free0 (_tmp289_); + _g_free0 (_tmp290_); _g_free0 (_tmp287_); - _g_free0 (_tmp284_); } else { - _tmp276_ = FALSE; + _tmp279_ = FALSE; } - _tmp293_ = _tmp276_; - if (_tmp293_) { - ValaGirParserNode* _tmp294_; - ValaGirParserNode* _tmp295_; - _tmp294_ = g; - _tmp295_ = _vala_gir_parser_node_ref0 (_tmp294_); + _tmp296_ = _tmp279_; + if (_tmp296_) { + ValaGirParserNode* _tmp297_; + ValaGirParserNode* _tmp298_; + _tmp297_ = g; + _tmp298_ = _vala_gir_parser_node_ref0 (_tmp297_); _vala_gir_parser_node_unref0 (getter); - getter = _tmp295_; + getter = _tmp298_; } _vala_gir_parser_node_unref0 (g); } @@ -17968,517 +17977,517 @@ } } setter = NULL; - _tmp296_ = self->parent; - _tmp297_ = self->name; - _tmp298_ = g_strdup_printf ("set_%s", _tmp297_); - _tmp299_ = _tmp298_; - _tmp300_ = vala_gir_parser_node_lookup_all (_tmp296_, _tmp299_); - _tmp301_ = _tmp300_; - _g_free0 (_tmp299_); - setters = _tmp301_; - _tmp302_ = setters; - if (_tmp302_ != NULL) { + _tmp299_ = self->parent; + _tmp300_ = self->name; + _tmp301_ = g_strdup_printf ("set_%s", _tmp300_); + _tmp302_ = _tmp301_; + _tmp303_ = vala_gir_parser_node_lookup_all (_tmp299_, _tmp302_); + _tmp304_ = _tmp303_; + _g_free0 (_tmp302_); + setters = _tmp304_; + _tmp305_ = setters; + if (_tmp305_ != NULL) { { - ValaArrayList* _tmp303_; - ValaArrayList* _tmp304_; + ValaArrayList* _tmp306_; + ValaArrayList* _tmp307_; ValaArrayList* _s_list; - ValaArrayList* _tmp305_; - gint _tmp306_; - gint _tmp307_; + ValaArrayList* _tmp308_; + gint _tmp309_; + gint _tmp310_; gint _s_size; gint _s_index; - _tmp303_ = setters; - _tmp304_ = _vala_iterable_ref0 (_tmp303_); - _s_list = _tmp304_; - _tmp305_ = _s_list; - _tmp306_ = vala_collection_get_size ((ValaCollection*) _tmp305_); - _tmp307_ = _tmp306_; - _s_size = _tmp307_; + _tmp306_ = setters; + _tmp307_ = _vala_iterable_ref0 (_tmp306_); + _s_list = _tmp307_; + _tmp308_ = _s_list; + _tmp309_ = vala_collection_get_size ((ValaCollection*) _tmp308_); + _tmp310_ = _tmp309_; + _s_size = _tmp310_; _s_index = -1; while (TRUE) { - gint _tmp308_; - gint _tmp309_; - gint _tmp310_; - ValaArrayList* _tmp311_; + gint _tmp311_; gint _tmp312_; - gpointer _tmp313_ = NULL; + gint _tmp313_; + ValaArrayList* _tmp314_; + gint _tmp315_; + gpointer _tmp316_ = NULL; ValaGirParserNode* s; - gboolean _tmp314_ = FALSE; - gboolean _tmp315_ = FALSE; - ValaGirParserNode* _tmp316_; - gboolean _tmp319_; - gboolean _tmp331_; - _tmp308_ = _s_index; - _s_index = _tmp308_ + 1; - _tmp309_ = _s_index; - _tmp310_ = _s_size; - if (!(_tmp309_ < _tmp310_)) { + gboolean _tmp317_ = FALSE; + gboolean _tmp318_ = FALSE; + ValaGirParserNode* _tmp319_; + gboolean _tmp322_; + gboolean _tmp334_; + _tmp311_ = _s_index; + _s_index = _tmp311_ + 1; + _tmp312_ = _s_index; + _tmp313_ = _s_size; + if (!(_tmp312_ < _tmp313_)) { break; } - _tmp311_ = _s_list; - _tmp312_ = _s_index; - _tmp313_ = vala_list_get ((ValaList*) _tmp311_, _tmp312_); - s = (ValaGirParserNode*) _tmp313_; - _tmp316_ = setter; - if (_tmp316_ == NULL) { - _tmp315_ = TRUE; + _tmp314_ = _s_list; + _tmp315_ = _s_index; + _tmp316_ = vala_list_get ((ValaList*) _tmp314_, _tmp315_); + s = (ValaGirParserNode*) _tmp316_; + _tmp319_ = setter; + if (_tmp319_ == NULL) { + _tmp318_ = TRUE; } else { - ValaGirParserNode* _tmp317_; - gboolean _tmp318_; - _tmp317_ = s; - _tmp318_ = _tmp317_->merged; - _tmp315_ = !_tmp318_; - } - _tmp319_ = _tmp315_; - if (_tmp319_) { ValaGirParserNode* _tmp320_; - gchar* _tmp321_ = NULL; - gchar* _tmp322_; + gboolean _tmp321_; + _tmp320_ = s; + _tmp321_ = _tmp320_->merged; + _tmp318_ = !_tmp321_; + } + _tmp322_ = _tmp318_; + if (_tmp322_) { ValaGirParserNode* _tmp323_; gchar* _tmp324_ = NULL; gchar* _tmp325_; - gchar* _tmp326_; - gchar* _tmp327_; - const gchar* _tmp328_; + ValaGirParserNode* _tmp326_; + gchar* _tmp327_ = NULL; + gchar* _tmp328_; gchar* _tmp329_; gchar* _tmp330_; - _tmp320_ = s; - _tmp321_ = vala_gir_parser_node_get_cname (_tmp320_); - _tmp322_ = _tmp321_; - _tmp323_ = self->parent; - _tmp324_ = vala_gir_parser_node_get_lower_case_cprefix (_tmp323_); + const gchar* _tmp331_; + gchar* _tmp332_; + gchar* _tmp333_; + _tmp323_ = s; + _tmp324_ = vala_gir_parser_node_get_cname (_tmp323_); _tmp325_ = _tmp324_; - _tmp326_ = g_strconcat (_tmp325_, "set_", NULL); - _tmp327_ = _tmp326_; - _tmp328_ = self->name; - _tmp329_ = g_strconcat (_tmp327_, _tmp328_, NULL); + _tmp326_ = self->parent; + _tmp327_ = vala_gir_parser_node_get_lower_case_cprefix (_tmp326_); + _tmp328_ = _tmp327_; + _tmp329_ = g_strconcat (_tmp328_, "set_", NULL); _tmp330_ = _tmp329_; - _tmp314_ = g_strcmp0 (_tmp322_, _tmp330_) == 0; + _tmp331_ = self->name; + _tmp332_ = g_strconcat (_tmp330_, _tmp331_, NULL); + _tmp333_ = _tmp332_; + _tmp317_ = g_strcmp0 (_tmp325_, _tmp333_) == 0; + _g_free0 (_tmp333_); _g_free0 (_tmp330_); - _g_free0 (_tmp327_); + _g_free0 (_tmp328_); _g_free0 (_tmp325_); - _g_free0 (_tmp322_); } else { - _tmp314_ = FALSE; + _tmp317_ = FALSE; } - _tmp331_ = _tmp314_; - if (_tmp331_) { - ValaGirParserNode* _tmp332_; - ValaGirParserNode* _tmp333_; - _tmp332_ = s; - _tmp333_ = _vala_gir_parser_node_ref0 (_tmp332_); + _tmp334_ = _tmp317_; + if (_tmp334_) { + ValaGirParserNode* _tmp335_; + ValaGirParserNode* _tmp336_; + _tmp335_ = s; + _tmp336_ = _vala_gir_parser_node_ref0 (_tmp335_); _vala_gir_parser_node_unref0 (setter); - setter = _tmp333_; + setter = _tmp336_; } _vala_gir_parser_node_unref0 (s); } _vala_iterable_unref0 (_s_list); } } - _tmp334_ = prop; - vala_code_node_set_attribute ((ValaCodeNode*) _tmp334_, "NoAccessorMethod", FALSE, NULL); - _tmp335_ = prop; - _tmp336_ = vala_property_get_get_accessor (_tmp335_); - _tmp337_ = _tmp336_; - if (_tmp337_ != NULL) { - ValaMethod* _tmp338_ = NULL; - ValaGirParserNode* _tmp339_; - ValaMethod* _tmp342_; - ValaMethod* _tmp343_; - ValaMethod* m; - gboolean _tmp344_ = FALSE; + _tmp337_ = prop; + vala_code_node_set_attribute ((ValaCodeNode*) _tmp337_, "NoAccessorMethod", FALSE, NULL); + _tmp338_ = prop; + _tmp339_ = vala_property_get_get_accessor (_tmp338_); + _tmp340_ = _tmp339_; + if (_tmp340_ != NULL) { + ValaMethod* _tmp341_ = NULL; + ValaGirParserNode* _tmp342_; ValaMethod* _tmp345_; - gboolean _tmp359_; - _tmp339_ = getter; - if (_tmp339_ != NULL) { - ValaGirParserNode* _tmp340_; - ValaSymbol* _tmp341_; - _tmp340_ = getter; - _tmp341_ = _tmp340_->symbol; - _tmp338_ = VALA_IS_METHOD (_tmp341_) ? ((ValaMethod*) _tmp341_) : NULL; + ValaMethod* _tmp346_; + ValaMethod* m; + gboolean _tmp347_ = FALSE; + ValaMethod* _tmp348_; + gboolean _tmp362_; + _tmp342_ = getter; + if (_tmp342_ != NULL) { + ValaGirParserNode* _tmp343_; + ValaSymbol* _tmp344_; + _tmp343_ = getter; + _tmp344_ = _tmp343_->symbol; + _tmp341_ = VALA_IS_METHOD (_tmp344_) ? ((ValaMethod*) _tmp344_) : NULL; } else { - _tmp338_ = NULL; + _tmp341_ = NULL; } - _tmp342_ = _tmp338_; - _tmp343_ = _vala_code_node_ref0 (_tmp342_); - m = _tmp343_; - _tmp345_ = m; - if (_tmp345_ != NULL) { - gboolean _tmp346_ = FALSE; - gboolean _tmp347_ = FALSE; - ValaMethod* _tmp348_; - gboolean _tmp349_; - gboolean _tmp350_; - gboolean _tmp354_; - gboolean _tmp358_; - _tmp348_ = m; - _tmp349_ = vala_method_get_is_abstract (_tmp348_); - _tmp350_ = _tmp349_; - if (_tmp350_) { - _tmp347_ = TRUE; + _tmp345_ = _tmp341_; + _tmp346_ = _vala_code_node_ref0 (_tmp345_); + m = _tmp346_; + _tmp348_ = m; + if (_tmp348_ != NULL) { + gboolean _tmp349_ = FALSE; + gboolean _tmp350_ = FALSE; + ValaMethod* _tmp351_; + gboolean _tmp352_; + gboolean _tmp353_; + gboolean _tmp357_; + gboolean _tmp361_; + _tmp351_ = m; + _tmp352_ = vala_method_get_is_abstract (_tmp351_); + _tmp353_ = _tmp352_; + if (_tmp353_) { + _tmp350_ = TRUE; } else { - ValaMethod* _tmp351_; - gboolean _tmp352_; - gboolean _tmp353_; - _tmp351_ = m; - _tmp352_ = vala_method_get_is_virtual (_tmp351_); - _tmp353_ = _tmp352_; - _tmp347_ = _tmp353_; + ValaMethod* _tmp354_; + gboolean _tmp355_; + gboolean _tmp356_; + _tmp354_ = m; + _tmp355_ = vala_method_get_is_virtual (_tmp354_); + _tmp356_ = _tmp355_; + _tmp350_ = _tmp356_; } - _tmp354_ = _tmp347_; - if (_tmp354_) { - _tmp346_ = TRUE; + _tmp357_ = _tmp350_; + if (_tmp357_) { + _tmp349_ = TRUE; } else { - ValaProperty* _tmp355_; - gboolean _tmp356_; - gboolean _tmp357_; - _tmp355_ = prop; - _tmp356_ = vala_property_get_is_abstract (_tmp355_); - _tmp357_ = _tmp356_; - _tmp346_ = !_tmp357_; + ValaProperty* _tmp358_; + gboolean _tmp359_; + gboolean _tmp360_; + _tmp358_ = prop; + _tmp359_ = vala_property_get_is_abstract (_tmp358_); + _tmp360_ = _tmp359_; + _tmp349_ = !_tmp360_; } - _tmp358_ = _tmp346_; - _tmp344_ = _tmp358_; + _tmp361_ = _tmp349_; + _tmp347_ = _tmp361_; } else { - _tmp344_ = FALSE; + _tmp347_ = FALSE; } - _tmp359_ = _tmp344_; - if (_tmp359_) { - ValaGirParserNode* _tmp360_; - ValaGirParser* _tmp361_; - gboolean _tmp362_ = FALSE; - ValaMethod* _tmp363_; - ValaDataType* _tmp364_; - ValaDataType* _tmp365_; - gboolean _tmp371_; - _tmp360_ = getter; - _tmp361_ = parser; - vala_gir_parser_node_process (_tmp360_, _tmp361_); - _tmp363_ = m; - _tmp364_ = vala_method_get_return_type (_tmp363_); - _tmp365_ = _tmp364_; - if (VALA_IS_VOID_TYPE (_tmp365_)) { - _tmp362_ = TRUE; + _tmp362_ = _tmp347_; + if (_tmp362_) { + ValaGirParserNode* _tmp363_; + ValaGirParser* _tmp364_; + gboolean _tmp365_ = FALSE; + ValaMethod* _tmp366_; + ValaDataType* _tmp367_; + ValaDataType* _tmp368_; + gboolean _tmp374_; + _tmp363_ = getter; + _tmp364_ = parser; + vala_gir_parser_node_process (_tmp363_, _tmp364_); + _tmp366_ = m; + _tmp367_ = vala_method_get_return_type (_tmp366_); + _tmp368_ = _tmp367_; + if (VALA_IS_VOID_TYPE (_tmp368_)) { + _tmp365_ = TRUE; } else { - ValaMethod* _tmp366_; - ValaList* _tmp367_ = NULL; - ValaList* _tmp368_; - gint _tmp369_; - gint _tmp370_; - _tmp366_ = m; - _tmp367_ = vala_method_get_parameters (_tmp366_); - _tmp368_ = _tmp367_; - _tmp369_ = vala_collection_get_size ((ValaCollection*) _tmp368_); - _tmp370_ = _tmp369_; - _tmp362_ = _tmp370_ != 0; - _vala_iterable_unref0 (_tmp368_); + ValaMethod* _tmp369_; + ValaList* _tmp370_ = NULL; + ValaList* _tmp371_; + gint _tmp372_; + gint _tmp373_; + _tmp369_ = m; + _tmp370_ = vala_method_get_parameters (_tmp369_); + _tmp371_ = _tmp370_; + _tmp372_ = vala_collection_get_size ((ValaCollection*) _tmp371_); + _tmp373_ = _tmp372_; + _tmp365_ = _tmp373_ != 0; + _vala_iterable_unref0 (_tmp371_); } - _tmp371_ = _tmp362_; - if (_tmp371_) { - ValaProperty* _tmp372_; - _tmp372_ = prop; - vala_code_node_set_attribute ((ValaCodeNode*) _tmp372_, "NoAccessorMethod", TRUE, NULL); + _tmp374_ = _tmp365_; + if (_tmp374_) { + ValaProperty* _tmp375_; + _tmp375_ = prop; + vala_code_node_set_attribute ((ValaCodeNode*) _tmp375_, "NoAccessorMethod", TRUE, NULL); } else { - ValaGirParserNode* _tmp373_; - const gchar* _tmp374_; - const gchar* _tmp375_; - ValaProperty* _tmp390_; - ValaPropertyAccessor* _tmp391_; - ValaPropertyAccessor* _tmp392_; - ValaDataType* _tmp393_; - ValaDataType* _tmp394_; - ValaMethod* _tmp395_; + ValaGirParserNode* _tmp376_; + const gchar* _tmp377_; + const gchar* _tmp378_; + ValaProperty* _tmp393_; + ValaPropertyAccessor* _tmp394_; + ValaPropertyAccessor* _tmp395_; ValaDataType* _tmp396_; ValaDataType* _tmp397_; - gboolean _tmp398_; - gboolean _tmp399_; - _tmp373_ = getter; - _tmp374_ = _tmp373_->name; - _tmp375_ = self->name; - if (g_strcmp0 (_tmp374_, _tmp375_) == 0) { + ValaMethod* _tmp398_; + ValaDataType* _tmp399_; + ValaDataType* _tmp400_; + gboolean _tmp401_; + gboolean _tmp402_; + _tmp376_ = getter; + _tmp377_ = _tmp376_->name; + _tmp378_ = self->name; + if (g_strcmp0 (_tmp377_, _tmp378_) == 0) { { - ValaArrayList* _tmp376_; - ValaArrayList* _tmp377_; + ValaArrayList* _tmp379_; + ValaArrayList* _tmp380_; ValaArrayList* _node_list; - ValaArrayList* _tmp378_; - gint _tmp379_; - gint _tmp380_; + ValaArrayList* _tmp381_; + gint _tmp382_; + gint _tmp383_; gint _node_size; gint _node_index; - _tmp376_ = colliding; - _tmp377_ = _vala_iterable_ref0 (_tmp376_); - _node_list = _tmp377_; - _tmp378_ = _node_list; - _tmp379_ = vala_collection_get_size ((ValaCollection*) _tmp378_); - _tmp380_ = _tmp379_; - _node_size = _tmp380_; + _tmp379_ = colliding; + _tmp380_ = _vala_iterable_ref0 (_tmp379_); + _node_list = _tmp380_; + _tmp381_ = _node_list; + _tmp382_ = vala_collection_get_size ((ValaCollection*) _tmp381_); + _tmp383_ = _tmp382_; + _node_size = _tmp383_; _node_index = -1; while (TRUE) { - gint _tmp381_; - gint _tmp382_; - gint _tmp383_; - ValaArrayList* _tmp384_; + gint _tmp384_; gint _tmp385_; - gpointer _tmp386_ = NULL; + gint _tmp386_; + ValaArrayList* _tmp387_; + gint _tmp388_; + gpointer _tmp389_ = NULL; ValaGirParserNode* node; - ValaGirParserNode* _tmp387_; - ValaSymbol* _tmp388_; - _tmp381_ = _node_index; - _node_index = _tmp381_ + 1; - _tmp382_ = _node_index; - _tmp383_ = _node_size; - if (!(_tmp382_ < _tmp383_)) { + ValaGirParserNode* _tmp390_; + ValaSymbol* _tmp391_; + _tmp384_ = _node_index; + _node_index = _tmp384_ + 1; + _tmp385_ = _node_index; + _tmp386_ = _node_size; + if (!(_tmp385_ < _tmp386_)) { break; } - _tmp384_ = _node_list; - _tmp385_ = _node_index; - _tmp386_ = vala_list_get ((ValaList*) _tmp384_, _tmp385_); - node = (ValaGirParserNode*) _tmp386_; - _tmp387_ = node; - _tmp388_ = _tmp387_->symbol; - if (VALA_IS_METHOD (_tmp388_)) { - ValaGirParserNode* _tmp389_; - _tmp389_ = node; - _tmp389_->merged = TRUE; + _tmp387_ = _node_list; + _tmp388_ = _node_index; + _tmp389_ = vala_list_get ((ValaList*) _tmp387_, _tmp388_); + node = (ValaGirParserNode*) _tmp389_; + _tmp390_ = node; + _tmp391_ = _tmp390_->symbol; + if (VALA_IS_METHOD (_tmp391_)) { + ValaGirParserNode* _tmp392_; + _tmp392_ = node; + _tmp392_->merged = TRUE; } _vala_gir_parser_node_unref0 (node); } _vala_iterable_unref0 (_node_list); } } - _tmp390_ = prop; - _tmp391_ = vala_property_get_get_accessor (_tmp390_); - _tmp392_ = _tmp391_; - _tmp393_ = vala_property_accessor_get_value_type (_tmp392_); - _tmp394_ = _tmp393_; - _tmp395_ = m; - _tmp396_ = vala_method_get_return_type (_tmp395_); + _tmp393_ = prop; + _tmp394_ = vala_property_get_get_accessor (_tmp393_); + _tmp395_ = _tmp394_; + _tmp396_ = vala_property_accessor_get_value_type (_tmp395_); _tmp397_ = _tmp396_; - _tmp398_ = vala_data_type_get_value_owned (_tmp397_); - _tmp399_ = _tmp398_; - vala_data_type_set_value_owned (_tmp394_, _tmp399_); + _tmp398_ = m; + _tmp399_ = vala_method_get_return_type (_tmp398_); + _tmp400_ = _tmp399_; + _tmp401_ = vala_data_type_get_value_owned (_tmp400_); + _tmp402_ = _tmp401_; + vala_data_type_set_value_owned (_tmp397_, _tmp402_); } } else { - ValaProperty* _tmp400_; - _tmp400_ = prop; - vala_code_node_set_attribute ((ValaCodeNode*) _tmp400_, "NoAccessorMethod", TRUE, NULL); + ValaProperty* _tmp403_; + _tmp403_ = prop; + vala_code_node_set_attribute ((ValaCodeNode*) _tmp403_, "NoAccessorMethod", TRUE, NULL); } _vala_code_node_unref0 (m); } - _tmp403_ = prop; - _tmp404_ = vala_code_node_get_attribute ((ValaCodeNode*) _tmp403_, "NoAccessorMethod"); - _tmp405_ = _tmp404_; - _tmp406_ = _tmp405_ == NULL; - _vala_code_node_unref0 (_tmp405_); - if (_tmp406_) { - ValaProperty* _tmp407_; - ValaPropertyAccessor* _tmp408_; - ValaPropertyAccessor* _tmp409_; - _tmp407_ = prop; - _tmp408_ = vala_property_get_set_accessor (_tmp407_); - _tmp409_ = _tmp408_; - _tmp402_ = _tmp409_ != NULL; + _tmp406_ = prop; + _tmp407_ = vala_code_node_get_attribute ((ValaCodeNode*) _tmp406_, "NoAccessorMethod"); + _tmp408_ = _tmp407_; + _tmp409_ = _tmp408_ == NULL; + _vala_code_node_unref0 (_tmp408_); + if (_tmp409_) { + ValaProperty* _tmp410_; + ValaPropertyAccessor* _tmp411_; + ValaPropertyAccessor* _tmp412_; + _tmp410_ = prop; + _tmp411_ = vala_property_get_set_accessor (_tmp410_); + _tmp412_ = _tmp411_; + _tmp405_ = _tmp412_ != NULL; } else { - _tmp402_ = FALSE; + _tmp405_ = FALSE; } - _tmp410_ = _tmp402_; - if (_tmp410_) { - ValaProperty* _tmp411_; - ValaPropertyAccessor* _tmp412_; - ValaPropertyAccessor* _tmp413_; - gboolean _tmp414_; - gboolean _tmp415_; - _tmp411_ = prop; - _tmp412_ = vala_property_get_set_accessor (_tmp411_); - _tmp413_ = _tmp412_; - _tmp414_ = vala_property_accessor_get_writable (_tmp413_); - _tmp415_ = _tmp414_; - _tmp401_ = _tmp415_; + _tmp413_ = _tmp405_; + if (_tmp413_) { + ValaProperty* _tmp414_; + ValaPropertyAccessor* _tmp415_; + ValaPropertyAccessor* _tmp416_; + gboolean _tmp417_; + gboolean _tmp418_; + _tmp414_ = prop; + _tmp415_ = vala_property_get_set_accessor (_tmp414_); + _tmp416_ = _tmp415_; + _tmp417_ = vala_property_accessor_get_writable (_tmp416_); + _tmp418_ = _tmp417_; + _tmp404_ = _tmp418_; } else { - _tmp401_ = FALSE; + _tmp404_ = FALSE; } - _tmp416_ = _tmp401_; - if (_tmp416_) { - ValaMethod* _tmp417_ = NULL; - ValaGirParserNode* _tmp418_; - ValaMethod* _tmp421_; - ValaMethod* _tmp422_; - ValaMethod* m; - gboolean _tmp423_ = FALSE; + _tmp419_ = _tmp404_; + if (_tmp419_) { + ValaMethod* _tmp420_ = NULL; + ValaGirParserNode* _tmp421_; ValaMethod* _tmp424_; - gboolean _tmp438_; - _tmp418_ = setter; - if (_tmp418_ != NULL) { - ValaGirParserNode* _tmp419_; - ValaSymbol* _tmp420_; - _tmp419_ = setter; - _tmp420_ = _tmp419_->symbol; - _tmp417_ = VALA_IS_METHOD (_tmp420_) ? ((ValaMethod*) _tmp420_) : NULL; + ValaMethod* _tmp425_; + ValaMethod* m; + gboolean _tmp426_ = FALSE; + ValaMethod* _tmp427_; + gboolean _tmp441_; + _tmp421_ = setter; + if (_tmp421_ != NULL) { + ValaGirParserNode* _tmp422_; + ValaSymbol* _tmp423_; + _tmp422_ = setter; + _tmp423_ = _tmp422_->symbol; + _tmp420_ = VALA_IS_METHOD (_tmp423_) ? ((ValaMethod*) _tmp423_) : NULL; } else { - _tmp417_ = NULL; + _tmp420_ = NULL; } - _tmp421_ = _tmp417_; - _tmp422_ = _vala_code_node_ref0 (_tmp421_); - m = _tmp422_; - _tmp424_ = m; - if (_tmp424_ != NULL) { - gboolean _tmp425_ = FALSE; - gboolean _tmp426_ = FALSE; - ValaMethod* _tmp427_; - gboolean _tmp428_; - gboolean _tmp429_; - gboolean _tmp433_; - gboolean _tmp437_; - _tmp427_ = m; - _tmp428_ = vala_method_get_is_abstract (_tmp427_); - _tmp429_ = _tmp428_; - if (_tmp429_) { - _tmp426_ = TRUE; + _tmp424_ = _tmp420_; + _tmp425_ = _vala_code_node_ref0 (_tmp424_); + m = _tmp425_; + _tmp427_ = m; + if (_tmp427_ != NULL) { + gboolean _tmp428_ = FALSE; + gboolean _tmp429_ = FALSE; + ValaMethod* _tmp430_; + gboolean _tmp431_; + gboolean _tmp432_; + gboolean _tmp436_; + gboolean _tmp440_; + _tmp430_ = m; + _tmp431_ = vala_method_get_is_abstract (_tmp430_); + _tmp432_ = _tmp431_; + if (_tmp432_) { + _tmp429_ = TRUE; } else { - ValaMethod* _tmp430_; - gboolean _tmp431_; - gboolean _tmp432_; - _tmp430_ = m; - _tmp431_ = vala_method_get_is_virtual (_tmp430_); - _tmp432_ = _tmp431_; - _tmp426_ = _tmp432_; + ValaMethod* _tmp433_; + gboolean _tmp434_; + gboolean _tmp435_; + _tmp433_ = m; + _tmp434_ = vala_method_get_is_virtual (_tmp433_); + _tmp435_ = _tmp434_; + _tmp429_ = _tmp435_; } - _tmp433_ = _tmp426_; - if (_tmp433_) { - _tmp425_ = TRUE; + _tmp436_ = _tmp429_; + if (_tmp436_) { + _tmp428_ = TRUE; } else { - ValaProperty* _tmp434_; - gboolean _tmp435_; - gboolean _tmp436_; - _tmp434_ = prop; - _tmp435_ = vala_property_get_is_abstract (_tmp434_); - _tmp436_ = _tmp435_; - _tmp425_ = !_tmp436_; + ValaProperty* _tmp437_; + gboolean _tmp438_; + gboolean _tmp439_; + _tmp437_ = prop; + _tmp438_ = vala_property_get_is_abstract (_tmp437_); + _tmp439_ = _tmp438_; + _tmp428_ = !_tmp439_; } - _tmp437_ = _tmp425_; - _tmp423_ = _tmp437_; + _tmp440_ = _tmp428_; + _tmp426_ = _tmp440_; } else { - _tmp423_ = FALSE; + _tmp426_ = FALSE; } - _tmp438_ = _tmp423_; - if (_tmp438_) { - ValaGirParserNode* _tmp439_; - ValaGirParser* _tmp440_; - gboolean _tmp441_ = FALSE; - ValaMethod* _tmp442_; - ValaDataType* _tmp443_; - ValaDataType* _tmp444_; - gboolean _tmp450_; - _tmp439_ = setter; - _tmp440_ = parser; - vala_gir_parser_node_process (_tmp439_, _tmp440_); - _tmp442_ = m; - _tmp443_ = vala_method_get_return_type (_tmp442_); - _tmp444_ = _tmp443_; - if (!VALA_IS_VOID_TYPE (_tmp444_)) { - _tmp441_ = TRUE; + _tmp441_ = _tmp426_; + if (_tmp441_) { + ValaGirParserNode* _tmp442_; + ValaGirParser* _tmp443_; + gboolean _tmp444_ = FALSE; + ValaMethod* _tmp445_; + ValaDataType* _tmp446_; + ValaDataType* _tmp447_; + gboolean _tmp453_; + _tmp442_ = setter; + _tmp443_ = parser; + vala_gir_parser_node_process (_tmp442_, _tmp443_); + _tmp445_ = m; + _tmp446_ = vala_method_get_return_type (_tmp445_); + _tmp447_ = _tmp446_; + if (!VALA_IS_VOID_TYPE (_tmp447_)) { + _tmp444_ = TRUE; } else { - ValaMethod* _tmp445_; - ValaList* _tmp446_ = NULL; - ValaList* _tmp447_; - gint _tmp448_; - gint _tmp449_; - _tmp445_ = m; - _tmp446_ = vala_method_get_parameters (_tmp445_); - _tmp447_ = _tmp446_; - _tmp448_ = vala_collection_get_size ((ValaCollection*) _tmp447_); - _tmp449_ = _tmp448_; - _tmp441_ = _tmp449_ != 1; - _vala_iterable_unref0 (_tmp447_); + ValaMethod* _tmp448_; + ValaList* _tmp449_ = NULL; + ValaList* _tmp450_; + gint _tmp451_; + gint _tmp452_; + _tmp448_ = m; + _tmp449_ = vala_method_get_parameters (_tmp448_); + _tmp450_ = _tmp449_; + _tmp451_ = vala_collection_get_size ((ValaCollection*) _tmp450_); + _tmp452_ = _tmp451_; + _tmp444_ = _tmp452_ != 1; + _vala_iterable_unref0 (_tmp450_); } - _tmp450_ = _tmp441_; - if (_tmp450_) { - ValaProperty* _tmp451_; - _tmp451_ = prop; - vala_code_node_set_attribute ((ValaCodeNode*) _tmp451_, "NoAccessorMethod", TRUE, NULL); + _tmp453_ = _tmp444_; + if (_tmp453_) { + ValaProperty* _tmp454_; + _tmp454_ = prop; + vala_code_node_set_attribute ((ValaCodeNode*) _tmp454_, "NoAccessorMethod", TRUE, NULL); } else { - ValaProperty* _tmp452_; - ValaPropertyAccessor* _tmp453_; - ValaPropertyAccessor* _tmp454_; - ValaDataType* _tmp455_; - ValaDataType* _tmp456_; - ValaMethod* _tmp457_; - ValaList* _tmp458_ = NULL; - ValaList* _tmp459_; - gpointer _tmp460_ = NULL; - ValaParameter* _tmp461_; - ValaDataType* _tmp462_; - ValaDataType* _tmp463_; - gboolean _tmp464_; - gboolean _tmp465_; - _tmp452_ = prop; - _tmp453_ = vala_property_get_set_accessor (_tmp452_); - _tmp454_ = _tmp453_; - _tmp455_ = vala_property_accessor_get_value_type (_tmp454_); - _tmp456_ = _tmp455_; - _tmp457_ = m; - _tmp458_ = vala_method_get_parameters (_tmp457_); + ValaProperty* _tmp455_; + ValaPropertyAccessor* _tmp456_; + ValaPropertyAccessor* _tmp457_; + ValaDataType* _tmp458_; + ValaDataType* _tmp459_; + ValaMethod* _tmp460_; + ValaList* _tmp461_ = NULL; + ValaList* _tmp462_; + gpointer _tmp463_ = NULL; + ValaParameter* _tmp464_; + ValaDataType* _tmp465_; + ValaDataType* _tmp466_; + gboolean _tmp467_; + gboolean _tmp468_; + _tmp455_ = prop; + _tmp456_ = vala_property_get_set_accessor (_tmp455_); + _tmp457_ = _tmp456_; + _tmp458_ = vala_property_accessor_get_value_type (_tmp457_); _tmp459_ = _tmp458_; - _tmp460_ = vala_list_get (_tmp459_, 0); - _tmp461_ = (ValaParameter*) _tmp460_; - _tmp462_ = vala_variable_get_variable_type ((ValaVariable*) _tmp461_); - _tmp463_ = _tmp462_; - _tmp464_ = vala_data_type_get_value_owned (_tmp463_); - _tmp465_ = _tmp464_; - vala_data_type_set_value_owned (_tmp456_, _tmp465_); - _vala_code_node_unref0 (_tmp461_); - _vala_iterable_unref0 (_tmp459_); + _tmp460_ = m; + _tmp461_ = vala_method_get_parameters (_tmp460_); + _tmp462_ = _tmp461_; + _tmp463_ = vala_list_get (_tmp462_, 0); + _tmp464_ = (ValaParameter*) _tmp463_; + _tmp465_ = vala_variable_get_variable_type ((ValaVariable*) _tmp464_); + _tmp466_ = _tmp465_; + _tmp467_ = vala_data_type_get_value_owned (_tmp466_); + _tmp468_ = _tmp467_; + vala_data_type_set_value_owned (_tmp459_, _tmp468_); + _vala_code_node_unref0 (_tmp464_); + _vala_iterable_unref0 (_tmp462_); } } else { - ValaProperty* _tmp466_; - _tmp466_ = prop; - vala_code_node_set_attribute ((ValaCodeNode*) _tmp466_, "NoAccessorMethod", TRUE, NULL); + ValaProperty* _tmp469_; + _tmp469_ = prop; + vala_code_node_set_attribute ((ValaCodeNode*) _tmp469_, "NoAccessorMethod", TRUE, NULL); } _vala_code_node_unref0 (m); } - _tmp467_ = prop; - _tmp468_ = vala_code_node_get_attribute ((ValaCodeNode*) _tmp467_, "NoAccessorMethod"); - _tmp469_ = _tmp468_; - _tmp470_ = _tmp469_ != NULL; - _vala_code_node_unref0 (_tmp469_); - if (_tmp470_) { - ValaProperty* _tmp471_; - ValaPropertyAccessor* _tmp472_; - ValaPropertyAccessor* _tmp473_; - ValaProperty* _tmp479_; - ValaPropertyAccessor* _tmp480_; - ValaPropertyAccessor* _tmp481_; - _tmp471_ = prop; - _tmp472_ = vala_property_get_get_accessor (_tmp471_); - _tmp473_ = _tmp472_; - if (_tmp473_ != NULL) { - ValaProperty* _tmp474_; - ValaPropertyAccessor* _tmp475_; - ValaPropertyAccessor* _tmp476_; - ValaDataType* _tmp477_; - ValaDataType* _tmp478_; - _tmp474_ = prop; - _tmp475_ = vala_property_get_get_accessor (_tmp474_); - _tmp476_ = _tmp475_; - _tmp477_ = vala_property_accessor_get_value_type (_tmp476_); - _tmp478_ = _tmp477_; - vala_data_type_set_value_owned (_tmp478_, TRUE); + _tmp470_ = prop; + _tmp471_ = vala_code_node_get_attribute ((ValaCodeNode*) _tmp470_, "NoAccessorMethod"); + _tmp472_ = _tmp471_; + _tmp473_ = _tmp472_ != NULL; + _vala_code_node_unref0 (_tmp472_); + if (_tmp473_) { + ValaProperty* _tmp474_; + ValaPropertyAccessor* _tmp475_; + ValaPropertyAccessor* _tmp476_; + ValaProperty* _tmp482_; + ValaPropertyAccessor* _tmp483_; + ValaPropertyAccessor* _tmp484_; + _tmp474_ = prop; + _tmp475_ = vala_property_get_get_accessor (_tmp474_); + _tmp476_ = _tmp475_; + if (_tmp476_ != NULL) { + ValaProperty* _tmp477_; + ValaPropertyAccessor* _tmp478_; + ValaPropertyAccessor* _tmp479_; + ValaDataType* _tmp480_; + ValaDataType* _tmp481_; + _tmp477_ = prop; + _tmp478_ = vala_property_get_get_accessor (_tmp477_); + _tmp479_ = _tmp478_; + _tmp480_ = vala_property_accessor_get_value_type (_tmp479_); + _tmp481_ = _tmp480_; + vala_data_type_set_value_owned (_tmp481_, TRUE); } - _tmp479_ = prop; - _tmp480_ = vala_property_get_set_accessor (_tmp479_); - _tmp481_ = _tmp480_; - if (_tmp481_ != NULL) { - ValaProperty* _tmp482_; - ValaPropertyAccessor* _tmp483_; - ValaPropertyAccessor* _tmp484_; - ValaDataType* _tmp485_; - ValaDataType* _tmp486_; - _tmp482_ = prop; - _tmp483_ = vala_property_get_set_accessor (_tmp482_); - _tmp484_ = _tmp483_; - _tmp485_ = vala_property_accessor_get_value_type (_tmp484_); - _tmp486_ = _tmp485_; - vala_data_type_set_value_owned (_tmp486_, FALSE); + _tmp482_ = prop; + _tmp483_ = vala_property_get_set_accessor (_tmp482_); + _tmp484_ = _tmp483_; + if (_tmp484_ != NULL) { + ValaProperty* _tmp485_; + ValaPropertyAccessor* _tmp486_; + ValaPropertyAccessor* _tmp487_; + ValaDataType* _tmp488_; + ValaDataType* _tmp489_; + _tmp485_ = prop; + _tmp486_ = vala_property_get_set_accessor (_tmp485_); + _tmp487_ = _tmp486_; + _tmp488_ = vala_property_accessor_get_value_type (_tmp487_); + _tmp489_ = _tmp488_; + vala_data_type_set_value_owned (_tmp489_, FALSE); } } _vala_iterable_unref0 (setters); @@ -18492,220 +18501,220 @@ _vala_code_node_unref0 (prop); _vala_iterable_unref0 (colliding); } else { - ValaSymbol* _tmp487_; - _tmp487_ = self->symbol; - if (VALA_IS_FIELD (_tmp487_)) { - ValaSymbol* _tmp488_; - ValaField* _tmp489_; + ValaSymbol* _tmp490_; + _tmp490_ = self->symbol; + if (VALA_IS_FIELD (_tmp490_)) { + ValaSymbol* _tmp491_; + ValaField* _tmp492_; ValaField* field; - ValaGirParserNode* _tmp490_; - const gchar* _tmp491_; - ValaArrayList* _tmp492_ = NULL; + ValaGirParserNode* _tmp493_; + const gchar* _tmp494_; + ValaArrayList* _tmp495_ = NULL; ValaArrayList* colliding; - ValaArrayList* _tmp493_; - gint _tmp494_; - gint _tmp495_; - gboolean _tmp496_ = FALSE; - ValaField* _tmp497_; - ValaDataType* _tmp498_; - ValaDataType* _tmp499_; - gboolean _tmp502_; - _tmp488_ = self->symbol; - _tmp489_ = _vala_code_node_ref0 (VALA_FIELD (_tmp488_)); - field = _tmp489_; - _tmp490_ = self->parent; - _tmp491_ = self->name; - _tmp492_ = vala_gir_parser_node_lookup_all (_tmp490_, _tmp491_); - colliding = _tmp492_; - _tmp493_ = colliding; - _tmp494_ = vala_collection_get_size ((ValaCollection*) _tmp493_); - _tmp495_ = _tmp494_; - if (_tmp495_ > 1) { + ValaArrayList* _tmp496_; + gint _tmp497_; + gint _tmp498_; + gboolean _tmp499_ = FALSE; + ValaField* _tmp500_; + ValaDataType* _tmp501_; + ValaDataType* _tmp502_; + gboolean _tmp505_; + _tmp491_ = self->symbol; + _tmp492_ = _vala_code_node_ref0 (VALA_FIELD (_tmp491_)); + field = _tmp492_; + _tmp493_ = self->parent; + _tmp494_ = self->name; + _tmp495_ = vala_gir_parser_node_lookup_all (_tmp493_, _tmp494_); + colliding = _tmp495_; + _tmp496_ = colliding; + _tmp497_ = vala_collection_get_size ((ValaCollection*) _tmp496_); + _tmp498_ = _tmp497_; + if (_tmp498_ > 1) { self->merged = TRUE; } - _tmp497_ = field; - _tmp498_ = vala_variable_get_variable_type ((ValaVariable*) _tmp497_); - _tmp499_ = _tmp498_; - if (VALA_IS_DELEGATE_TYPE (_tmp499_)) { - ValaGirParserNode* _tmp500_; - ValaUnresolvedSymbol* _tmp501_; - _tmp500_ = self->parent; - _tmp501_ = _tmp500_->gtype_struct_for; - _tmp496_ = _tmp501_ != NULL; + _tmp500_ = field; + _tmp501_ = vala_variable_get_variable_type ((ValaVariable*) _tmp500_); + _tmp502_ = _tmp501_; + if (VALA_IS_DELEGATE_TYPE (_tmp502_)) { + ValaGirParserNode* _tmp503_; + ValaUnresolvedSymbol* _tmp504_; + _tmp503_ = self->parent; + _tmp504_ = _tmp503_->gtype_struct_for; + _tmp499_ = _tmp504_ != NULL; } else { - _tmp496_ = FALSE; + _tmp499_ = FALSE; } - _tmp502_ = _tmp496_; - if (_tmp502_) { - ValaField* _tmp503_; - ValaDataType* _tmp504_; - ValaDataType* _tmp505_; - ValaDelegate* _tmp506_; - ValaDelegate* _tmp507_; - ValaDelegate* _tmp508_; - ValaDelegate* d; - ValaGirParser* _tmp509_; + _tmp505_ = _tmp499_; + if (_tmp505_) { + ValaField* _tmp506_; + ValaDataType* _tmp507_; + ValaDataType* _tmp508_; + ValaDelegate* _tmp509_; ValaDelegate* _tmp510_; - ValaGirParserNode* _tmp511_; - ValaUnresolvedSymbol* _tmp512_; - _tmp503_ = field; - _tmp504_ = vala_variable_get_variable_type ((ValaVariable*) _tmp503_); - _tmp505_ = _tmp504_; - _tmp506_ = vala_delegate_type_get_delegate_symbol (VALA_DELEGATE_TYPE (_tmp505_)); - _tmp507_ = _tmp506_; - _tmp508_ = _vala_code_node_ref0 (_tmp507_); - d = _tmp508_; - _tmp509_ = parser; - _tmp510_ = d; - _tmp511_ = self->parent; - _tmp512_ = _tmp511_->gtype_struct_for; - vala_gir_parser_process_virtual_method_field (_tmp509_, self, _tmp510_, _tmp512_); + ValaDelegate* _tmp511_; + ValaDelegate* d; + ValaGirParser* _tmp512_; + ValaDelegate* _tmp513_; + ValaGirParserNode* _tmp514_; + ValaUnresolvedSymbol* _tmp515_; + _tmp506_ = field; + _tmp507_ = vala_variable_get_variable_type ((ValaVariable*) _tmp506_); + _tmp508_ = _tmp507_; + _tmp509_ = vala_delegate_type_get_delegate_symbol (VALA_DELEGATE_TYPE (_tmp508_)); + _tmp510_ = _tmp509_; + _tmp511_ = _vala_code_node_ref0 (_tmp510_); + d = _tmp511_; + _tmp512_ = parser; + _tmp513_ = d; + _tmp514_ = self->parent; + _tmp515_ = _tmp514_->gtype_struct_for; + vala_gir_parser_process_virtual_method_field (_tmp512_, self, _tmp513_, _tmp515_); self->merged = TRUE; _vala_code_node_unref0 (d); } else { - ValaField* _tmp513_; - ValaDataType* _tmp514_; - ValaDataType* _tmp515_; - _tmp513_ = field; - _tmp514_ = vala_variable_get_variable_type ((ValaVariable*) _tmp513_); - _tmp515_ = _tmp514_; - if (VALA_IS_ARRAY_TYPE (_tmp515_)) { + ValaField* _tmp516_; + ValaDataType* _tmp517_; + ValaDataType* _tmp518_; + _tmp516_ = field; + _tmp517_ = vala_variable_get_variable_type ((ValaVariable*) _tmp516_); + _tmp518_ = _tmp517_; + if (VALA_IS_ARRAY_TYPE (_tmp518_)) { ValaGirParserNode* array_length = NULL; - ValaGirParserMetadata* _tmp516_; - gboolean _tmp517_ = FALSE; - gboolean _tmp538_ = FALSE; - ValaGirParserNode* _tmp539_; - gboolean _tmp542_; - _tmp516_ = self->metadata; - _tmp517_ = vala_gir_parser_metadata_has_argument (_tmp516_, VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD); - if (_tmp517_) { - ValaGirParserNode* _tmp518_; - ValaGirParserMetadata* _tmp519_; - gchar* _tmp520_ = NULL; - gchar* _tmp521_; - ValaGirParserNode* _tmp522_ = NULL; - _tmp518_ = self->parent; - _tmp519_ = self->metadata; - _tmp520_ = vala_gir_parser_metadata_get_string (_tmp519_, VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD); - _tmp521_ = _tmp520_; - _tmp522_ = vala_gir_parser_node_lookup (_tmp518_, _tmp521_, FALSE, NULL); + ValaGirParserMetadata* _tmp519_; + gboolean _tmp520_ = FALSE; + gboolean _tmp541_ = FALSE; + ValaGirParserNode* _tmp542_; + gboolean _tmp545_; + _tmp519_ = self->metadata; + _tmp520_ = vala_gir_parser_metadata_has_argument (_tmp519_, VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD); + if (_tmp520_) { + ValaGirParserNode* _tmp521_; + ValaGirParserMetadata* _tmp522_; + gchar* _tmp523_ = NULL; + gchar* _tmp524_; + ValaGirParserNode* _tmp525_ = NULL; + _tmp521_ = self->parent; + _tmp522_ = self->metadata; + _tmp523_ = vala_gir_parser_metadata_get_string (_tmp522_, VALA_GIR_PARSER_ARGUMENT_TYPE_ARRAY_LENGTH_FIELD); + _tmp524_ = _tmp523_; + _tmp525_ = vala_gir_parser_node_lookup (_tmp521_, _tmp524_, FALSE, NULL); _vala_gir_parser_node_unref0 (array_length); - array_length = _tmp522_; - _g_free0 (_tmp521_); + array_length = _tmp525_; + _g_free0 (_tmp524_); } else { - ValaGirParserNode* _tmp523_; - ValaField* _tmp524_; - const gchar* _tmp525_; - const gchar* _tmp526_; - gchar* _tmp527_ = NULL; - gchar* _tmp528_; - ValaGirParserNode* _tmp529_ = NULL; - ValaGirParserNode* _tmp530_; - _tmp523_ = self->parent; - _tmp524_ = field; - _tmp525_ = vala_symbol_get_name ((ValaSymbol*) _tmp524_); - _tmp526_ = _tmp525_; - _tmp527_ = g_strdup_printf ("n_%s", _tmp526_); - _tmp528_ = _tmp527_; - _tmp529_ = vala_gir_parser_node_lookup (_tmp523_, _tmp528_, FALSE, NULL); + ValaGirParserNode* _tmp526_; + ValaField* _tmp527_; + const gchar* _tmp528_; + const gchar* _tmp529_; + gchar* _tmp530_ = NULL; + gchar* _tmp531_; + ValaGirParserNode* _tmp532_ = NULL; + ValaGirParserNode* _tmp533_; + _tmp526_ = self->parent; + _tmp527_ = field; + _tmp528_ = vala_symbol_get_name ((ValaSymbol*) _tmp527_); + _tmp529_ = _tmp528_; + _tmp530_ = g_strdup_printf ("n_%s", _tmp529_); + _tmp531_ = _tmp530_; + _tmp532_ = vala_gir_parser_node_lookup (_tmp526_, _tmp531_, FALSE, NULL); _vala_gir_parser_node_unref0 (array_length); - array_length = _tmp529_; - _g_free0 (_tmp528_); - _tmp530_ = array_length; - if (_tmp530_ == NULL) { - ValaGirParserNode* _tmp531_; - ValaField* _tmp532_; - const gchar* _tmp533_; - const gchar* _tmp534_; - gchar* _tmp535_ = NULL; - gchar* _tmp536_; - ValaGirParserNode* _tmp537_ = NULL; - _tmp531_ = self->parent; - _tmp532_ = field; - _tmp533_ = vala_symbol_get_name ((ValaSymbol*) _tmp532_); - _tmp534_ = _tmp533_; - _tmp535_ = g_strdup_printf ("%s_length", _tmp534_); - _tmp536_ = _tmp535_; - _tmp537_ = vala_gir_parser_node_lookup (_tmp531_, _tmp536_, FALSE, NULL); + array_length = _tmp532_; + _g_free0 (_tmp531_); + _tmp533_ = array_length; + if (_tmp533_ == NULL) { + ValaGirParserNode* _tmp534_; + ValaField* _tmp535_; + const gchar* _tmp536_; + const gchar* _tmp537_; + gchar* _tmp538_ = NULL; + gchar* _tmp539_; + ValaGirParserNode* _tmp540_ = NULL; + _tmp534_ = self->parent; + _tmp535_ = field; + _tmp536_ = vala_symbol_get_name ((ValaSymbol*) _tmp535_); + _tmp537_ = _tmp536_; + _tmp538_ = g_strdup_printf ("%s_length", _tmp537_); + _tmp539_ = _tmp538_; + _tmp540_ = vala_gir_parser_node_lookup (_tmp534_, _tmp539_, FALSE, NULL); _vala_gir_parser_node_unref0 (array_length); - array_length = _tmp537_; - _g_free0 (_tmp536_); + array_length = _tmp540_; + _g_free0 (_tmp539_); } } - _tmp539_ = array_length; - if (_tmp539_ != NULL) { - ValaGirParserNode* _tmp540_; - ValaSymbol* _tmp541_; - _tmp540_ = array_length; - _tmp541_ = _tmp540_->symbol; - _tmp538_ = VALA_IS_FIELD (_tmp541_); - } else { - _tmp538_ = FALSE; - } - _tmp542_ = _tmp538_; - if (_tmp542_) { + _tmp542_ = array_length; + if (_tmp542_ != NULL) { ValaGirParserNode* _tmp543_; ValaSymbol* _tmp544_; - ValaField* _tmp545_; + _tmp543_ = array_length; + _tmp544_ = _tmp543_->symbol; + _tmp541_ = VALA_IS_FIELD (_tmp544_); + } else { + _tmp541_ = FALSE; + } + _tmp545_ = _tmp541_; + if (_tmp545_) { + ValaGirParserNode* _tmp546_; + ValaSymbol* _tmp547_; + ValaField* _tmp548_; ValaField* length_field; - ValaField* _tmp546_; - ValaField* _tmp547_; - const gchar* _tmp548_; - const gchar* _tmp549_; + ValaField* _tmp549_; ValaField* _tmp550_; - ValaDataType* _tmp551_; - ValaDataType* _tmp552_; - gchar* _tmp553_ = NULL; + const gchar* _tmp551_; + const gchar* _tmp552_; + ValaField* _tmp553_; + ValaDataType* _tmp554_; + ValaDataType* _tmp555_; + gchar* _tmp556_ = NULL; gchar* length_type; - const gchar* _tmp554_; - ValaField* _tmp564_; - ValaField* _tmp565_; - _tmp543_ = array_length; - _tmp544_ = _tmp543_->symbol; - _tmp545_ = _vala_code_node_ref0 (VALA_FIELD (_tmp544_)); - length_field = _tmp545_; - _tmp546_ = field; - _tmp547_ = length_field; - _tmp548_ = vala_symbol_get_name ((ValaSymbol*) _tmp547_); - _tmp549_ = _tmp548_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp546_, "CCode", "array_length_cname", _tmp549_, NULL); + const gchar* _tmp557_; + ValaField* _tmp567_; + ValaField* _tmp568_; + _tmp546_ = array_length; + _tmp547_ = _tmp546_->symbol; + _tmp548_ = _vala_code_node_ref0 (VALA_FIELD (_tmp547_)); + length_field = _tmp548_; + _tmp549_ = field; _tmp550_ = length_field; - _tmp551_ = vala_variable_get_variable_type ((ValaVariable*) _tmp550_); + _tmp551_ = vala_symbol_get_name ((ValaSymbol*) _tmp550_); _tmp552_ = _tmp551_; - _tmp553_ = vala_data_type_to_qualified_string (_tmp552_, NULL); - length_type = _tmp553_; - _tmp554_ = length_type; - if (g_strcmp0 (_tmp554_, "int") != 0) { - ValaGirParser* _tmp555_; - ValaGirParserNode* _tmp556_; - const gchar* _tmp557_; - ValaGirParserNode* _tmp558_ = NULL; - ValaGirParserNode* st; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp549_, "CCode", "array_length_cname", _tmp552_, NULL); + _tmp553_ = length_field; + _tmp554_ = vala_variable_get_variable_type ((ValaVariable*) _tmp553_); + _tmp555_ = _tmp554_; + _tmp556_ = vala_data_type_to_qualified_string (_tmp555_, NULL); + length_type = _tmp556_; + _tmp557_ = length_type; + if (g_strcmp0 (_tmp557_, "int") != 0) { + ValaGirParser* _tmp558_; ValaGirParserNode* _tmp559_; - _tmp555_ = parser; - _tmp556_ = _tmp555_->priv->root; - _tmp557_ = length_type; - _tmp558_ = vala_gir_parser_node_lookup (_tmp556_, _tmp557_, FALSE, NULL); - st = _tmp558_; - _tmp559_ = st; - if (_tmp559_ != NULL) { - ValaField* _tmp560_; - ValaGirParserNode* _tmp561_; - gchar* _tmp562_ = NULL; - gchar* _tmp563_; - _tmp560_ = field; - _tmp561_ = st; - _tmp562_ = vala_gir_parser_node_get_cname (_tmp561_); - _tmp563_ = _tmp562_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp560_, "CCode", "array_length_type", _tmp563_, NULL); - _g_free0 (_tmp563_); + const gchar* _tmp560_; + ValaGirParserNode* _tmp561_ = NULL; + ValaGirParserNode* st; + ValaGirParserNode* _tmp562_; + _tmp558_ = parser; + _tmp559_ = _tmp558_->priv->root; + _tmp560_ = length_type; + _tmp561_ = vala_gir_parser_node_lookup (_tmp559_, _tmp560_, FALSE, NULL); + st = _tmp561_; + _tmp562_ = st; + if (_tmp562_ != NULL) { + ValaField* _tmp563_; + ValaGirParserNode* _tmp564_; + gchar* _tmp565_ = NULL; + gchar* _tmp566_; + _tmp563_ = field; + _tmp564_ = st; + _tmp565_ = vala_gir_parser_node_get_cname (_tmp564_); + _tmp566_ = _tmp565_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp563_, "CCode", "array_length_type", _tmp566_, NULL); + _g_free0 (_tmp566_); } _vala_gir_parser_node_unref0 (st); } - _tmp564_ = field; - vala_code_node_remove_attribute_argument ((ValaCodeNode*) _tmp564_, "CCode", "array_length"); - _tmp565_ = field; - vala_code_node_remove_attribute_argument ((ValaCodeNode*) _tmp565_, "CCode", "array_null_terminated"); + _tmp567_ = field; + vala_code_node_remove_attribute_argument ((ValaCodeNode*) _tmp567_, "CCode", "array_length"); + _tmp568_ = field; + vala_code_node_remove_attribute_argument ((ValaCodeNode*) _tmp568_, "CCode", "array_null_terminated"); _g_free0 (length_type); _vala_code_node_unref0 (length_field); } @@ -18715,169 +18724,169 @@ _vala_iterable_unref0 (colliding); _vala_code_node_unref0 (field); } else { - gboolean _tmp566_ = FALSE; - ValaSymbol* _tmp567_; - gboolean _tmp569_; - _tmp567_ = self->symbol; - if (VALA_IS_SIGNAL (_tmp567_)) { - _tmp566_ = TRUE; - } else { - ValaSymbol* _tmp568_; - _tmp568_ = self->symbol; - _tmp566_ = VALA_IS_DELEGATE (_tmp568_); - } - _tmp569_ = _tmp566_; - if (_tmp569_) { - ValaGirParser* _tmp570_; - _tmp570_ = parser; - vala_gir_parser_process_callable (_tmp570_, self); + gboolean _tmp569_ = FALSE; + ValaSymbol* _tmp570_; + gboolean _tmp572_; + _tmp570_ = self->symbol; + if (VALA_IS_SIGNAL (_tmp570_)) { + _tmp569_ = TRUE; } else { ValaSymbol* _tmp571_; _tmp571_ = self->symbol; - if (VALA_IS_INTERFACE (_tmp571_)) { - ValaGirParser* _tmp572_; - _tmp572_ = parser; - vala_gir_parser_process_interface (_tmp572_, self); + _tmp569_ = VALA_IS_DELEGATE (_tmp571_); + } + _tmp572_ = _tmp569_; + if (_tmp572_) { + ValaGirParser* _tmp573_; + _tmp573_ = parser; + vala_gir_parser_process_callable (_tmp573_, self); + } else { + ValaSymbol* _tmp574_; + _tmp574_ = self->symbol; + if (VALA_IS_INTERFACE (_tmp574_)) { + ValaGirParser* _tmp575_; + _tmp575_ = parser; + vala_gir_parser_process_interface (_tmp575_, self); } else { - ValaSymbol* _tmp573_; - _tmp573_ = self->symbol; - if (VALA_IS_STRUCT (_tmp573_)) { - gboolean _tmp574_ = FALSE; - ValaGirParserNode* _tmp575_; - ValaSymbol* _tmp576_; - gboolean _tmp579_; - _tmp575_ = self->parent; - _tmp576_ = _tmp575_->symbol; - if (VALA_IS_OBJECT_TYPE_SYMBOL (_tmp576_)) { - _tmp574_ = TRUE; + ValaSymbol* _tmp576_; + _tmp576_ = self->symbol; + if (VALA_IS_STRUCT (_tmp576_)) { + gboolean _tmp577_ = FALSE; + ValaGirParserNode* _tmp578_; + ValaSymbol* _tmp579_; + gboolean _tmp582_; + _tmp578_ = self->parent; + _tmp579_ = _tmp578_->symbol; + if (VALA_IS_OBJECT_TYPE_SYMBOL (_tmp579_)) { + _tmp577_ = TRUE; } else { - ValaGirParserNode* _tmp577_; - ValaSymbol* _tmp578_; - _tmp577_ = self->parent; - _tmp578_ = _tmp577_->symbol; - _tmp574_ = VALA_IS_STRUCT (_tmp578_); + ValaGirParserNode* _tmp580_; + ValaSymbol* _tmp581_; + _tmp580_ = self->parent; + _tmp581_ = _tmp580_->symbol; + _tmp577_ = VALA_IS_STRUCT (_tmp581_); } - _tmp579_ = _tmp574_; - if (_tmp579_) { + _tmp582_ = _tmp577_; + if (_tmp582_) { { - ValaArrayList* _tmp580_; - ValaArrayList* _tmp581_; + ValaArrayList* _tmp583_; + ValaArrayList* _tmp584_; ValaArrayList* _fn_list; - ValaArrayList* _tmp582_; - gint _tmp583_; - gint _tmp584_; + ValaArrayList* _tmp585_; + gint _tmp586_; + gint _tmp587_; gint _fn_size; gint _fn_index; - _tmp580_ = self->members; - _tmp581_ = _vala_iterable_ref0 (_tmp580_); - _fn_list = _tmp581_; - _tmp582_ = _fn_list; - _tmp583_ = vala_collection_get_size ((ValaCollection*) _tmp582_); - _tmp584_ = _tmp583_; - _fn_size = _tmp584_; + _tmp583_ = self->members; + _tmp584_ = _vala_iterable_ref0 (_tmp583_); + _fn_list = _tmp584_; + _tmp585_ = _fn_list; + _tmp586_ = vala_collection_get_size ((ValaCollection*) _tmp585_); + _tmp587_ = _tmp586_; + _fn_size = _tmp587_; _fn_index = -1; while (TRUE) { - gint _tmp585_; - gint _tmp586_; - gint _tmp587_; - ValaArrayList* _tmp588_; + gint _tmp588_; gint _tmp589_; - gpointer _tmp590_ = NULL; + gint _tmp590_; + ValaArrayList* _tmp591_; + gint _tmp592_; + gpointer _tmp593_ = NULL; ValaGirParserNode* fn; - ValaGirParserNode* _tmp591_; - ValaSymbol* _tmp592_; - ValaField* _tmp593_; + ValaGirParserNode* _tmp594_; + ValaSymbol* _tmp595_; + ValaField* _tmp596_; ValaField* f; - ValaField* _tmp594_; - _tmp585_ = _fn_index; - _fn_index = _tmp585_ + 1; - _tmp586_ = _fn_index; - _tmp587_ = _fn_size; - if (!(_tmp586_ < _tmp587_)) { + ValaField* _tmp597_; + _tmp588_ = _fn_index; + _fn_index = _tmp588_ + 1; + _tmp589_ = _fn_index; + _tmp590_ = _fn_size; + if (!(_tmp589_ < _tmp590_)) { break; } - _tmp588_ = _fn_list; - _tmp589_ = _fn_index; - _tmp590_ = vala_list_get ((ValaList*) _tmp588_, _tmp589_); - fn = (ValaGirParserNode*) _tmp590_; - _tmp591_ = fn; - _tmp592_ = _tmp591_->symbol; - _tmp593_ = _vala_code_node_ref0 (VALA_IS_FIELD (_tmp592_) ? ((ValaField*) _tmp592_) : NULL); - f = _tmp593_; - _tmp594_ = f; - if (_tmp594_ != NULL) { - ValaField* _tmp595_; - ValaMemberBinding _tmp596_; - ValaMemberBinding _tmp597_; - ValaField* _tmp607_; - ValaSymbol* _tmp608_; - const gchar* _tmp609_; - const gchar* _tmp610_; - gchar* _tmp611_; - gchar* _tmp612_; - ValaField* _tmp613_; - const gchar* _tmp614_; - const gchar* _tmp615_; - gchar* _tmp616_; - gchar* _tmp617_; - ValaGirParserNode* _tmp618_; - ValaField* _tmp619_; - const gchar* _tmp620_; - const gchar* _tmp621_; - gchar* _tmp622_; - ValaGirParserNode* _tmp623_; - ValaGirParserNode* _tmp624_; - _tmp595_ = f; - _tmp596_ = vala_field_get_binding (_tmp595_); - _tmp597_ = _tmp596_; - if (_tmp597_ == VALA_MEMBER_BINDING_INSTANCE) { - ValaField* _tmp598_; - const gchar* _tmp599_; - gchar* _tmp600_; - gchar* _tmp601_; - ValaGirParserNode* _tmp602_; - gchar* _tmp603_ = NULL; + _tmp591_ = _fn_list; + _tmp592_ = _fn_index; + _tmp593_ = vala_list_get ((ValaList*) _tmp591_, _tmp592_); + fn = (ValaGirParserNode*) _tmp593_; + _tmp594_ = fn; + _tmp595_ = _tmp594_->symbol; + _tmp596_ = _vala_code_node_ref0 (VALA_IS_FIELD (_tmp595_) ? ((ValaField*) _tmp595_) : NULL); + f = _tmp596_; + _tmp597_ = f; + if (_tmp597_ != NULL) { + ValaField* _tmp598_; + ValaMemberBinding _tmp599_; + ValaMemberBinding _tmp600_; + ValaField* _tmp610_; + ValaSymbol* _tmp611_; + const gchar* _tmp612_; + const gchar* _tmp613_; + gchar* _tmp614_; + gchar* _tmp615_; + ValaField* _tmp616_; + const gchar* _tmp617_; + const gchar* _tmp618_; + gchar* _tmp619_; + gchar* _tmp620_; + ValaGirParserNode* _tmp621_; + ValaField* _tmp622_; + const gchar* _tmp623_; + const gchar* _tmp624_; + gchar* _tmp625_; + ValaGirParserNode* _tmp626_; + ValaGirParserNode* _tmp627_; + _tmp598_ = f; + _tmp599_ = vala_field_get_binding (_tmp598_); + _tmp600_ = _tmp599_; + if (_tmp600_ == VALA_MEMBER_BINDING_INSTANCE) { + ValaField* _tmp601_; + const gchar* _tmp602_; + gchar* _tmp603_; gchar* _tmp604_; - gchar* _tmp605_; - gchar* _tmp606_; - _tmp598_ = f; - _tmp599_ = self->name; - _tmp600_ = g_strconcat (_tmp599_, ".", NULL); - _tmp601_ = _tmp600_; - _tmp602_ = fn; - _tmp603_ = vala_gir_parser_node_get_cname (_tmp602_); + ValaGirParserNode* _tmp605_; + gchar* _tmp606_ = NULL; + gchar* _tmp607_; + gchar* _tmp608_; + gchar* _tmp609_; + _tmp601_ = f; + _tmp602_ = self->name; + _tmp603_ = g_strconcat (_tmp602_, ".", NULL); _tmp604_ = _tmp603_; - _tmp605_ = g_strconcat (_tmp601_, _tmp604_, NULL); - _tmp606_ = _tmp605_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp598_, "CCode", "cname", _tmp606_, NULL); - _g_free0 (_tmp606_); + _tmp605_ = fn; + _tmp606_ = vala_gir_parser_node_get_cname (_tmp605_); + _tmp607_ = _tmp606_; + _tmp608_ = g_strconcat (_tmp604_, _tmp607_, NULL); + _tmp609_ = _tmp608_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp601_, "CCode", "cname", _tmp609_, NULL); + _g_free0 (_tmp609_); + _g_free0 (_tmp607_); _g_free0 (_tmp604_); - _g_free0 (_tmp601_); } - _tmp607_ = f; - _tmp608_ = self->symbol; - _tmp609_ = vala_symbol_get_name (_tmp608_); - _tmp610_ = _tmp609_; - _tmp611_ = g_strconcat (_tmp610_, "_", NULL); - _tmp612_ = _tmp611_; - _tmp613_ = f; - _tmp614_ = vala_symbol_get_name ((ValaSymbol*) _tmp613_); + _tmp610_ = f; + _tmp611_ = self->symbol; + _tmp612_ = vala_symbol_get_name (_tmp611_); + _tmp613_ = _tmp612_; + _tmp614_ = g_strconcat (_tmp613_, "_", NULL); _tmp615_ = _tmp614_; - _tmp616_ = g_strconcat (_tmp612_, _tmp615_, NULL); - _tmp617_ = _tmp616_; - vala_symbol_set_name ((ValaSymbol*) _tmp607_, _tmp617_); - _g_free0 (_tmp617_); - _g_free0 (_tmp612_); - _tmp618_ = fn; - _tmp619_ = f; - _tmp620_ = vala_symbol_get_name ((ValaSymbol*) _tmp619_); - _tmp621_ = _tmp620_; - _tmp622_ = g_strdup (_tmp621_); - _g_free0 (_tmp618_->name); - _tmp618_->name = _tmp622_; - _tmp623_ = self->parent; - _tmp624_ = fn; - vala_gir_parser_node_add_member (_tmp623_, _tmp624_); + _tmp616_ = f; + _tmp617_ = vala_symbol_get_name ((ValaSymbol*) _tmp616_); + _tmp618_ = _tmp617_; + _tmp619_ = g_strconcat (_tmp615_, _tmp618_, NULL); + _tmp620_ = _tmp619_; + vala_symbol_set_name ((ValaSymbol*) _tmp610_, _tmp620_); + _g_free0 (_tmp620_); + _g_free0 (_tmp615_); + _tmp621_ = fn; + _tmp622_ = f; + _tmp623_ = vala_symbol_get_name ((ValaSymbol*) _tmp622_); + _tmp624_ = _tmp623_; + _tmp625_ = g_strdup (_tmp624_); + _g_free0 (_tmp621_->name); + _tmp621_->name = _tmp625_; + _tmp626_ = self->parent; + _tmp627_ = fn; + vala_gir_parser_node_add_member (_tmp626_, _tmp627_); } _vala_code_node_unref0 (f); _vala_gir_parser_node_unref0 (fn); @@ -18886,86 +18895,86 @@ } self->merged = TRUE; } else { - ValaMap* _tmp625_; - gpointer _tmp626_ = NULL; + ValaMap* _tmp628_; + gpointer _tmp629_ = NULL; gchar* gtype_struct_for; - const gchar* _tmp627_; - _tmp625_ = self->girdata; - _tmp626_ = vala_map_get (_tmp625_, "glib:is-gtype-struct-for"); - gtype_struct_for = (gchar*) _tmp626_; - _tmp627_ = gtype_struct_for; - if (_tmp627_ != NULL) { - ValaGirParser* _tmp628_; - ValaGirParserNode* _tmp629_; - ValaGirParser* _tmp630_; - const gchar* _tmp631_; - ValaSourceReference* _tmp632_; - ValaUnresolvedSymbol* _tmp633_ = NULL; - ValaUnresolvedSymbol* _tmp634_; - ValaGirParserNode* _tmp635_ = NULL; - ValaGirParserNode* _tmp636_; - ValaGirParserNode* iface; - gboolean _tmp637_ = FALSE; - gboolean _tmp638_ = FALSE; + const gchar* _tmp630_; + _tmp628_ = self->girdata; + _tmp629_ = vala_map_get (_tmp628_, "glib:is-gtype-struct-for"); + gtype_struct_for = (gchar*) _tmp629_; + _tmp630_ = gtype_struct_for; + if (_tmp630_ != NULL) { + ValaGirParser* _tmp631_; + ValaGirParserNode* _tmp632_; + ValaGirParser* _tmp633_; + const gchar* _tmp634_; + ValaSourceReference* _tmp635_; + ValaUnresolvedSymbol* _tmp636_ = NULL; + ValaUnresolvedSymbol* _tmp637_; + ValaGirParserNode* _tmp638_ = NULL; ValaGirParserNode* _tmp639_; - gboolean _tmp642_; - gboolean _tmp650_; - _tmp628_ = parser; - _tmp629_ = self->parent; - _tmp630_ = parser; - _tmp631_ = gtype_struct_for; - _tmp632_ = self->source_reference; - _tmp633_ = vala_gir_parser_parse_symbol_from_string (_tmp630_, _tmp631_, _tmp632_); - _tmp634_ = _tmp633_; - _tmp635_ = vala_gir_parser_resolve_node (_tmp628_, _tmp629_, _tmp634_, FALSE); - _tmp636_ = _tmp635_; - _vala_code_node_unref0 (_tmp634_); - iface = _tmp636_; - _tmp639_ = iface; - if (_tmp639_ != NULL) { - ValaGirParserNode* _tmp640_; - ValaSymbol* _tmp641_; - _tmp640_ = iface; - _tmp641_ = _tmp640_->symbol; - _tmp638_ = VALA_IS_INTERFACE (_tmp641_); - } else { - _tmp638_ = FALSE; - } - _tmp642_ = _tmp638_; - if (_tmp642_) { + ValaGirParserNode* iface; + gboolean _tmp640_ = FALSE; + gboolean _tmp641_ = FALSE; + ValaGirParserNode* _tmp642_; + gboolean _tmp645_; + gboolean _tmp653_; + _tmp631_ = parser; + _tmp632_ = self->parent; + _tmp633_ = parser; + _tmp634_ = gtype_struct_for; + _tmp635_ = self->source_reference; + _tmp636_ = vala_gir_parser_parse_symbol_from_string (_tmp633_, _tmp634_, _tmp635_); + _tmp637_ = _tmp636_; + _tmp638_ = vala_gir_parser_resolve_node (_tmp631_, _tmp632_, _tmp637_, FALSE); + _tmp639_ = _tmp638_; + _vala_code_node_unref0 (_tmp637_); + iface = _tmp639_; + _tmp642_ = iface; + if (_tmp642_ != NULL) { ValaGirParserNode* _tmp643_; - gchar* _tmp644_ = NULL; - gchar* _tmp645_; - gchar* _tmp646_ = NULL; - gchar* _tmp647_; - gchar* _tmp648_ = NULL; - gchar* _tmp649_; + ValaSymbol* _tmp644_; _tmp643_ = iface; - _tmp644_ = vala_gir_parser_node_get_cname (_tmp643_); - _tmp645_ = _tmp644_; - _tmp646_ = g_strdup_printf ("%sIface", _tmp645_); - _tmp647_ = _tmp646_; - _tmp648_ = vala_gir_parser_node_get_cname (self); - _tmp649_ = _tmp648_; - _tmp637_ = g_strcmp0 (_tmp647_, _tmp649_) != 0; - _g_free0 (_tmp649_); - _g_free0 (_tmp647_); - _g_free0 (_tmp645_); + _tmp644_ = _tmp643_->symbol; + _tmp641_ = VALA_IS_INTERFACE (_tmp644_); + } else { + _tmp641_ = FALSE; + } + _tmp645_ = _tmp641_; + if (_tmp645_) { + ValaGirParserNode* _tmp646_; + gchar* _tmp647_ = NULL; + gchar* _tmp648_; + gchar* _tmp649_ = NULL; + gchar* _tmp650_; + gchar* _tmp651_ = NULL; + gchar* _tmp652_; + _tmp646_ = iface; + _tmp647_ = vala_gir_parser_node_get_cname (_tmp646_); + _tmp648_ = _tmp647_; + _tmp649_ = g_strdup_printf ("%sIface", _tmp648_); + _tmp650_ = _tmp649_; + _tmp651_ = vala_gir_parser_node_get_cname (self); + _tmp652_ = _tmp651_; + _tmp640_ = g_strcmp0 (_tmp650_, _tmp652_) != 0; + _g_free0 (_tmp652_); + _g_free0 (_tmp650_); + _g_free0 (_tmp648_); } else { - _tmp637_ = FALSE; + _tmp640_ = FALSE; } - _tmp650_ = _tmp637_; - if (_tmp650_) { - ValaGirParserNode* _tmp651_; - ValaSymbol* _tmp652_; - gchar* _tmp653_ = NULL; - gchar* _tmp654_; - _tmp651_ = iface; - _tmp652_ = _tmp651_->symbol; - _tmp653_ = vala_gir_parser_node_get_cname (self); - _tmp654_ = _tmp653_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp652_, "CCode", "type_cname", _tmp654_, NULL); - _g_free0 (_tmp654_); + _tmp653_ = _tmp640_; + if (_tmp653_) { + ValaGirParserNode* _tmp654_; + ValaSymbol* _tmp655_; + gchar* _tmp656_ = NULL; + gchar* _tmp657_; + _tmp654_ = iface; + _tmp655_ = _tmp654_->symbol; + _tmp656_ = vala_gir_parser_node_get_cname (self); + _tmp657_ = _tmp656_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp655_, "CCode", "type_cname", _tmp657_, NULL); + _g_free0 (_tmp657_); } self->merged = TRUE; _vala_gir_parser_node_unref0 (iface); @@ -18978,345 +18987,345 @@ } } } - _tmp655_ = self->metadata; - _tmp656_ = vala_gir_parser_metadata_has_argument (_tmp655_, VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT); - if (_tmp656_) { - ValaSymbol* _tmp657_; - ValaGirParserMetadata* _tmp658_; - gchar* _tmp659_ = NULL; - gchar* _tmp660_; - _tmp657_ = self->symbol; - _tmp658_ = self->metadata; - _tmp659_ = vala_gir_parser_metadata_get_string (_tmp658_, VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT); - _tmp660_ = _tmp659_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp657_, "Deprecated", "replacement", _tmp660_, NULL); - _g_free0 (_tmp660_); - } - _tmp661_ = self->metadata; - _tmp662_ = vala_gir_parser_metadata_has_argument (_tmp661_, VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE); - if (_tmp662_) { - ValaSymbol* _tmp663_; - ValaGirParserMetadata* _tmp664_; - gchar* _tmp665_ = NULL; - gchar* _tmp666_; - _tmp663_ = self->symbol; - _tmp664_ = self->metadata; - _tmp665_ = vala_gir_parser_metadata_get_string (_tmp664_, VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE); - _tmp666_ = _tmp665_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp663_, "Deprecated", "since", _tmp666_, NULL); - _g_free0 (_tmp666_); - } else { - ValaMap* _tmp667_; - gpointer _tmp668_ = NULL; + _tmp658_ = self->metadata; + _tmp659_ = vala_gir_parser_metadata_has_argument (_tmp658_, VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT); + if (_tmp659_) { + ValaSymbol* _tmp660_; + ValaGirParserMetadata* _tmp661_; + gchar* _tmp662_ = NULL; + gchar* _tmp663_; + _tmp660_ = self->symbol; + _tmp661_ = self->metadata; + _tmp662_ = vala_gir_parser_metadata_get_string (_tmp661_, VALA_GIR_PARSER_ARGUMENT_TYPE_REPLACEMENT); + _tmp663_ = _tmp662_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp660_, "Deprecated", "replacement", _tmp663_, NULL); + _g_free0 (_tmp663_); + } + _tmp664_ = self->metadata; + _tmp665_ = vala_gir_parser_metadata_has_argument (_tmp664_, VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE); + if (_tmp665_) { + ValaSymbol* _tmp666_; + ValaGirParserMetadata* _tmp667_; + gchar* _tmp668_ = NULL; gchar* _tmp669_; - gboolean _tmp670_; - _tmp667_ = self->girdata; - _tmp668_ = vala_map_get (_tmp667_, "deprecated-version"); - _tmp669_ = (gchar*) _tmp668_; - _tmp670_ = _tmp669_ != NULL; + _tmp666_ = self->symbol; + _tmp667_ = self->metadata; + _tmp668_ = vala_gir_parser_metadata_get_string (_tmp667_, VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED_SINCE); + _tmp669_ = _tmp668_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp666_, "Deprecated", "since", _tmp669_, NULL); _g_free0 (_tmp669_); - if (_tmp670_) { - ValaSymbol* _tmp671_; - ValaMap* _tmp672_; - gpointer _tmp673_ = NULL; - gchar* _tmp674_; - _tmp671_ = self->symbol; - _tmp672_ = self->girdata; - _tmp673_ = vala_map_get (_tmp672_, "deprecated-version"); - _tmp674_ = (gchar*) _tmp673_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp671_, "Deprecated", "since", _tmp674_, NULL); - _g_free0 (_tmp674_); - } - } - _tmp675_ = self->metadata; - _tmp676_ = vala_gir_parser_metadata_get_bool (_tmp675_, VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED, FALSE); - if (_tmp676_) { - ValaSymbol* _tmp677_; - _tmp677_ = self->symbol; - vala_code_node_set_attribute ((ValaCodeNode*) _tmp677_, "Deprecated", TRUE, NULL); - } - _tmp678_ = self->parent; - _tmp679_ = _tmp678_->symbol; - if (VALA_IS_NAMESPACE (_tmp679_)) { + } else { + ValaMap* _tmp670_; + gpointer _tmp671_ = NULL; + gchar* _tmp672_; + gboolean _tmp673_; + _tmp670_ = self->girdata; + _tmp671_ = vala_map_get (_tmp670_, "deprecated-version"); + _tmp672_ = (gchar*) _tmp671_; + _tmp673_ = _tmp672_ != NULL; + _g_free0 (_tmp672_); + if (_tmp673_) { + ValaSymbol* _tmp674_; + ValaMap* _tmp675_; + gpointer _tmp676_ = NULL; + gchar* _tmp677_; + _tmp674_ = self->symbol; + _tmp675_ = self->girdata; + _tmp676_ = vala_map_get (_tmp675_, "deprecated-version"); + _tmp677_ = (gchar*) _tmp676_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp674_, "Deprecated", "since", _tmp677_, NULL); + _g_free0 (_tmp677_); + } + } + _tmp678_ = self->metadata; + _tmp679_ = vala_gir_parser_metadata_get_bool (_tmp678_, VALA_GIR_PARSER_ARGUMENT_TYPE_DEPRECATED, FALSE); + if (_tmp679_) { ValaSymbol* _tmp680_; - gchar* _tmp681_ = NULL; - gchar* _tmp682_; _tmp680_ = self->symbol; - _tmp681_ = vala_gir_parser_node_get_cheader_filename (self); - _tmp682_ = _tmp681_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp680_, "CCode", "cheader_filename", _tmp682_, NULL); - _g_free0 (_tmp682_); + vala_code_node_set_attribute ((ValaCodeNode*) _tmp680_, "Deprecated", TRUE, NULL); + } + _tmp681_ = self->parent; + _tmp682_ = _tmp681_->symbol; + if (VALA_IS_NAMESPACE (_tmp682_)) { + ValaSymbol* _tmp683_; + gchar* _tmp684_ = NULL; + gchar* _tmp685_; + _tmp683_ = self->symbol; + _tmp684_ = vala_gir_parser_node_get_cheader_filename (self); + _tmp685_ = _tmp684_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp683_, "CCode", "cheader_filename", _tmp685_, NULL); + _g_free0 (_tmp685_); } else { - ValaGirParserMetadata* _tmp683_; - gboolean _tmp684_ = FALSE; - _tmp683_ = self->metadata; - _tmp684_ = vala_gir_parser_metadata_has_argument (_tmp683_, VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME); - if (_tmp684_) { - ValaSymbol* _tmp685_; - ValaGirParserMetadata* _tmp686_; - gchar* _tmp687_ = NULL; - gchar* _tmp688_; - _tmp685_ = self->symbol; - _tmp686_ = self->metadata; - _tmp687_ = vala_gir_parser_metadata_get_string (_tmp686_, VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME); - _tmp688_ = _tmp687_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp685_, "CCode", "cheader_filename", _tmp688_, NULL); - _g_free0 (_tmp688_); - } - } - _tmp689_ = vala_gir_parser_node_get_cname (self); - _tmp690_ = _tmp689_; - _tmp691_ = vala_gir_parser_node_get_default_cname (self); - _tmp692_ = _tmp691_; - _tmp693_ = g_strcmp0 (_tmp690_, _tmp692_) != 0; - _g_free0 (_tmp692_); - _g_free0 (_tmp690_); - if (_tmp693_) { - ValaSymbol* _tmp694_; - gchar* _tmp695_ = NULL; - gchar* _tmp696_; - _tmp694_ = self->symbol; - _tmp695_ = vala_gir_parser_node_get_cname (self); - _tmp696_ = _tmp695_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp694_, "CCode", "cname", _tmp696_, NULL); - _g_free0 (_tmp696_); - } - _tmp697_ = vala_gir_parser_node_get_lower_case_cprefix (self); - _tmp698_ = _tmp697_; - _tmp699_ = vala_gir_parser_node_get_default_lower_case_cprefix (self); - _tmp700_ = _tmp699_; - _tmp701_ = g_strcmp0 (_tmp698_, _tmp700_) != 0; - _g_free0 (_tmp700_); - _g_free0 (_tmp698_); - if (_tmp701_) { - ValaSymbol* _tmp702_; - _tmp702_ = self->symbol; - if (VALA_IS_CLASS (_tmp702_)) { - ValaSymbol* _tmp703_; - gchar* _tmp704_ = NULL; - gchar* _tmp705_; - _tmp703_ = self->symbol; - _tmp704_ = vala_gir_parser_node_get_lower_case_cprefix (self); - _tmp705_ = _tmp704_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp703_, "CCode", "cprefix", _tmp705_, NULL); - _g_free0 (_tmp705_); - } else { + ValaGirParserMetadata* _tmp686_; + gboolean _tmp687_ = FALSE; + _tmp686_ = self->metadata; + _tmp687_ = vala_gir_parser_metadata_has_argument (_tmp686_, VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME); + if (_tmp687_) { + ValaSymbol* _tmp688_; + ValaGirParserMetadata* _tmp689_; + gchar* _tmp690_ = NULL; + gchar* _tmp691_; + _tmp688_ = self->symbol; + _tmp689_ = self->metadata; + _tmp690_ = vala_gir_parser_metadata_get_string (_tmp689_, VALA_GIR_PARSER_ARGUMENT_TYPE_CHEADER_FILENAME); + _tmp691_ = _tmp690_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp688_, "CCode", "cheader_filename", _tmp691_, NULL); + _g_free0 (_tmp691_); + } + } + _tmp692_ = vala_gir_parser_node_get_cname (self); + _tmp693_ = _tmp692_; + _tmp694_ = vala_gir_parser_node_get_default_cname (self); + _tmp695_ = _tmp694_; + _tmp696_ = g_strcmp0 (_tmp693_, _tmp695_) != 0; + _g_free0 (_tmp695_); + _g_free0 (_tmp693_); + if (_tmp696_) { + ValaSymbol* _tmp697_; + gchar* _tmp698_ = NULL; + gchar* _tmp699_; + _tmp697_ = self->symbol; + _tmp698_ = vala_gir_parser_node_get_cname (self); + _tmp699_ = _tmp698_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp697_, "CCode", "cname", _tmp699_, NULL); + _g_free0 (_tmp699_); + } + _tmp700_ = vala_gir_parser_node_get_lower_case_cprefix (self); + _tmp701_ = _tmp700_; + _tmp702_ = vala_gir_parser_node_get_default_lower_case_cprefix (self); + _tmp703_ = _tmp702_; + _tmp704_ = g_strcmp0 (_tmp701_, _tmp703_) != 0; + _g_free0 (_tmp703_); + _g_free0 (_tmp701_); + if (_tmp704_) { + ValaSymbol* _tmp705_; + _tmp705_ = self->symbol; + if (VALA_IS_CLASS (_tmp705_)) { ValaSymbol* _tmp706_; gchar* _tmp707_ = NULL; gchar* _tmp708_; _tmp706_ = self->symbol; _tmp707_ = vala_gir_parser_node_get_lower_case_cprefix (self); _tmp708_ = _tmp707_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp706_, "CCode", "lower_case_cprefix", _tmp708_, NULL); + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp706_, "CCode", "cprefix", _tmp708_, NULL); _g_free0 (_tmp708_); - } - } - _tmp709_ = vala_gir_parser_node_get_lower_case_csuffix (self); - _tmp710_ = _tmp709_; - _tmp711_ = vala_gir_parser_node_get_default_lower_case_csuffix (self); - _tmp712_ = _tmp711_; - _tmp713_ = g_strcmp0 (_tmp710_, _tmp712_) != 0; - _g_free0 (_tmp712_); - _g_free0 (_tmp710_); - if (_tmp713_) { - ValaSymbol* _tmp714_; - gchar* _tmp715_ = NULL; - gchar* _tmp716_; - _tmp714_ = self->symbol; - _tmp715_ = vala_gir_parser_node_get_lower_case_csuffix (self); - _tmp716_ = _tmp715_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp714_, "CCode", "lower_case_csuffix", _tmp716_, NULL); - _g_free0 (_tmp716_); - } - _tmp719_ = self->symbol; - _tmp720_ = vala_gir_parser_is_container (_tmp719_); - if (_tmp720_) { - ValaSymbol* _tmp721_; - _tmp721_ = self->symbol; - _tmp718_ = !VALA_IS_NAMESPACE (_tmp721_); + } else { + ValaSymbol* _tmp709_; + gchar* _tmp710_ = NULL; + gchar* _tmp711_; + _tmp709_ = self->symbol; + _tmp710_ = vala_gir_parser_node_get_lower_case_cprefix (self); + _tmp711_ = _tmp710_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp709_, "CCode", "lower_case_cprefix", _tmp711_, NULL); + _g_free0 (_tmp711_); + } + } + _tmp712_ = vala_gir_parser_node_get_lower_case_csuffix (self); + _tmp713_ = _tmp712_; + _tmp714_ = vala_gir_parser_node_get_default_lower_case_csuffix (self); + _tmp715_ = _tmp714_; + _tmp716_ = g_strcmp0 (_tmp713_, _tmp715_) != 0; + _g_free0 (_tmp715_); + _g_free0 (_tmp713_); + if (_tmp716_) { + ValaSymbol* _tmp717_; + gchar* _tmp718_ = NULL; + gchar* _tmp719_; + _tmp717_ = self->symbol; + _tmp718_ = vala_gir_parser_node_get_lower_case_csuffix (self); + _tmp719_ = _tmp718_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp717_, "CCode", "lower_case_csuffix", _tmp719_, NULL); + _g_free0 (_tmp719_); + } + _tmp722_ = self->symbol; + _tmp723_ = vala_gir_parser_is_container (_tmp722_); + if (_tmp723_) { + ValaSymbol* _tmp724_; + _tmp724_ = self->symbol; + _tmp721_ = !VALA_IS_NAMESPACE (_tmp724_); } else { - _tmp718_ = FALSE; + _tmp721_ = FALSE; } - _tmp722_ = _tmp718_; - if (_tmp722_) { - const gchar* _tmp723_; - gchar* _tmp724_ = NULL; - gchar* _tmp725_; - _tmp723_ = self->name; - _tmp724_ = vala_gir_parser_node_get_gir_name (self); - _tmp725_ = _tmp724_; - _tmp717_ = g_strcmp0 (_tmp723_, _tmp725_) != 0; - _g_free0 (_tmp725_); + _tmp725_ = _tmp721_; + if (_tmp725_) { + const gchar* _tmp726_; + gchar* _tmp727_ = NULL; + gchar* _tmp728_; + _tmp726_ = self->name; + _tmp727_ = vala_gir_parser_node_get_gir_name (self); + _tmp728_ = _tmp727_; + _tmp720_ = g_strcmp0 (_tmp726_, _tmp728_) != 0; + _g_free0 (_tmp728_); } else { - _tmp717_ = FALSE; + _tmp720_ = FALSE; } - _tmp726_ = _tmp717_; - if (_tmp726_) { - ValaSymbol* _tmp727_; - gchar* _tmp728_ = NULL; - gchar* _tmp729_; - _tmp727_ = self->symbol; - _tmp728_ = vala_gir_parser_node_get_gir_name (self); - _tmp729_ = _tmp728_; - vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp727_, "GIR", "name", _tmp729_, NULL); - _g_free0 (_tmp729_); - } - } - _tmp732_ = self->new_symbol; - if (_tmp732_) { - gboolean _tmp733_; - _tmp733_ = self->merged; - _tmp731_ = _tmp733_; - } else { - _tmp731_ = FALSE; - } - _tmp734_ = _tmp731_; - if (!_tmp734_) { - ValaSymbol* _tmp735_; - gboolean _tmp736_ = FALSE; - _tmp735_ = self->symbol; - _tmp736_ = vala_gir_parser_is_container (_tmp735_); - _tmp730_ = _tmp736_; - } else { - _tmp730_ = FALSE; - } - _tmp737_ = _tmp730_; - if (_tmp737_) { - ValaSymbol* _tmp762_; - ValaClass* _tmp763_; - ValaClass* cl; - gboolean _tmp764_ = FALSE; - gboolean _tmp765_ = FALSE; + _tmp729_ = _tmp720_; + if (_tmp729_) { + ValaSymbol* _tmp730_; + gchar* _tmp731_ = NULL; + gchar* _tmp732_; + _tmp730_ = self->symbol; + _tmp731_ = vala_gir_parser_node_get_gir_name (self); + _tmp732_ = _tmp731_; + vala_code_node_set_attribute_string ((ValaCodeNode*) _tmp730_, "GIR", "name", _tmp732_, NULL); + _g_free0 (_tmp732_); + } + } + _tmp735_ = self->new_symbol; + if (_tmp735_) { + gboolean _tmp736_; + _tmp736_ = self->merged; + _tmp734_ = _tmp736_; + } else { + _tmp734_ = FALSE; + } + _tmp737_ = _tmp734_; + if (!_tmp737_) { + ValaSymbol* _tmp738_; + gboolean _tmp739_ = FALSE; + _tmp738_ = self->symbol; + _tmp739_ = vala_gir_parser_is_container (_tmp738_); + _tmp733_ = _tmp739_; + } else { + _tmp733_ = FALSE; + } + _tmp740_ = _tmp733_; + if (_tmp740_) { + ValaSymbol* _tmp765_; ValaClass* _tmp766_; - gboolean _tmp770_; - gboolean _tmp774_; + ValaClass* cl; + gboolean _tmp767_ = FALSE; + gboolean _tmp768_ = FALSE; + ValaClass* _tmp769_; + gboolean _tmp773_; + gboolean _tmp777_; { - ValaArrayList* _tmp738_; - ValaArrayList* _tmp739_; + ValaArrayList* _tmp741_; + ValaArrayList* _tmp742_; ValaArrayList* _node_list; - ValaArrayList* _tmp740_; - gint _tmp741_; - gint _tmp742_; + ValaArrayList* _tmp743_; + gint _tmp744_; + gint _tmp745_; gint _node_size; gint _node_index; - _tmp738_ = self->members; - _tmp739_ = _vala_iterable_ref0 (_tmp738_); - _node_list = _tmp739_; - _tmp740_ = _node_list; - _tmp741_ = vala_collection_get_size ((ValaCollection*) _tmp740_); - _tmp742_ = _tmp741_; - _node_size = _tmp742_; + _tmp741_ = self->members; + _tmp742_ = _vala_iterable_ref0 (_tmp741_); + _node_list = _tmp742_; + _tmp743_ = _node_list; + _tmp744_ = vala_collection_get_size ((ValaCollection*) _tmp743_); + _tmp745_ = _tmp744_; + _node_size = _tmp745_; _node_index = -1; while (TRUE) { - gint _tmp743_; - gint _tmp744_; - gint _tmp745_; - ValaArrayList* _tmp746_; + gint _tmp746_; gint _tmp747_; - gpointer _tmp748_ = NULL; + gint _tmp748_; + ValaArrayList* _tmp749_; + gint _tmp750_; + gpointer _tmp751_ = NULL; ValaGirParserNode* node; - gboolean _tmp749_ = FALSE; - gboolean _tmp750_ = FALSE; - ValaGirParserNode* _tmp751_; - gboolean _tmp752_; + gboolean _tmp752_ = FALSE; + gboolean _tmp753_ = FALSE; + ValaGirParserNode* _tmp754_; gboolean _tmp755_; gboolean _tmp758_; - _tmp743_ = _node_index; - _node_index = _tmp743_ + 1; - _tmp744_ = _node_index; - _tmp745_ = _node_size; - if (!(_tmp744_ < _tmp745_)) { - break; - } - _tmp746_ = _node_list; + gboolean _tmp761_; + _tmp746_ = _node_index; + _node_index = _tmp746_ + 1; _tmp747_ = _node_index; - _tmp748_ = vala_list_get ((ValaList*) _tmp746_, _tmp747_); - node = (ValaGirParserNode*) _tmp748_; - _tmp751_ = node; - _tmp752_ = _tmp751_->new_symbol; - if (_tmp752_) { - ValaGirParserNode* _tmp753_; - gboolean _tmp754_; - _tmp753_ = node; - _tmp754_ = _tmp753_->merged; - _tmp750_ = !_tmp754_; - } else { - _tmp750_ = FALSE; + _tmp748_ = _node_size; + if (!(_tmp747_ < _tmp748_)) { + break; } - _tmp755_ = _tmp750_; + _tmp749_ = _node_list; + _tmp750_ = _node_index; + _tmp751_ = vala_list_get ((ValaList*) _tmp749_, _tmp750_); + node = (ValaGirParserNode*) _tmp751_; + _tmp754_ = node; + _tmp755_ = _tmp754_->new_symbol; if (_tmp755_) { - ValaGirParserMetadata* _tmp756_; - gboolean _tmp757_ = FALSE; - _tmp756_ = self->metadata; - _tmp757_ = vala_gir_parser_metadata_get_bool (_tmp756_, VALA_GIR_PARSER_ARGUMENT_TYPE_HIDDEN, FALSE); - _tmp749_ = !_tmp757_; + ValaGirParserNode* _tmp756_; + gboolean _tmp757_; + _tmp756_ = node; + _tmp757_ = _tmp756_->merged; + _tmp753_ = !_tmp757_; } else { - _tmp749_ = FALSE; + _tmp753_ = FALSE; } - _tmp758_ = _tmp749_; + _tmp758_ = _tmp753_; if (_tmp758_) { - ValaSymbol* _tmp759_; - ValaGirParserNode* _tmp760_; - ValaSymbol* _tmp761_; - _tmp759_ = self->symbol; - _tmp760_ = node; - _tmp761_ = _tmp760_->symbol; - vala_gir_parser_add_symbol_to_container (_tmp759_, _tmp761_); + ValaGirParserMetadata* _tmp759_; + gboolean _tmp760_ = FALSE; + _tmp759_ = self->metadata; + _tmp760_ = vala_gir_parser_metadata_get_bool (_tmp759_, VALA_GIR_PARSER_ARGUMENT_TYPE_HIDDEN, FALSE); + _tmp752_ = !_tmp760_; + } else { + _tmp752_ = FALSE; + } + _tmp761_ = _tmp752_; + if (_tmp761_) { + ValaSymbol* _tmp762_; + ValaGirParserNode* _tmp763_; + ValaSymbol* _tmp764_; + _tmp762_ = self->symbol; + _tmp763_ = node; + _tmp764_ = _tmp763_->symbol; + vala_gir_parser_add_symbol_to_container (_tmp762_, _tmp764_); } _vala_gir_parser_node_unref0 (node); } _vala_iterable_unref0 (_node_list); } - _tmp762_ = self->symbol; - _tmp763_ = _vala_code_node_ref0 (VALA_IS_CLASS (_tmp762_) ? ((ValaClass*) _tmp762_) : NULL); - cl = _tmp763_; - _tmp766_ = cl; - if (_tmp766_ != NULL) { - ValaClass* _tmp767_; - gboolean _tmp768_; - gboolean _tmp769_; - _tmp767_ = cl; - _tmp768_ = vala_class_get_is_compact (_tmp767_); - _tmp769_ = _tmp768_; - _tmp765_ = !_tmp769_; + _tmp765_ = self->symbol; + _tmp766_ = _vala_code_node_ref0 (VALA_IS_CLASS (_tmp765_) ? ((ValaClass*) _tmp765_) : NULL); + cl = _tmp766_; + _tmp769_ = cl; + if (_tmp769_ != NULL) { + ValaClass* _tmp770_; + gboolean _tmp771_; + gboolean _tmp772_; + _tmp770_ = cl; + _tmp771_ = vala_class_get_is_compact (_tmp770_); + _tmp772_ = _tmp771_; + _tmp768_ = !_tmp772_; } else { - _tmp765_ = FALSE; + _tmp768_ = FALSE; } - _tmp770_ = _tmp765_; - if (_tmp770_) { - ValaClass* _tmp771_; - ValaMethod* _tmp772_; - ValaMethod* _tmp773_; - _tmp771_ = cl; - _tmp772_ = vala_class_get_default_construction_method (_tmp771_); - _tmp773_ = _tmp772_; - _tmp764_ = _tmp773_ == NULL; + _tmp773_ = _tmp768_; + if (_tmp773_) { + ValaClass* _tmp774_; + ValaMethod* _tmp775_; + ValaMethod* _tmp776_; + _tmp774_ = cl; + _tmp775_ = vala_class_get_default_construction_method (_tmp774_); + _tmp776_ = _tmp775_; + _tmp767_ = _tmp776_ == NULL; } else { - _tmp764_ = FALSE; + _tmp767_ = FALSE; } - _tmp774_ = _tmp764_; - if (_tmp774_) { - ValaClass* _tmp775_; - ValaSourceReference* _tmp776_; - ValaSourceReference* _tmp777_; - ValaCreationMethod* _tmp778_; + _tmp777_ = _tmp767_; + if (_tmp777_) { + ValaClass* _tmp778_; + ValaSourceReference* _tmp779_; + ValaSourceReference* _tmp780_; + ValaCreationMethod* _tmp781_; ValaCreationMethod* cm; - ValaCreationMethod* _tmp779_; - ValaCreationMethod* _tmp780_; - ValaClass* _tmp781_; ValaCreationMethod* _tmp782_; - _tmp775_ = cl; - _tmp776_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp775_); - _tmp777_ = _tmp776_; - _tmp778_ = vala_creation_method_new (NULL, NULL, _tmp777_, NULL); - cm = _tmp778_; - _tmp779_ = cm; - vala_method_set_has_construct_function ((ValaMethod*) _tmp779_, FALSE); - _tmp780_ = cm; - vala_symbol_set_access ((ValaSymbol*) _tmp780_, VALA_SYMBOL_ACCESSIBILITY_PROTECTED); - _tmp781_ = cl; + ValaCreationMethod* _tmp783_; + ValaClass* _tmp784_; + ValaCreationMethod* _tmp785_; + _tmp778_ = cl; + _tmp779_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp778_); + _tmp780_ = _tmp779_; + _tmp781_ = vala_creation_method_new (NULL, NULL, _tmp780_, NULL); + cm = _tmp781_; _tmp782_ = cm; - vala_symbol_add_method ((ValaSymbol*) _tmp781_, (ValaMethod*) _tmp782_); + vala_method_set_has_construct_function ((ValaMethod*) _tmp782_, FALSE); + _tmp783_ = cm; + vala_symbol_set_access ((ValaSymbol*) _tmp783_, VALA_SYMBOL_ACCESSIBILITY_PROTECTED); + _tmp784_ = cl; + _tmp785_ = cm; + vala_symbol_add_method ((ValaSymbol*) _tmp784_, (ValaMethod*) _tmp785_); _vala_code_node_unref0 (cm); } _vala_code_node_unref0 (cl); diff -Nru vala-0.16-0.15.1/vala/valagirparser.vala vala-0.16-0.15.2/vala/valagirparser.vala --- vala-0.16-0.15.1/vala/valagirparser.vala 2012-01-26 19:42:09.000000000 +0000 +++ vala-0.16-0.15.2/vala/valagirparser.vala 2012-02-23 15:06:39.000000000 +0000 @@ -69,7 +69,8 @@ CLOSURE, CPREFIX, LOWER_CASE_CPREFIX, - ERRORDOMAIN; + ERRORDOMAIN, + DESTROYS_INSTANCE; public static ArgumentType? from_string (string name) { var enum_class = (EnumClass) typeof(ArgumentType).class_ref (); @@ -799,6 +800,9 @@ } } if (!(m is CreationMethod)) { + if (metadata.has_argument (ArgumentType.DESTROYS_INSTANCE)) { + m.set_attribute ("DestroysInstance", true); + } // merge custom vfunc if (metadata.has_argument (ArgumentType.VFUNC_NAME)) { var vfunc = parent.lookup (metadata.get_string (ArgumentType.VFUNC_NAME)); @@ -2748,10 +2752,8 @@ } if (invoker == null && !metadata.has_argument (ArgumentType.VFUNC_NAME)) { s.set_attribute ("NoWrapper", true, s.source_reference); - } else { - if (current.girdata["name"] != name) { - m.set_attribute_string ("CCode", "vfunc_name", current.girdata["name"]); - } + } if (current.girdata["name"] != name) { + m.set_attribute_string ("CCode", "vfunc_name", current.girdata["name"]); } } else if (element_name == "function") { m.binding = MemberBinding.STATIC; diff -Nru vala-0.16-0.15.1/vala/valainitializerlist.c vala-0.16-0.15.2/vala/valainitializerlist.c --- vala-0.16-0.15.1/vala/valainitializerlist.c 2012-01-26 21:07:51.000000000 +0000 +++ vala-0.16-0.15.2/vala/valainitializerlist.c 2012-02-25 16:21:45.000000000 +0000 @@ -381,6 +381,7 @@ GType vala_typesymbol_get_type (void) G_GNUC_CONST; ValaTypeSymbol* vala_data_type_get_data_type (ValaDataType* self); GType vala_struct_get_type (void) G_GNUC_CONST; +ValaStruct* vala_struct_get_base_struct (ValaStruct* self); GType vala_field_get_type (void) G_GNUC_CONST; ValaList* vala_struct_get_fields (ValaStruct* self); gchar* vala_code_node_to_string (ValaCodeNode* self); @@ -720,8 +721,8 @@ ValaDataType* _tmp4_; ValaDataType* _tmp5_; gboolean _error_; - gboolean _tmp199_; gboolean _tmp206_; + gboolean _tmp213_; self = (ValaInitializerList*) base; g_return_val_if_fail (context != NULL, FALSE); _tmp0_ = vala_code_node_get_checked ((ValaCodeNode*) self); @@ -950,11 +951,11 @@ ValaTypeSymbol* _tmp79_; ValaStruct* _tmp80_; ValaStruct* st; - ValaStruct* _tmp81_; - ValaList* _tmp82_ = NULL; - ValaList* _tmp83_; - ValaIterator* _tmp84_ = NULL; - ValaIterator* _tmp85_; + ValaStruct* _tmp88_; + ValaList* _tmp89_ = NULL; + ValaList* _tmp90_; + ValaIterator* _tmp91_ = NULL; + ValaIterator* _tmp92_; ValaIterator* field_it; _tmp76_ = vala_expression_get_target_type ((ValaExpression*) self); _tmp77_ = _tmp76_; @@ -962,97 +963,118 @@ _tmp79_ = _tmp78_; _tmp80_ = _vala_code_node_ref0 (VALA_STRUCT (_tmp79_)); st = _tmp80_; - _tmp81_ = st; - _tmp82_ = vala_struct_get_fields (_tmp81_); - _tmp83_ = _tmp82_; - _tmp84_ = vala_iterable_iterator ((ValaIterable*) _tmp83_); - _tmp85_ = _tmp84_; - _vala_iterable_unref0 (_tmp83_); - field_it = _tmp85_; + while (TRUE) { + ValaStruct* _tmp81_; + ValaStruct* _tmp82_; + ValaStruct* _tmp83_; + ValaStruct* _tmp84_; + ValaStruct* _tmp85_; + ValaStruct* _tmp86_; + ValaStruct* _tmp87_; + _tmp81_ = st; + _tmp82_ = vala_struct_get_base_struct (_tmp81_); + _tmp83_ = _tmp82_; + if (!(_tmp83_ != NULL)) { + break; + } + _tmp84_ = st; + _tmp85_ = vala_struct_get_base_struct (_tmp84_); + _tmp86_ = _tmp85_; + _tmp87_ = _vala_code_node_ref0 (_tmp86_); + _vala_code_node_unref0 (st); + st = _tmp87_; + } + _tmp88_ = st; + _tmp89_ = vala_struct_get_fields (_tmp88_); + _tmp90_ = _tmp89_; + _tmp91_ = vala_iterable_iterator ((ValaIterable*) _tmp90_); + _tmp92_ = _tmp91_; + _vala_iterable_unref0 (_tmp90_); + field_it = _tmp92_; { - ValaList* _tmp86_ = NULL; + ValaList* _tmp93_ = NULL; ValaList* _e_list; - ValaList* _tmp87_; - gint _tmp88_; - gint _tmp89_; + ValaList* _tmp94_; + gint _tmp95_; + gint _tmp96_; gint _e_size; gint _e_index; - _tmp86_ = vala_initializer_list_get_initializers (self); - _e_list = _tmp86_; - _tmp87_ = _e_list; - _tmp88_ = vala_collection_get_size ((ValaCollection*) _tmp87_); - _tmp89_ = _tmp88_; - _e_size = _tmp89_; + _tmp93_ = vala_initializer_list_get_initializers (self); + _e_list = _tmp93_; + _tmp94_ = _e_list; + _tmp95_ = vala_collection_get_size ((ValaCollection*) _tmp94_); + _tmp96_ = _tmp95_; + _e_size = _tmp96_; _e_index = -1; while (TRUE) { - gint _tmp90_; - gint _tmp91_; - gint _tmp92_; - ValaList* _tmp93_; - gint _tmp94_; - gpointer _tmp95_ = NULL; + gint _tmp97_; + gint _tmp98_; + gint _tmp99_; + ValaList* _tmp100_; + gint _tmp101_; + gpointer _tmp102_ = NULL; ValaExpression* e; ValaField* field; - ValaExpression* _tmp113_; - ValaField* _tmp114_; - ValaDataType* _tmp115_; - ValaDataType* _tmp116_; - ValaDataType* _tmp117_ = NULL; - ValaDataType* _tmp118_; - ValaDataType* _tmp119_; - ValaDataType* _tmp120_; - gboolean _tmp121_; - gboolean _tmp122_; - _tmp90_ = _e_index; - _e_index = _tmp90_ + 1; - _tmp91_ = _e_index; - _tmp92_ = _e_size; - if (!(_tmp91_ < _tmp92_)) { + ValaExpression* _tmp120_; + ValaField* _tmp121_; + ValaDataType* _tmp122_; + ValaDataType* _tmp123_; + ValaDataType* _tmp124_ = NULL; + ValaDataType* _tmp125_; + ValaDataType* _tmp126_; + ValaDataType* _tmp127_; + gboolean _tmp128_; + gboolean _tmp129_; + _tmp97_ = _e_index; + _e_index = _tmp97_ + 1; + _tmp98_ = _e_index; + _tmp99_ = _e_size; + if (!(_tmp98_ < _tmp99_)) { break; } - _tmp93_ = _e_list; - _tmp94_ = _e_index; - _tmp95_ = vala_list_get (_tmp93_, _tmp94_); - e = (ValaExpression*) _tmp95_; + _tmp100_ = _e_list; + _tmp101_ = _e_index; + _tmp102_ = vala_list_get (_tmp100_, _tmp101_); + e = (ValaExpression*) _tmp102_; field = NULL; while (TRUE) { - ValaField* _tmp96_; - ValaIterator* _tmp97_; - gboolean _tmp98_ = FALSE; - ValaIterator* _tmp108_; - gpointer _tmp109_ = NULL; - ValaField* _tmp110_; - ValaMemberBinding _tmp111_; - ValaMemberBinding _tmp112_; - _tmp96_ = field; - if (!(_tmp96_ == NULL)) { + ValaField* _tmp103_; + ValaIterator* _tmp104_; + gboolean _tmp105_ = FALSE; + ValaIterator* _tmp115_; + gpointer _tmp116_ = NULL; + ValaField* _tmp117_; + ValaMemberBinding _tmp118_; + ValaMemberBinding _tmp119_; + _tmp103_ = field; + if (!(_tmp103_ == NULL)) { break; } - _tmp97_ = field_it; - _tmp98_ = vala_iterator_next (_tmp97_); - if (!_tmp98_) { - ValaExpression* _tmp99_; - ValaSourceReference* _tmp100_; - ValaSourceReference* _tmp101_; - ValaDataType* _tmp102_; - ValaDataType* _tmp103_; - gchar* _tmp104_ = NULL; - gchar* _tmp105_; - gchar* _tmp106_ = NULL; - gchar* _tmp107_; + _tmp104_ = field_it; + _tmp105_ = vala_iterator_next (_tmp104_); + if (!_tmp105_) { + ValaExpression* _tmp106_; + ValaSourceReference* _tmp107_; + ValaSourceReference* _tmp108_; + ValaDataType* _tmp109_; + ValaDataType* _tmp110_; + gchar* _tmp111_ = NULL; + gchar* _tmp112_; + gchar* _tmp113_ = NULL; + gchar* _tmp114_; vala_code_node_set_error ((ValaCodeNode*) self, TRUE); - _tmp99_ = e; - _tmp100_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp99_); - _tmp101_ = _tmp100_; - _tmp102_ = vala_expression_get_target_type ((ValaExpression*) self); - _tmp103_ = _tmp102_; - _tmp104_ = vala_code_node_to_string ((ValaCodeNode*) _tmp103_); - _tmp105_ = _tmp104_; - _tmp106_ = g_strdup_printf ("too many expressions in initializer list for `%s'", _tmp105_); - _tmp107_ = _tmp106_; - vala_report_error (_tmp101_, _tmp107_); - _g_free0 (_tmp107_); - _g_free0 (_tmp105_); + _tmp106_ = e; + _tmp107_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp106_); + _tmp108_ = _tmp107_; + _tmp109_ = vala_expression_get_target_type ((ValaExpression*) self); + _tmp110_ = _tmp109_; + _tmp111_ = vala_code_node_to_string ((ValaCodeNode*) _tmp110_); + _tmp112_ = _tmp111_; + _tmp113_ = g_strdup_printf ("too many expressions in initializer list for `%s'", _tmp112_); + _tmp114_ = _tmp113_; + vala_report_error (_tmp108_, _tmp114_); + _g_free0 (_tmp114_); + _g_free0 (_tmp112_); result = FALSE; _vala_code_node_unref0 (field); _vala_code_node_unref0 (e); @@ -1061,38 +1083,38 @@ _vala_code_node_unref0 (st); return result; } - _tmp108_ = field_it; - _tmp109_ = vala_iterator_get (_tmp108_); + _tmp115_ = field_it; + _tmp116_ = vala_iterator_get (_tmp115_); _vala_code_node_unref0 (field); - field = (ValaField*) _tmp109_; - _tmp110_ = field; - _tmp111_ = vala_field_get_binding (_tmp110_); - _tmp112_ = _tmp111_; - if (_tmp112_ != VALA_MEMBER_BINDING_INSTANCE) { + field = (ValaField*) _tmp116_; + _tmp117_ = field; + _tmp118_ = vala_field_get_binding (_tmp117_); + _tmp119_ = _tmp118_; + if (_tmp119_ != VALA_MEMBER_BINDING_INSTANCE) { _vala_code_node_unref0 (field); field = NULL; } } - _tmp113_ = e; - _tmp114_ = field; - _tmp115_ = vala_variable_get_variable_type ((ValaVariable*) _tmp114_); - _tmp116_ = _tmp115_; - _tmp117_ = vala_data_type_copy (_tmp116_); - _tmp118_ = _tmp117_; - vala_expression_set_target_type (_tmp113_, _tmp118_); - _vala_code_node_unref0 (_tmp118_); - _tmp119_ = vala_expression_get_target_type ((ValaExpression*) self); - _tmp120_ = _tmp119_; - _tmp121_ = vala_data_type_get_value_owned (_tmp120_); - _tmp122_ = _tmp121_; - if (!_tmp122_) { - ValaExpression* _tmp123_; - ValaDataType* _tmp124_; - ValaDataType* _tmp125_; - _tmp123_ = e; - _tmp124_ = vala_expression_get_target_type (_tmp123_); - _tmp125_ = _tmp124_; - vala_data_type_set_value_owned (_tmp125_, FALSE); + _tmp120_ = e; + _tmp121_ = field; + _tmp122_ = vala_variable_get_variable_type ((ValaVariable*) _tmp121_); + _tmp123_ = _tmp122_; + _tmp124_ = vala_data_type_copy (_tmp123_); + _tmp125_ = _tmp124_; + vala_expression_set_target_type (_tmp120_, _tmp125_); + _vala_code_node_unref0 (_tmp125_); + _tmp126_ = vala_expression_get_target_type ((ValaExpression*) self); + _tmp127_ = _tmp126_; + _tmp128_ = vala_data_type_get_value_owned (_tmp127_); + _tmp129_ = _tmp128_; + if (!_tmp129_) { + ValaExpression* _tmp130_; + ValaDataType* _tmp131_; + ValaDataType* _tmp132_; + _tmp130_ = e; + _tmp131_ = vala_expression_get_target_type (_tmp130_); + _tmp132_ = _tmp131_; + vala_data_type_set_value_owned (_tmp132_, FALSE); } _vala_code_node_unref0 (field); _vala_code_node_unref0 (e); @@ -1102,220 +1124,220 @@ _vala_iterator_unref0 (field_it); _vala_code_node_unref0 (st); } else { - ValaSourceReference* _tmp126_; - ValaSourceReference* _tmp127_; - ValaDataType* _tmp128_; - ValaDataType* _tmp129_; - gchar* _tmp130_ = NULL; - gchar* _tmp131_; - gchar* _tmp132_ = NULL; - gchar* _tmp133_; + ValaSourceReference* _tmp133_; + ValaSourceReference* _tmp134_; + ValaDataType* _tmp135_; + ValaDataType* _tmp136_; + gchar* _tmp137_ = NULL; + gchar* _tmp138_; + gchar* _tmp139_ = NULL; + gchar* _tmp140_; vala_code_node_set_error ((ValaCodeNode*) self, TRUE); - _tmp126_ = vala_code_node_get_source_reference ((ValaCodeNode*) self); - _tmp127_ = _tmp126_; - _tmp128_ = vala_expression_get_target_type ((ValaExpression*) self); - _tmp129_ = _tmp128_; - _tmp130_ = vala_code_node_to_string ((ValaCodeNode*) _tmp129_); - _tmp131_ = _tmp130_; - _tmp132_ = g_strdup_printf ("initializer list used for `%s', which is neither array nor struct", _tmp131_); - _tmp133_ = _tmp132_; - vala_report_error (_tmp127_, _tmp133_); - _g_free0 (_tmp133_); - _g_free0 (_tmp131_); + _tmp133_ = vala_code_node_get_source_reference ((ValaCodeNode*) self); + _tmp134_ = _tmp133_; + _tmp135_ = vala_expression_get_target_type ((ValaExpression*) self); + _tmp136_ = _tmp135_; + _tmp137_ = vala_code_node_to_string ((ValaCodeNode*) _tmp136_); + _tmp138_ = _tmp137_; + _tmp139_ = g_strdup_printf ("initializer list used for `%s', which is neither array nor struct", _tmp138_); + _tmp140_ = _tmp139_; + vala_report_error (_tmp134_, _tmp140_); + _g_free0 (_tmp140_); + _g_free0 (_tmp138_); result = FALSE; return result; } } } { - ValaList* _tmp134_; - ValaList* _tmp135_; + ValaList* _tmp141_; + ValaList* _tmp142_; ValaList* _expr_list; - ValaList* _tmp136_; - gint _tmp137_; - gint _tmp138_; + ValaList* _tmp143_; + gint _tmp144_; + gint _tmp145_; gint _expr_size; gint _expr_index; - _tmp134_ = self->priv->initializers; - _tmp135_ = _vala_iterable_ref0 (_tmp134_); - _expr_list = _tmp135_; - _tmp136_ = _expr_list; - _tmp137_ = vala_collection_get_size ((ValaCollection*) _tmp136_); - _tmp138_ = _tmp137_; - _expr_size = _tmp138_; + _tmp141_ = self->priv->initializers; + _tmp142_ = _vala_iterable_ref0 (_tmp141_); + _expr_list = _tmp142_; + _tmp143_ = _expr_list; + _tmp144_ = vala_collection_get_size ((ValaCollection*) _tmp143_); + _tmp145_ = _tmp144_; + _expr_size = _tmp145_; _expr_index = -1; while (TRUE) { - gint _tmp139_; - gint _tmp140_; - gint _tmp141_; - ValaList* _tmp142_; - gint _tmp143_; - gpointer _tmp144_ = NULL; + gint _tmp146_; + gint _tmp147_; + gint _tmp148_; + ValaList* _tmp149_; + gint _tmp150_; + gpointer _tmp151_ = NULL; ValaExpression* expr; - ValaExpression* _tmp145_; - ValaCodeContext* _tmp146_; - _tmp139_ = _expr_index; - _expr_index = _tmp139_ + 1; - _tmp140_ = _expr_index; - _tmp141_ = _expr_size; - if (!(_tmp140_ < _tmp141_)) { + ValaExpression* _tmp152_; + ValaCodeContext* _tmp153_; + _tmp146_ = _expr_index; + _expr_index = _tmp146_ + 1; + _tmp147_ = _expr_index; + _tmp148_ = _expr_size; + if (!(_tmp147_ < _tmp148_)) { break; } - _tmp142_ = _expr_list; - _tmp143_ = _expr_index; - _tmp144_ = vala_list_get (_tmp142_, _tmp143_); - expr = (ValaExpression*) _tmp144_; - _tmp145_ = expr; - _tmp146_ = context; - vala_code_node_check ((ValaCodeNode*) _tmp145_, _tmp146_); + _tmp149_ = _expr_list; + _tmp150_ = _expr_index; + _tmp151_ = vala_list_get (_tmp149_, _tmp150_); + expr = (ValaExpression*) _tmp151_; + _tmp152_ = expr; + _tmp153_ = context; + vala_code_node_check ((ValaCodeNode*) _tmp152_, _tmp153_); _vala_code_node_unref0 (expr); } _vala_iterable_unref0 (_expr_list); } _error_ = FALSE; { - ValaList* _tmp147_ = NULL; + ValaList* _tmp154_ = NULL; ValaList* _e_list; - ValaList* _tmp148_; - gint _tmp149_; - gint _tmp150_; + ValaList* _tmp155_; + gint _tmp156_; + gint _tmp157_; gint _e_size; gint _e_index; - _tmp147_ = vala_initializer_list_get_initializers (self); - _e_list = _tmp147_; - _tmp148_ = _e_list; - _tmp149_ = vala_collection_get_size ((ValaCollection*) _tmp148_); - _tmp150_ = _tmp149_; - _e_size = _tmp150_; + _tmp154_ = vala_initializer_list_get_initializers (self); + _e_list = _tmp154_; + _tmp155_ = _e_list; + _tmp156_ = vala_collection_get_size ((ValaCollection*) _tmp155_); + _tmp157_ = _tmp156_; + _e_size = _tmp157_; _e_index = -1; while (TRUE) { - gint _tmp151_; - gint _tmp152_; - gint _tmp153_; - ValaList* _tmp154_; - gint _tmp155_; - gpointer _tmp156_ = NULL; + gint _tmp158_; + gint _tmp159_; + gint _tmp160_; + ValaList* _tmp161_; + gint _tmp162_; + gpointer _tmp163_ = NULL; ValaExpression* e; - ValaExpression* _tmp157_; - ValaDataType* _tmp158_; - ValaDataType* _tmp159_; - ValaExpression* _tmp163_; - ValaUnaryExpression* _tmp164_; + ValaExpression* _tmp164_; + ValaDataType* _tmp165_; + ValaDataType* _tmp166_; + ValaExpression* _tmp170_; + ValaUnaryExpression* _tmp171_; ValaUnaryExpression* unary; - gboolean _tmp165_ = FALSE; - ValaUnaryExpression* _tmp166_; - gboolean _tmp175_; - _tmp151_ = _e_index; - _e_index = _tmp151_ + 1; - _tmp152_ = _e_index; - _tmp153_ = _e_size; - if (!(_tmp152_ < _tmp153_)) { + gboolean _tmp172_ = FALSE; + ValaUnaryExpression* _tmp173_; + gboolean _tmp182_; + _tmp158_ = _e_index; + _e_index = _tmp158_ + 1; + _tmp159_ = _e_index; + _tmp160_ = _e_size; + if (!(_tmp159_ < _tmp160_)) { break; } - _tmp154_ = _e_list; - _tmp155_ = _e_index; - _tmp156_ = vala_list_get (_tmp154_, _tmp155_); - e = (ValaExpression*) _tmp156_; - _tmp157_ = e; - _tmp158_ = vala_expression_get_value_type (_tmp157_); - _tmp159_ = _tmp158_; - if (_tmp159_ == NULL) { - ValaExpression* _tmp160_; - ValaSourceReference* _tmp161_; - ValaSourceReference* _tmp162_; + _tmp161_ = _e_list; + _tmp162_ = _e_index; + _tmp163_ = vala_list_get (_tmp161_, _tmp162_); + e = (ValaExpression*) _tmp163_; + _tmp164_ = e; + _tmp165_ = vala_expression_get_value_type (_tmp164_); + _tmp166_ = _tmp165_; + if (_tmp166_ == NULL) { + ValaExpression* _tmp167_; + ValaSourceReference* _tmp168_; + ValaSourceReference* _tmp169_; _error_ = TRUE; - _tmp160_ = e; - _tmp161_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp160_); - _tmp162_ = _tmp161_; - vala_report_error (_tmp162_, "expression type not allowed as initializer"); + _tmp167_ = e; + _tmp168_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp167_); + _tmp169_ = _tmp168_; + vala_report_error (_tmp169_, "expression type not allowed as initializer"); _vala_code_node_unref0 (e); continue; } - _tmp163_ = e; - _tmp164_ = _vala_code_node_ref0 (VALA_IS_UNARY_EXPRESSION (_tmp163_) ? ((ValaUnaryExpression*) _tmp163_) : NULL); - unary = _tmp164_; - _tmp166_ = unary; - if (_tmp166_ != NULL) { - gboolean _tmp167_ = FALSE; - ValaUnaryExpression* _tmp168_; - ValaUnaryOperator _tmp169_; - ValaUnaryOperator _tmp170_; - gboolean _tmp174_; - _tmp168_ = unary; - _tmp169_ = vala_unary_expression_get_operator (_tmp168_); - _tmp170_ = _tmp169_; - if (_tmp170_ == VALA_UNARY_OPERATOR_REF) { - _tmp167_ = TRUE; + _tmp170_ = e; + _tmp171_ = _vala_code_node_ref0 (VALA_IS_UNARY_EXPRESSION (_tmp170_) ? ((ValaUnaryExpression*) _tmp170_) : NULL); + unary = _tmp171_; + _tmp173_ = unary; + if (_tmp173_ != NULL) { + gboolean _tmp174_ = FALSE; + ValaUnaryExpression* _tmp175_; + ValaUnaryOperator _tmp176_; + ValaUnaryOperator _tmp177_; + gboolean _tmp181_; + _tmp175_ = unary; + _tmp176_ = vala_unary_expression_get_operator (_tmp175_); + _tmp177_ = _tmp176_; + if (_tmp177_ == VALA_UNARY_OPERATOR_REF) { + _tmp174_ = TRUE; } else { - ValaUnaryExpression* _tmp171_; - ValaUnaryOperator _tmp172_; - ValaUnaryOperator _tmp173_; - _tmp171_ = unary; - _tmp172_ = vala_unary_expression_get_operator (_tmp171_); - _tmp173_ = _tmp172_; - _tmp167_ = _tmp173_ == VALA_UNARY_OPERATOR_OUT; + ValaUnaryExpression* _tmp178_; + ValaUnaryOperator _tmp179_; + ValaUnaryOperator _tmp180_; + _tmp178_ = unary; + _tmp179_ = vala_unary_expression_get_operator (_tmp178_); + _tmp180_ = _tmp179_; + _tmp174_ = _tmp180_ == VALA_UNARY_OPERATOR_OUT; } - _tmp174_ = _tmp167_; - _tmp165_ = _tmp174_; + _tmp181_ = _tmp174_; + _tmp172_ = _tmp181_; } else { - _tmp165_ = FALSE; + _tmp172_ = FALSE; } - _tmp175_ = _tmp165_; - if (_tmp175_) { + _tmp182_ = _tmp172_; + if (_tmp182_) { } else { - ValaExpression* _tmp176_; - ValaDataType* _tmp177_; - ValaDataType* _tmp178_; - ValaExpression* _tmp179_; - ValaDataType* _tmp180_; - ValaDataType* _tmp181_; - gboolean _tmp182_ = FALSE; - _tmp176_ = e; - _tmp177_ = vala_expression_get_value_type (_tmp176_); - _tmp178_ = _tmp177_; - _tmp179_ = e; - _tmp180_ = vala_expression_get_target_type (_tmp179_); - _tmp181_ = _tmp180_; - _tmp182_ = vala_data_type_compatible (_tmp178_, _tmp181_); - if (!_tmp182_) { - ValaExpression* _tmp183_; - ValaExpression* _tmp184_; - ValaSourceReference* _tmp185_; - ValaSourceReference* _tmp186_; - ValaExpression* _tmp187_; - ValaDataType* _tmp188_; - ValaDataType* _tmp189_; - gchar* _tmp190_ = NULL; - gchar* _tmp191_; - ValaExpression* _tmp192_; - ValaDataType* _tmp193_; - ValaDataType* _tmp194_; - gchar* _tmp195_ = NULL; - gchar* _tmp196_; + ValaExpression* _tmp183_; + ValaDataType* _tmp184_; + ValaDataType* _tmp185_; + ValaExpression* _tmp186_; + ValaDataType* _tmp187_; + ValaDataType* _tmp188_; + gboolean _tmp189_ = FALSE; + _tmp183_ = e; + _tmp184_ = vala_expression_get_value_type (_tmp183_); + _tmp185_ = _tmp184_; + _tmp186_ = e; + _tmp187_ = vala_expression_get_target_type (_tmp186_); + _tmp188_ = _tmp187_; + _tmp189_ = vala_data_type_compatible (_tmp185_, _tmp188_); + if (!_tmp189_) { + ValaExpression* _tmp190_; + ValaExpression* _tmp191_; + ValaSourceReference* _tmp192_; + ValaSourceReference* _tmp193_; + ValaExpression* _tmp194_; + ValaDataType* _tmp195_; + ValaDataType* _tmp196_; gchar* _tmp197_ = NULL; gchar* _tmp198_; + ValaExpression* _tmp199_; + ValaDataType* _tmp200_; + ValaDataType* _tmp201_; + gchar* _tmp202_ = NULL; + gchar* _tmp203_; + gchar* _tmp204_ = NULL; + gchar* _tmp205_; _error_ = TRUE; - _tmp183_ = e; - vala_code_node_set_error ((ValaCodeNode*) _tmp183_, TRUE); - _tmp184_ = e; - _tmp185_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp184_); - _tmp186_ = _tmp185_; - _tmp187_ = e; - _tmp188_ = vala_expression_get_target_type (_tmp187_); - _tmp189_ = _tmp188_; - _tmp190_ = vala_code_node_to_string ((ValaCodeNode*) _tmp189_); - _tmp191_ = _tmp190_; - _tmp192_ = e; - _tmp193_ = vala_expression_get_value_type (_tmp192_); - _tmp194_ = _tmp193_; - _tmp195_ = vala_code_node_to_string ((ValaCodeNode*) _tmp194_); + _tmp190_ = e; + vala_code_node_set_error ((ValaCodeNode*) _tmp190_, TRUE); + _tmp191_ = e; + _tmp192_ = vala_code_node_get_source_reference ((ValaCodeNode*) _tmp191_); + _tmp193_ = _tmp192_; + _tmp194_ = e; + _tmp195_ = vala_expression_get_target_type (_tmp194_); _tmp196_ = _tmp195_; - _tmp197_ = g_strdup_printf ("Expected initializer of type `%s' but got `%s'", _tmp191_, _tmp196_); + _tmp197_ = vala_code_node_to_string ((ValaCodeNode*) _tmp196_); _tmp198_ = _tmp197_; - vala_report_error (_tmp186_, _tmp198_); + _tmp199_ = e; + _tmp200_ = vala_expression_get_value_type (_tmp199_); + _tmp201_ = _tmp200_; + _tmp202_ = vala_code_node_to_string ((ValaCodeNode*) _tmp201_); + _tmp203_ = _tmp202_; + _tmp204_ = g_strdup_printf ("Expected initializer of type `%s' but got `%s'", _tmp198_, _tmp203_); + _tmp205_ = _tmp204_; + vala_report_error (_tmp193_, _tmp205_); + _g_free0 (_tmp205_); + _g_free0 (_tmp203_); _g_free0 (_tmp198_); - _g_free0 (_tmp196_); - _g_free0 (_tmp191_); } } _vala_code_node_unref0 (unary); @@ -1323,26 +1345,26 @@ } _vala_iterable_unref0 (_e_list); } - _tmp199_ = _error_; - if (!_tmp199_) { - ValaDataType* _tmp200_; - ValaDataType* _tmp201_; - ValaDataType* _tmp202_ = NULL; - ValaDataType* _tmp203_; - ValaDataType* _tmp204_; - ValaDataType* _tmp205_; - _tmp200_ = vala_expression_get_target_type ((ValaExpression*) self); - _tmp201_ = _tmp200_; - _tmp202_ = vala_data_type_copy (_tmp201_); - _tmp203_ = _tmp202_; - vala_expression_set_value_type ((ValaExpression*) self, _tmp203_); - _vala_code_node_unref0 (_tmp203_); - _tmp204_ = vala_expression_get_value_type ((ValaExpression*) self); - _tmp205_ = _tmp204_; - vala_data_type_set_nullable (_tmp205_, FALSE); - } _tmp206_ = _error_; - result = !_tmp206_; + if (!_tmp206_) { + ValaDataType* _tmp207_; + ValaDataType* _tmp208_; + ValaDataType* _tmp209_ = NULL; + ValaDataType* _tmp210_; + ValaDataType* _tmp211_; + ValaDataType* _tmp212_; + _tmp207_ = vala_expression_get_target_type ((ValaExpression*) self); + _tmp208_ = _tmp207_; + _tmp209_ = vala_data_type_copy (_tmp208_); + _tmp210_ = _tmp209_; + vala_expression_set_value_type ((ValaExpression*) self, _tmp210_); + _vala_code_node_unref0 (_tmp210_); + _tmp211_ = vala_expression_get_value_type ((ValaExpression*) self); + _tmp212_ = _tmp211_; + vala_data_type_set_nullable (_tmp212_, FALSE); + } + _tmp213_ = _error_; + result = !_tmp213_; return result; } diff -Nru vala-0.16-0.15.1/vala/valainitializerlist.vala vala-0.16-0.15.2/vala/valainitializerlist.vala --- vala-0.16-0.15.1/vala/valainitializerlist.vala 2011-08-13 18:25:00.000000000 +0000 +++ vala-0.16-0.15.2/vala/valainitializerlist.vala 2012-02-09 18:32:59.000000000 +0000 @@ -153,6 +153,9 @@ } else if (target_type.data_type is Struct) { /* initializer is used as struct initializer */ var st = (Struct) target_type.data_type; + while (st.base_struct != null) { + st = st.base_struct; + } var field_it = st.get_fields ().iterator (); foreach (Expression e in get_initializers ()) { diff -Nru vala-0.16-0.15.1/vapi/clutter-1.0.vapi vala-0.16-0.15.2/vapi/clutter-1.0.vapi --- vala-0.16-0.15.1/vapi/clutter-1.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/clutter-1.0.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -4611,12 +4611,13 @@ protected Action (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_actor_get_type ()")] - public abstract class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable { + public class Actor : GLib.InitiallyUnowned, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { public uint32 flags; [CCode (has_construct_function = false)] - protected Actor (); + public Actor (); public void add_action (Clutter.Action action); public void add_action_with_name (string name, Clutter.Action action); + public void add_child (Clutter.Actor child); public void add_constraint (Clutter.Constraint constraint); public void add_constraint_with_name (string name, Clutter.Constraint constraint); public void add_effect (Clutter.Effect effect); @@ -4655,9 +4656,12 @@ public void get_anchor_point (out float anchor_x, out float anchor_y); public Clutter.Gravity get_anchor_point_gravity (); public unowned Clutter.Animation get_animation (); + public Clutter.Color get_background_color (); [CCode (cname = "clutter_get_actor_by_gid")] [Deprecated (since = "1.8")] public static unowned Clutter.Actor get_by_gid (uint32 id_); + public unowned Clutter.Actor get_child_at_index (int index_); + public GLib.List get_children (); public void get_clip (out float xoff, out float yoff, out float width, out float height); public bool get_clip_to_allocation (); public unowned Clutter.Constraint get_constraint (string name); @@ -4665,6 +4669,7 @@ public float get_depth (); public unowned Clutter.Effect get_effect (string name); public GLib.List get_effects (); + public unowned Clutter.Actor get_first_child (); public bool get_fixed_position_set (); public Clutter.ActorFlags get_flags (); [Deprecated (since = "1.10")] @@ -4674,7 +4679,16 @@ [CCode (cname = "clutter_actor_has_pointer")] public bool get_has_pointer (); public float get_height (); + public unowned Clutter.Actor get_last_child (); + public unowned Clutter.LayoutManager get_layout_manager (); + public void get_margin (out unowned Clutter.Margin margin); + public float get_margin_bottom (); + public float get_margin_left (); + public float get_margin_right (); + public float get_margin_top (); + public int get_n_children (); public unowned string get_name (); + public unowned Clutter.Actor get_next_sibling (); public Clutter.OffscreenRedirect get_offscreen_redirect (); public uint8 get_opacity (); public bool get_paint_box (out Clutter.ActorBox box); @@ -4688,6 +4702,7 @@ public virtual void get_preferred_height (float for_width, out float min_height_p, out float natural_height_p); public void get_preferred_size (out float min_width_p, out float min_height_p, out float natural_width_p, out float natural_height_p); public virtual void get_preferred_width (float for_height, out float min_width_p, out float natural_width_p); + public unowned Clutter.Actor get_previous_sibling (); public bool get_reactive (); public Clutter.RequestMode get_request_mode (); public double get_rotation (Clutter.RotateAxis axis, out float x, out float y, out float z); @@ -4705,7 +4720,9 @@ public void get_transformed_size (out float width, out float height); public float get_width (); public float get_x (); + public Clutter.ActorAlign get_x_align (); public float get_y (); + public Clutter.ActorAlign get_y_align (); public Clutter.Gravity get_z_rotation_gravity (); public void grab_key_focus (); public bool has_actions (); @@ -4714,31 +4731,51 @@ public bool has_effects (); public bool has_key_focus (); public virtual bool has_overlaps (); + [Deprecated (since = "1.10")] public virtual void hide_all (); + public void insert_child_above (Clutter.Actor child, Clutter.Actor? sibling); + public void insert_child_at_index (Clutter.Actor child, int index_); + public void insert_child_below (Clutter.Actor child, Clutter.Actor? sibling); public bool is_in_clone_paint (); public bool is_rotated (); public bool is_scaled (); + [Deprecated (since = "1.10")] public void lower (Clutter.Actor? above); + [Deprecated (since = "1.10")] public void lower_bottom (); public virtual void map (); public void move_anchor_point (float anchor_x, float anchor_y); public void move_anchor_point_from_gravity (Clutter.Gravity gravity); public void move_by (float dx, float dy); + [Deprecated (since = "1.10")] public void pop_internal (); + [Deprecated (since = "1.10")] public void push_internal (); public void queue_redraw (); + public void queue_redraw_with_clip (Cairo.RectangleInt? clip); + [Deprecated (since = "1.10")] public void raise (Clutter.Actor? below); + [Deprecated (since = "1.10")] public void raise_top (); public void remove_action (Clutter.Action action); public void remove_action_by_name (string name); + public void remove_all_children (); + public void remove_child (Clutter.Actor child); public void remove_clip (); public void remove_constraint (Clutter.Constraint constraint); public void remove_constraint_by_name (string name); public void remove_effect (Clutter.Effect effect); public void remove_effect_by_name (string name); + [Deprecated (since = "1.10")] public void reparent (Clutter.Actor new_parent); + public void replace_child (Clutter.Actor old_child, Clutter.Actor new_child); + public void set_allocation (Clutter.ActorBox box, Clutter.AllocationFlags flags); public void set_anchor_point (float anchor_x, float anchor_y); public void set_anchor_point_from_gravity (Clutter.Gravity gravity); + public void set_background_color (Clutter.Color? color); + public void set_child_above_sibling (Clutter.Actor child, Clutter.Actor? sibling); + public void set_child_at_index (Clutter.Actor child, int index_); + public void set_child_below_sibling (Clutter.Actor child, Clutter.Actor? sibling); public void set_clip (float xoff, float yoff, float width, float height); public void set_clip_to_allocation (bool clip_set); public void set_depth (float depth); @@ -4747,9 +4784,16 @@ [Deprecated (since = "1.10")] public void set_geometry (Clutter.Geometry geometry); public void set_height (float height); + public void set_layout_manager (Clutter.LayoutManager? manager); + public void set_margin (Clutter.Margin margin); + public void set_margin_bottom (float margin); + public void set_margin_left (float margin); + public void set_margin_right (float margin); + public void set_margin_top (float margin); public void set_name (string name); public void set_offscreen_redirect (Clutter.OffscreenRedirect redirect); public void set_opacity (uint8 opacity); + [Deprecated (since = "1.10")] public void set_parent (Clutter.Actor parent); public void set_position (float x, float y); public void set_reactive (bool reactive); @@ -4770,12 +4814,16 @@ public void set_text_direction (Clutter.TextDirection text_dir); public void set_width (float width); public void set_x (float x); + public void set_x_align (Clutter.ActorAlign x_align); public void set_y (float y); + public void set_y_align (Clutter.ActorAlign y_align); public void set_z_rotation_from_gravity (double angle, Clutter.Gravity gravity); public bool should_pick_paint (); + [Deprecated (since = "1.10")] public virtual void show_all (); public bool transform_stage_point (float x, float y, out float x_out, out float y_out); public virtual void unmap (); + [Deprecated (since = "1.10")] public void unparent (); public void unset_flags (Clutter.ActorFlags flags); [NoAccessorMethod] @@ -4788,6 +4836,9 @@ public float anchor_x { get; set; } [NoAccessorMethod] public float anchor_y { get; set; } + public Clutter.Color background_color { get; set; } + [NoAccessorMethod] + public bool background_color_set { get; } [NoAccessorMethod] public Clutter.Geometry clip { get; set; } public bool clip_to_allocation { get; set; } @@ -4796,6 +4847,7 @@ public float depth { get; set; } [NoAccessorMethod] public Clutter.Effect effect { set; } + public Clutter.Actor first_child { get; } public bool fixed_position_set { get; set; } [NoAccessorMethod] public float fixed_x { get; set; } @@ -4806,8 +4858,14 @@ [NoAccessorMethod] public bool has_pointer { get; } public float height { get; set; } + public Clutter.Actor last_child { get; } + public Clutter.LayoutManager layout_manager { get; set; } [NoAccessorMethod] public bool mapped { get; } + public float margin_bottom { get; set; } + public float margin_left { get; set; } + public float margin_right { get; set; } + public float margin_top { get; set; } [NoAccessorMethod] public float min_height { get; set; } [NoAccessorMethod] @@ -4862,7 +4920,9 @@ public bool visible { get; set; } public float width { get; set; } public float x { get; set; } + public Clutter.ActorAlign x_align { get; set; } public float y { get; set; } + public Clutter.ActorAlign y_align { get; set; } public signal void allocation_changed (Clutter.ActorBox box, Clutter.AllocationFlags flags); public virtual signal bool button_press_event (Clutter.ButtonEvent event); public virtual signal bool button_release_event (Clutter.ButtonEvent event); @@ -5239,20 +5299,30 @@ [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_get_type ()")] public class Box : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterActor*")] + [Deprecated (since = "1.10")] public Box (Clutter.LayoutManager manager); + [Deprecated (since = "1.10")] public Clutter.Color get_color (); + [Deprecated (since = "1.10")] public unowned Clutter.LayoutManager get_layout_manager (); + [Deprecated (since = "1.10")] public void pack (Clutter.Actor actor, ...); + [Deprecated (since = "1.10")] public void pack_after (Clutter.Actor actor, Clutter.Actor? sibling, ...); + [Deprecated (since = "1.10")] public void pack_at (Clutter.Actor actor, int position, ...); + [Deprecated (since = "1.10")] public void pack_before (Clutter.Actor actor, Clutter.Actor? sibling, ...); + [Deprecated (since = "1.10")] public void packv (Clutter.Actor actor, [CCode (array_length_cname = "n_properties", array_length_pos = 1.5, array_length_type = "guint")] string[] properties, [CCode (array_length_cname = "n_properties", array_length_pos = 1.5, array_length_type = "guint")] GLib.Value[] values); + [Deprecated (since = "1.10")] public void set_color (Clutter.Color? color); + [Deprecated (since = "1.10")] public void set_layout_manager (Clutter.LayoutManager manager); public Clutter.Color color { get; set; } [NoAccessorMethod] public bool color_set { get; set; } - public Clutter.LayoutManager layout_manager { get; set construct; } + public Clutter.LayoutManager layout_manager { get; set; } } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_box_layout_get_type ()")] public class BoxLayout : Clutter.LayoutManager { @@ -5288,7 +5358,7 @@ public bool vertical { get; set; } } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_cairo_texture_get_type ()")] - public class CairoTexture : Clutter.Texture, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable { + public class CairoTexture : Clutter.Texture, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterActor*")] public CairoTexture (uint width, uint height); public void clear (); @@ -5339,7 +5409,7 @@ public virtual signal bool long_press (Clutter.Actor actor, Clutter.LongPressState state); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_clone_get_type ()")] - public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable { + public class Clone : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterActor*")] public Clone (Clutter.Actor source); public unowned Clutter.Actor get_source (); @@ -5552,9 +5622,13 @@ [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_group_get_type ()")] public class Group : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterActor*")] + [Deprecated (since = "1.10")] public Group (); + [Deprecated (since = "1.10")] public int get_n_children (); + [Deprecated (since = "1.10")] public unowned Clutter.Actor get_nth_child (int index_); + [Deprecated (since = "1.10")] public void remove_all (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_input_device_get_type ()")] @@ -5656,11 +5730,23 @@ public Clutter.LayoutManager manager { get; construct; } } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_list_model_get_type ()")] - public class ListModel : Clutter.Model, Clutter.Scriptable, Clutter.Scriptable { + public class ListModel : Clutter.Model, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterModel*")] public ListModel (uint n_columns, ...); - [CCode (cname = "clutter_list_model_newv", has_construct_function = false, type = "ClutterModel*")] - public ListModel.newv ([CCode (array_length_pos = 0.9)] GLib.Type[] types, [CCode (array_length_pos = 0.9)] string[] names); + [CCode (has_construct_function = false, type = "ClutterModel*")] + public ListModel.newv ([CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] GLib.Type[] types, [CCode (array_length_cname = "n_columns", array_length_pos = 0.5, array_length_type = "guint")] string[] names); + } + [CCode (cheader_filename = "clutter/clutter.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "clutter_margin_get_type ()")] + [Compact] + public class Margin { + public float bottom; + public float left; + public float right; + public float top; + [CCode (has_construct_function = false)] + public Margin (); + public Clutter.Margin copy (); + public void free (); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_model_get_type ()")] public abstract class Model : GLib.Object, Clutter.Scriptable { @@ -5786,9 +5872,9 @@ public string get_description (); public uint get_length (); public uint get_n_nodes (); - public void get_node (uint index_, Clutter.PathNode node); + public Clutter.PathNode get_node (uint index_); public GLib.SList get_nodes (); - public uint get_position (double progress, Clutter.Knot position); + public uint get_position (double progress, out Clutter.Knot position); public void insert_node (int index_, Clutter.PathNode node); public void remove_node (uint index_); public void replace_node (uint index_, Clutter.PathNode node); @@ -5813,7 +5899,7 @@ public signal void node_reached (Clutter.Actor actor, uint index); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_rectangle_get_type ()")] - public class Rectangle : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable { + public class Rectangle : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterActor*")] public Rectangle (); public Clutter.Color get_border_color (); @@ -5870,6 +5956,7 @@ public GLib.List list_objects (); public uint load_from_data (string data, ssize_t length) throws GLib.Error; public uint load_from_file (string filename) throws GLib.Error; + public uint load_from_resource (string resource_path) throws GLib.Error; public string lookup_filename (string filename); public void unmerge_objects (uint merge_id); [NoAccessorMethod] @@ -6012,6 +6099,7 @@ public Clutter.Color get_color (); [Deprecated (since = "1.10")] public static unowned Clutter.Stage get_default (); + [Deprecated (since = "1.10")] public Clutter.Fog get_fog (); public bool get_fullscreen (); public unowned Clutter.Actor get_key_focus (); @@ -6023,6 +6111,7 @@ public bool get_throttle_motion_events (); public unowned string get_title (); public bool get_use_alpha (); + [Deprecated (since = "1.10")] public bool get_use_fog (); public bool get_user_resizable (); public void hide_cursor (); @@ -6036,6 +6125,7 @@ public void redraw (); public void set_accept_focus (bool accept_focus); public void set_color (Clutter.Color color); + [Deprecated (since = "1.10")] public void set_fog (Clutter.Fog fog); public void set_fullscreen (bool fullscreen); public void set_key_focus (Clutter.Actor? actor); @@ -6046,6 +6136,7 @@ public void set_throttle_motion_events (bool throttle); public void set_title (string title); public void set_use_alpha (bool use_alpha); + [Deprecated (since = "1.10")] public void set_use_fog (bool fog); public void set_user_resizable (bool resizable); public void show_cursor (); @@ -6053,16 +6144,19 @@ public Clutter.Color color { get; set; } [NoAccessorMethod] public bool cursor_visible { get; set; } + [Deprecated (since = "1.10")] public Clutter.Fog fog { get; set; } [NoAccessorMethod] public bool fullscreen_set { get; } public Clutter.Actor key_focus { get; set; } public bool no_clear_hint { get; set; } + [Deprecated (since = "1.10")] [NoAccessorMethod] public bool offscreen { get; set; } public Clutter.Perspective perspective { get; set; } public string title { get; set; } public bool use_alpha { get; set; } + [Deprecated (since = "1.10")] public bool use_fog { get; set; } public bool user_resizable { get; set; } public virtual signal void activate (); @@ -6158,7 +6252,7 @@ public bool use_animations { get; set; } } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_get_type ()")] - public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable { + public class Text : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterActor*")] public Text (); public void delete_chars (uint n_chars); @@ -6167,6 +6261,7 @@ public Text.full (string font_name, string text, Clutter.Color color); public bool get_activatable (); public unowned Pango.AttrList get_attributes (); + public unowned Clutter.TextBuffer get_buffer (); public string get_chars (ssize_t start_pos, ssize_t end_pos); public Clutter.Color get_color (); public Clutter.Color get_cursor_color (); @@ -6198,6 +6293,7 @@ public bool position_to_coords (int position, out float x, out float y, out float line_height = null); public void set_activatable (bool activatable); public void set_attributes (Pango.AttrList attrs); + public void set_buffer (Clutter.TextBuffer buffer); public void set_color (Clutter.Color color); public void set_cursor_color (Clutter.Color color); public void set_cursor_position (int position); @@ -6226,9 +6322,12 @@ [CCode (cname = "clutter_text_activate")] public bool try_activate (); [CCode (has_construct_function = false, type = "ClutterActor*")] + public Text.with_buffer (Clutter.TextBuffer buffer); + [CCode (has_construct_function = false, type = "ClutterActor*")] public Text.with_text (string? font_name, string text); public bool activatable { get; set; } public Pango.AttrList attributes { get; set; } + public Clutter.TextBuffer buffer { get; set; } public Clutter.Color color { get; set; } public Clutter.Color cursor_color { get; set; } [NoAccessorMethod] @@ -6264,8 +6363,33 @@ public signal void delete_text (int start_pos, int end_pos); public virtual signal void text_changed (); } + [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_text_buffer_get_type ()")] + public class TextBuffer : GLib.Object { + [CCode (has_construct_function = false)] + public TextBuffer (); + public virtual uint delete_text (uint position, uint n_chars); + public void emit_deleted_text (uint position, uint n_chars); + public void emit_inserted_text (uint position, string chars, uint n_chars); + public size_t get_bytes (); + public virtual uint get_length (); + public int get_max_length (); + public unowned string get_text (); + [CCode (vfunc_name = "get_text")] + [NoWrapper] + public virtual unowned string get_text_with_length (size_t n_bytes); + public virtual uint insert_text (uint position, string chars, uint n_chars); + public void set_max_length (int max_length); + public void set_text (string chars, int n_chars); + [CCode (has_construct_function = false)] + public TextBuffer.with_text (string? text, ssize_t text_len); + public uint length { get; } + public int max_length { get; set; } + public string text { get; } + public virtual signal void deleted_text (uint position, uint n_chars); + public virtual signal void inserted_text (uint position, string chars, uint n_chars); + } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_texture_get_type ()")] - public class Texture : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable { + public class Texture : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable { [CCode (has_construct_function = false, type = "ClutterActor*")] public Texture (); [CCode (has_construct_function = false, type = "ClutterActor*")] @@ -6291,6 +6415,7 @@ public void set_filter_quality (Clutter.TextureQuality filter_quality); public bool set_from_file (string filename) throws GLib.Error; public bool set_from_rgb_data ([CCode (array_length = false)] uint8[] data, bool has_alpha, int width, int height, int rowstride, int bpp, Clutter.TextureFlags flags) throws GLib.Error; + [Deprecated (since = "1.10")] public bool set_from_yuv_data ([CCode (array_length = false)] uint8[] data, int width, int height, Clutter.TextureFlags flags) throws GLib.Error; public void set_keep_aspect_ratio (bool keep_aspect); public void set_load_async (bool load_async); @@ -6322,7 +6447,7 @@ public virtual signal void size_change (int width, int height); } [CCode (cheader_filename = "clutter/clutter.h", type_id = "clutter_timeline_get_type ()")] - public class Timeline : GLib.Object { + public class Timeline : GLib.Object, Clutter.Scriptable { [CCode (has_construct_function = false)] public Timeline (uint msecs); public void add_marker_at_time (string marker_name, uint msecs); @@ -6398,20 +6523,29 @@ public unowned Clutter.Actor find_child_by_name (string child_name); [CCode (cname = "clutter_container_class_find_child_property")] public class unowned GLib.ParamSpec find_child_property (string property_name); + [Deprecated (since = "1.10")] public abstract void @foreach (Clutter.Callback callback); + [Deprecated (since = "1.10")] public virtual void foreach_with_internals (Clutter.Callback callback); public virtual unowned Clutter.ChildMeta get_child_meta (Clutter.Actor actor); + [Deprecated (since = "1.10")] public GLib.List get_children (); [CCode (cname = "clutter_container_class_list_child_properties")] public class unowned GLib.ParamSpec[] list_child_properties (); [CCode (vfunc_name = "lower")] + [Deprecated (since = "1.10")] public virtual void lower_child (Clutter.Actor actor, Clutter.Actor? sibling = null); [CCode (vfunc_name = "raise")] + [Deprecated (since = "1.10")] public virtual void raise_child (Clutter.Actor actor, Clutter.Actor? sibling = null); + [Deprecated (since = "1.10")] public void remove (...); [CCode (vfunc_name = "remove")] + [Deprecated (since = "1.10")] public abstract void remove_actor (Clutter.Actor actor); + [Deprecated (since = "1.10")] public void remove_valist (Clutter.Actor first_actor, va_list var_args); + [Deprecated (since = "1.10")] public abstract void sort_depth_order (); public virtual signal void actor_added (Clutter.Actor actor); public virtual signal void actor_removed (Clutter.Actor actor); @@ -6523,6 +6657,13 @@ public Clutter.ActorBox union (Clutter.ActorBox b); } [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] + public struct ActorIter { + public void init (Clutter.Actor root); + public bool next (out Clutter.Actor child); + public bool prev (Clutter.Actor child); + public void remove (); + } + [CCode (cheader_filename = "clutter/clutter.h", has_type_id = false)] public struct AnyEvent { public Clutter.EventType type; public uint32 time; @@ -6704,6 +6845,13 @@ public bool equal (Clutter.Vertex vertex_b); public void free (); } + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_ALIGN_")] + public enum ActorAlign { + FILL, + START, + CENTER, + END + } [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_ACTOR_")] [Flags] public enum ActorFlags { @@ -6723,7 +6871,8 @@ [Flags] public enum AllocationFlags { ALLOCATION_NONE, - ABSOLUTE_ORIGIN_CHANGED + ABSOLUTE_ORIGIN_CHANGED, + DELEGATE_LAYOUT } [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_")] public enum AnimationMode { diff -Nru vala-0.16-0.15.1/vapi/cogl-1.0.vapi vala-0.16-0.15.2/vapi/cogl-1.0.vapi --- vala-0.16-0.15.1/vapi/cogl-1.0.vapi 2012-01-26 19:24:43.000000000 +0000 +++ vala-0.16-0.15.2/vapi/cogl-1.0.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -159,8 +159,6 @@ [CCode (cheader_filename = "cogl/cogl.h", copy_function = "cogl_path_copy")] [Compact] public class Path { - [CCode (has_construct_function = false, type = "void")] - public Path (); public static void arc (float center_x, float center_y, float radius_x, float radius_y, float angle_1, float angle_2); public static void close (); public unowned Cogl.Path copy (); @@ -173,6 +171,7 @@ public static void line (float x_1, float y_1, float x_2, float y_2); public static void line_to (float x, float y); public static void move_to (float x, float y); + public static void @new (); public static void polygon ([CCode (array_length = false)] float[] coords, int num_points); public static void polyline ([CCode (array_length = false)] float[] coords, int num_points); public static void rectangle (float x_1, float y_1, float x_2, float y_2); diff -Nru vala-0.16-0.15.1/vapi/gdk-3.0.vapi vala-0.16-0.15.2/vapi/gdk-3.0.vapi --- vala-0.16-0.15.1/vapi/gdk-3.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/gdk-3.0.vapi 2012-02-23 15:09:25.000000000 +0000 @@ -4864,6 +4864,7 @@ public void coords_to_parent (double x, double y, out double parent_x, out double parent_y); public Cairo.Surface create_similar_surface (Cairo.Content content, int width, int height); public void deiconify (); + [DestroysInstance] public void destroy (); public void enable_synchronized_configure (); public void end_paint (); @@ -5732,6 +5733,12 @@ public delegate Gdk.FilterReturn FilterFunc (Gdk.XEvent xevent, Gdk.Event event); [CCode (cheader_filename = "gdk/gdk.h", instance_pos = 1.9)] public delegate bool WindowChildFunc (Gdk.Window window); + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_BUTTON_MIDDLE")] + public const int BUTTON_MIDDLE; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_BUTTON_PRIMARY")] + public const int BUTTON_PRIMARY; + [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_BUTTON_SECONDARY")] + public const int BUTTON_SECONDARY; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_CURRENT_TIME")] public const int CURRENT_TIME; [CCode (cheader_filename = "gdk/gdk.h", cname = "GDK_MAX_TIMECOORD_AXES")] diff -Nru vala-0.16-0.15.1/vapi/gdk-pixbuf-2.0.vapi vala-0.16-0.15.2/vapi/gdk-pixbuf-2.0.vapi --- vala-0.16-0.15.1/vapi/gdk-pixbuf-2.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/gdk-pixbuf-2.0.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -221,7 +221,7 @@ } [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")] public delegate void PixbufDestroyNotify ([CCode (array_length = false)] uint8[] pixels); - [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", instance_pos = 3.9)] + [CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h", instance_pos = -0.9)] public delegate bool PixbufSaveFunc ([CCode (array_length_type = "gsize")] uint8[] buf) throws GLib.Error; [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cname = "GDK_PIXBUF_FEATURES_H")] public const int PIXBUF_FEATURES_H; diff -Nru vala-0.16-0.15.1/vapi/gio-2.0.vapi vala-0.16-0.15.2/vapi/gio-2.0.vapi --- vala-0.16-0.15.1/vapi/gio-2.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/gio-2.0.vapi 2012-02-23 14:49:44.000000000 +0000 @@ -484,7 +484,7 @@ public uint register_subtree (string object_path, GLib.DBusSubtreeVTable vtable, GLib.DBusSubtreeFlags flags, void* user_data, GLib.DestroyNotify user_data_free_func) throws GLib.Error; public void remove_filter (uint filter_id); public bool send_message (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, out uint32 out_serial) throws GLib.Error; - public async GLib.DBusMessage send_message_with_reply (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError; + public async GLib.DBusMessage send_message_with_reply (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, uint32* out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError; public GLib.DBusMessage send_message_with_reply_sync (GLib.DBusMessage message, GLib.DBusSendMessageFlags flags, int timeout_msec, out uint32 out_serial = null, GLib.Cancellable? cancellable = null) throws GLib.IOError; public void set_exit_on_close (bool exit_on_close); public uint signal_subscribe (string? sender, string? interface_name, string? member, string? object_path, string? arg0, GLib.DBusSignalFlags flags, owned GLib.DBusSignalCallback callback); @@ -1549,6 +1549,7 @@ public GLib.List lookup_service (string service, string protocol, string domain, GLib.Cancellable? cancellable = null) throws GLib.Error; [CCode (finish_function = "g_resolver_lookup_service_finish")] public async GLib.List lookup_service_async (string service, string protocol, string domain, GLib.Cancellable? cancellable = null) throws GLib.Error; + [CCode (vfunc_name = "lookup_service")] [NoWrapper] public virtual GLib.List lookup_service_fn (string rrname, GLib.Cancellable? cancellable = null) throws GLib.Error; [CCode (finish_function = "g_resolver_lookup_service_finish", vfunc_name = "lookup_service_async")] @@ -2077,7 +2078,7 @@ public GLib.TlsPasswordFlags flags { get; set; } public string warning { get; set; } } - [CCode (cheader_filename = "gio/gio.h", type_id = "g_unix_fd_list_get_type ()")] + [CCode (cheader_filename = "gio/gunixfdlist.h", type_id = "g_unix_fd_list_get_type ()")] public class UnixFDList : GLib.Object { [CCode (has_construct_function = false)] public UnixFDList (); diff -Nru vala-0.16-0.15.1/vapi/glib-2.0.vapi vala-0.16-0.15.2/vapi/glib-2.0.vapi --- vala-0.16-0.15.1/vapi/glib-2.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/glib-2.0.vapi 2012-02-23 14:49:44.000000000 +0000 @@ -1617,6 +1617,7 @@ public static int get ([CCode (type = "volatile gint *")] ref int atomic); public static void set ([CCode (type = "volatile gint *")] ref int atomic, int newval); public static void add ([CCode (type = "volatile gint *")] ref int atomic, int val); + [Deprecated (since = "2.30", replacement = "add")] public static int exchange_and_add ([CCode (type = "volatile gint *")] ref int atomic, int val); public static bool compare_and_exchange ([CCode (type = "volatile gint *")] ref int atomic, int oldval, int newval); public static void inc ([CCode (type = "volatile gint *")] ref int atomic); @@ -1778,8 +1779,7 @@ [CCode (has_target = false)] public delegate void SourceFinalizeFunc (Source source); - [Compact] - public class SourceFuncs { + public struct SourceFuncs { public SourcePrepareFunc prepare; public SourceCheckFunc check; public SourceDispatchFunc dispatch; @@ -1824,9 +1824,14 @@ [CCode (ref_function = "g_thread_ref", unref_function = "g_thread_unref")] #endif public class Thread { + public Thread (string? name, ThreadFunc func); + [CCode (cname = "g_thread_try_new")] + public Thread.try (string? name, ThreadFunc func) throws GLib.Error; public static bool supported (); + [Deprecated (since = "2.32", replacement = "new Thread ()")] [CCode (simple_generics = true)] public static unowned Thread create (ThreadFunc func, bool joinable) throws ThreadError; + [Deprecated (since = "2.32", replacement = "new Thread ()")] [CCode (simple_generics = true)] public static unowned Thread create_full (ThreadFunc func, ulong stack_size, bool joinable, bool bound, ThreadPriority priority) throws ThreadError; [CCode (simple_generics = true)] @@ -1936,7 +1941,9 @@ public void @signal (); public void broadcast (); public void wait (Mutex mutex); + [Deprecated (since = "2.32", replacement = "wait_until")] public bool timed_wait (Mutex mutex, TimeVal abs_time); + public bool wait_until (Mutex mutex, int64 end_time); } /* Thread Pools */ @@ -1968,8 +1975,8 @@ public void push (owned G data); public void push_sorted (owned G data, CompareDataFunc func); public G pop (); - public G try_pop (); - public G timed_pop (ref TimeVal end_time); + public G? try_pop (); + public G? timed_pop (ref TimeVal end_time); public int length (); public void sort (CompareDataFunc func); public void @lock (); @@ -1979,8 +1986,8 @@ public void push_unlocked (owned G data); public void push_sorted_unlocked (owned G data, CompareDataFunc func); public G pop_unlocked (); - public G try_pop_unlocked (); - public G timed_pop_unlocked (ref TimeVal end_time); + public G? try_pop_unlocked (); + public G? timed_pop_unlocked (ref TimeVal end_time); public int length_unlocked (); public void sort_unlocked (CompareDataFunc func); } @@ -2670,6 +2677,7 @@ public static string get_current_dir (); [CCode (cname = "g_find_program_in_path")] public static string? find_program_in_path (string program); + [Deprecated (since = "2.32")] [CCode (cname = "g_atexit")] public static void atexit (VoidFunc func); [CCode (cname = "g_chdir")] @@ -2738,7 +2746,7 @@ [CCode (has_target = false)] public delegate void VoidFunc (); - [Deprecated (replacement = "format_size")] + [Deprecated (since = "2.16", replacement = "format_size")] public string format_size_for_display (int64 size); [CCode (cname = "g_format_size_full")] @@ -2903,6 +2911,7 @@ /* Automatic String Completion */ + [Deprecated (since = "2.26")] [Compact] [CCode (free_function = "g_completion_free")] public class Completion { @@ -3335,7 +3344,7 @@ public void* arg_data; public unowned string description; - public unowned string arg_description; + public unowned string? arg_description; } [Compact] @@ -3977,6 +3986,7 @@ public bool contains (K key); public bool remove (K key); public void remove_all (); + public uint foreach_remove (HRFunc predicate); [CCode (cname = "g_hash_table_lookup")] public unowned V? @get (K key); [CCode (cname = "g_hash_table_insert")] @@ -4068,6 +4078,14 @@ public string str; public ssize_t len; public ssize_t allocated_len; + + public uint8[] data { + get { + unowned uint8[] res = (uint8[]) this.str; + res.length = (int) this.len; + return res; + } + } } /* String Chunks */ @@ -4703,4 +4721,20 @@ [CCode (simple_generics = true)] private static void qsort_with_data (T[] elems, size_t size, [CCode (type = "GCompareDataFunc")] GLib.CompareDataFunc compare_func); + + /* Unix-specific functions. All of these have to include glib-unix.h. */ + namespace Unix { + [CCode (cheader_filename = "glib-unix.h", cname = "g_unix_signal_add_full")] + public static uint signal_add (int signum, owned GLib.SourceFunc handler, [CCode (pos = 0.9)] int priority = Priority.DEFAULT); + + [CCode (cheader_filename = "glib-unix.h", cname = "GSource")] + public class SignalSource : GLib.Source { + public SignalSource (int signum); + } + + [CCode (cheader_filename = "glib-unix.h")] + public static bool open_pipe (int fds, int flags) throws GLib.Error; + [CCode (cheader_filename = "glib-unix.h")] + public static bool set_fd_nonblocking (int fd, bool nonblock) throws GLib.Error; + } } diff -Nru vala-0.16-0.15.1/vapi/gobject-2.0.vapi vala-0.16-0.15.2/vapi/gobject-2.0.vapi --- vala-0.16-0.15.1/vapi/gobject-2.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/gobject-2.0.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -324,6 +324,7 @@ public static Object @new (Type type, ...); public static Object newv (Type type, [CCode (array_length_pos = 1.9)] Parameter[] parameters); + public static Object new_valist (Type type, string? firstprop, va_list var_args); [CCode (cname = "G_TYPE_FROM_INSTANCE")] public Type get_type (); diff -Nru vala-0.16-0.15.1/vapi/gstreamer-0.10.vapi vala-0.16-0.15.2/vapi/gstreamer-0.10.vapi --- vala-0.16-0.15.1/vapi/gstreamer-0.10.vapi 2011-12-25 14:22:04.000000000 +0000 +++ vala-0.16-0.15.2/vapi/gstreamer-0.10.vapi 2012-02-23 14:49:44.000000000 +0000 @@ -453,6 +453,7 @@ public bool link_pads_full (string srcpadname, Gst.Element dest, string destpadname, Gst.PadLinkCheck flags); public void lost_state (); public void lost_state_full (bool new_base_time); + [CCode (returns_floating_reference = true)] public static Gst.Element? make_from_uri (Gst.URIType type, string uri, string? elementname); public void message_full (Gst.MessageType type, GLib.Quark domain, int code, owned string? text, owned string? debug, string file, string function, int line); public bool post_message (owned Gst.Message message); @@ -2949,9 +2950,9 @@ public static unowned GLib.ParamSpec param_spec_fraction (string name, string nick, string blurb, int min_num, int min_denom, int max_num, int max_denom, int default_num, int default_denom, GLib.ParamFlags flags); [CCode (cheader_filename = "gst/gst.h")] public static unowned GLib.ParamSpec param_spec_mini_object (string name, string nick, string blurb, GLib.Type object_type, GLib.ParamFlags flags); - [CCode (cheader_filename = "gst/gst.h")] + [CCode (cheader_filename = "gst/gst.h", returns_floating_reference = true)] public static Gst.Element? parse_bin_from_description (string bin_description, bool ghost_unlinked_pads) throws GLib.Error; - [CCode (cheader_filename = "gst/gst.h")] + [CCode (cheader_filename = "gst/gst.h", returns_floating_reference = true)] public static Gst.Element? parse_bin_from_description_full (string bin_description, bool ghost_unlinked_pads, Gst.ParseContext? context, Gst.ParseFlags flags) throws GLib.Error; [CCode (cheader_filename = "gst/gst.h")] public static GLib.Quark parse_error_quark (); diff -Nru vala-0.16-0.15.1/vapi/gtk+-2.0.vapi vala-0.16-0.15.2/vapi/gtk+-2.0.vapi --- vala-0.16-0.15.1/vapi/gtk+-2.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/gtk+-2.0.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -706,7 +706,7 @@ public void set_focus_on_click (bool focus_on_click); public void set_image (Gtk.Widget image); public void set_image_position (Gtk.PositionType position); - public void set_label (string label); + public void set_label (string? label); public void set_relief (Gtk.ReliefStyle newstyle); public void set_use_stock (bool use_stock); public void set_use_underline (bool use_underline); diff -Nru vala-0.16-0.15.1/vapi/gtk+-3.0.vapi vala-0.16-0.15.2/vapi/gtk+-3.0.vapi --- vala-0.16-0.15.1/vapi/gtk+-3.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/gtk+-3.0.vapi 2012-02-25 16:12:32.000000000 +0000 @@ -226,6 +226,7 @@ public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false, type = "GtkWidget*")] public AboutDialog (); + public void add_credit_section (string section_name, string people); public unowned string get_artists (); public unowned string get_authors (); public unowned string get_comments (); @@ -570,13 +571,22 @@ public Application (string application_id, GLib.ApplicationFlags flags); public void add_accelerator (string accelerator, string action_name, GLib.Variant parameter); public void add_window (Gtk.Window window); + public bool end_session (Gtk.ApplicationEndSessionStyle style, bool request_confirmation); public unowned GLib.MenuModel get_app_menu (); public unowned GLib.MenuModel get_menubar (); public unowned GLib.List get_windows (); + public uint inhibit (Gtk.Window window, Gtk.ApplicationInhibitFlags flags, string reason); + public bool is_inhibited (Gtk.ApplicationInhibitFlags flags); public void remove_accelerator (string action_name, GLib.Variant parameter); public void remove_window (Gtk.Window window); - public void set_app_menu (GLib.MenuModel model); - public void set_menubar (GLib.MenuModel model); + public void set_app_menu (GLib.MenuModel app_menu); + public void set_menubar (GLib.MenuModel menubar); + public void uninhibit (uint cookie); + public GLib.MenuModel app_menu { get; set; } + public GLib.MenuModel menubar { get; set; } + [NoAccessorMethod] + public bool register_session { get; set; } + public virtual signal void quit (); public virtual signal void window_added (Gtk.Window window); public virtual signal void window_removed (Gtk.Window window); } @@ -715,8 +725,10 @@ [CCode (has_construct_function = false)] public Builder (); public uint add_from_file (string filename) throws GLib.Error; + public uint add_from_resource (string resource_path) throws GLib.Error; public uint add_from_string (string buffer, size_t length) throws GLib.Error; public uint add_objects_from_file (string filename, [CCode (array_length = false)] string[] object_ids) throws GLib.Error; + public uint add_objects_from_resource (string resource_path, string object_ids) throws GLib.Error; public uint add_objects_from_string (string buffer, size_t length, [CCode (array_length = false)] string[] object_ids) throws GLib.Error; public void connect_signals (void* user_data); public void connect_signals_full (Gtk.BuilderConnectFunc func); @@ -731,7 +743,7 @@ public string translation_domain { get; set; } } [CCode (cheader_filename = "gtk/gtk.h")] - public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public Button (); [CCode (has_construct_function = false, type = "GtkWidget*")] @@ -749,7 +761,7 @@ public void set_focus_on_click (bool focus_on_click); public void set_image (Gtk.Widget image); public void set_image_position (Gtk.PositionType position); - public void set_label (string label); + public void set_label (string? label); public void set_relief (Gtk.ReliefStyle newstyle); public void set_use_stock (bool use_stock); public void set_use_underline (bool use_underline); @@ -1245,7 +1257,7 @@ public Gtk.TreeModel model { get; set; } } [CCode (cheader_filename = "gtk/gtk.h")] - public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public CheckButton (); [NoWrapper] @@ -1314,7 +1326,7 @@ public virtual signal void owner_change (Gdk.Event p0); } [CCode (cheader_filename = "gtk/gtk.h")] - public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public ColorButton (); public uint16 get_alpha (); @@ -1493,6 +1505,7 @@ public virtual unowned string composite_name (Gtk.Widget child); public virtual void forall (Gtk.Callback callback); [CCode (vfunc_name = "forall")] + [NoWrapper] public virtual void forall_internal (bool include_internal, Gtk.Callback callback); public void @foreach (Gtk.Callback callback); public uint get_border_width (); @@ -1919,7 +1932,7 @@ public int y; } [CCode (cheader_filename = "gtk/gtk.h")] - public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.FontChooser { + public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable, Gtk.FontChooser { [CCode (has_construct_function = false, type = "GtkWidget*")] public FontButton (); public unowned string get_font_name (); @@ -1947,7 +1960,7 @@ [CCode (cheader_filename = "gtk/gtk.h")] public class FontChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FontChooser { [CCode (has_construct_function = false, type = "GtkWidget*")] - public FontChooserDialog (string title, Gtk.Window window); + public FontChooserDialog (string title, Gtk.Window parent); } [CCode (cheader_filename = "gtk/gtk.h")] public class FontChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, Gtk.FontChooser { @@ -2016,6 +2029,7 @@ [CCode (has_construct_function = false)] public Gradient.radial (double x0, double y0, double radius0, double x1, double y1, double radius1); public bool resolve (Gtk.StyleProperties props, out unowned Cairo.Pattern resolved_gradient); + public unowned Cairo.Pattern resolve_for_context (Gtk.StyleContext context); public unowned string to_string (); } [CCode (cheader_filename = "gtk/gtk.h")] @@ -2341,6 +2355,8 @@ [CCode (has_construct_function = false, type = "GtkWidget*")] public Image.from_pixbuf (Gdk.Pixbuf pixbuf); [CCode (has_construct_function = false, type = "GtkWidget*")] + public Image.from_resource (string resource_path); + [CCode (has_construct_function = false, type = "GtkWidget*")] public Image.from_stock (string stock_id, Gtk.IconSize size); public unowned Gdk.PixbufAnimation get_animation (); public void get_gicon (out unowned GLib.Icon gicon, Gtk.IconSize size); @@ -2356,6 +2372,7 @@ public void set_from_icon_name (string icon_name, Gtk.IconSize size); public void set_from_icon_set (Gtk.IconSet icon_set, Gtk.IconSize size); public void set_from_pixbuf (Gdk.Pixbuf pixbuf); + public void set_from_resource (string resource_path); public void set_from_stock (string stock_id, Gtk.IconSize size); public void set_pixel_size (int pixel_size); [NoAccessorMethod] @@ -2531,7 +2548,7 @@ public uint width { get; set; } } [CCode (cheader_filename = "gtk/gtk.h")] - public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public LinkButton (string uri); public unowned string get_uri (); @@ -2573,7 +2590,7 @@ public void swap (Gtk.TreeIter a, Gtk.TreeIter b); } [CCode (cheader_filename = "gtk/gtk.h")] - public class LockButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class LockButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public LockButton (GLib.Permission permission); public unowned GLib.Permission get_permission (); @@ -2613,6 +2630,8 @@ public void attach (Gtk.Widget child, uint left_attach, uint right_attach, uint top_attach, uint bottom_attach); public void attach_to_widget (Gtk.Widget attach_widget, Gtk.MenuDetachFunc? detacher); public void detach (); + [CCode (has_construct_function = false, type = "GtkWidget*")] + public Menu.from_model (GLib.MenuModel model); public unowned Gtk.AccelGroup get_accel_group (); public unowned string get_accel_path (); public unowned Gtk.Widget get_active (); @@ -2651,6 +2670,8 @@ public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable { [CCode (has_construct_function = false, type = "GtkWidget*")] public MenuBar (); + [CCode (has_construct_function = false, type = "GtkWidget*")] + public MenuBar.from_model (GLib.MenuModel model); public Gtk.PackDirection get_child_pack_direction (); public Gtk.PackDirection get_pack_direction (); public void set_child_pack_direction (Gtk.PackDirection child_pack_dir); @@ -2723,7 +2744,7 @@ public virtual signal void selection_done (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable { [CCode (has_construct_function = false, type = "GtkToolItem*")] public MenuToolButton (Gtk.Widget? icon_widget, string? label); [CCode (has_construct_function = false, type = "GtkToolItem*")] @@ -3217,7 +3238,7 @@ public virtual signal void changed (Gtk.RadioAction current); } [CCode (cheader_filename = "gtk/gtk.h")] - public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public RadioButton (GLib.SList? group); [CCode (has_construct_function = false, type = "GtkWidget*")] @@ -3257,7 +3278,7 @@ public virtual signal void group_changed (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable { [CCode (has_construct_function = false, type = "GtkToolItem*")] public RadioToolButton (GLib.SList? group); [CCode (has_construct_function = false, type = "GtkToolItem*")] @@ -3516,7 +3537,7 @@ public virtual signal string format_value (double value); } [CCode (cheader_filename = "gtk/gtk.h")] - public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable { + public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable, Gtk.Orientable { [CCode (has_construct_function = false, type = "GtkWidget*")] public ScaleButton (Gtk.IconSize size, double min, double max, double step, [CCode (array_length = false)] string[] icons); public unowned Gtk.Adjustment get_adjustment (); @@ -4067,9 +4088,11 @@ public Gtk.JunctionSides get_junction_sides (); public Gtk.Border get_margin (Gtk.StateFlags state); public Gtk.Border get_padding (Gtk.StateFlags state); + public unowned Gtk.StyleContext get_parent (); public unowned Gtk.WidgetPath get_path (); public void get_property (string property, Gtk.StateFlags state, GLib.Value value); public unowned Gdk.Screen get_screen (); + public unowned Gtk.CssSection get_section (string property); public Gtk.StateFlags get_state (); public void get_style (...); public void get_style_property (string property_name, GLib.Value value); @@ -4128,11 +4151,13 @@ public void set_background (Gdk.Window window); public void set_direction (Gtk.TextDirection direction); public void set_junction_sides (Gtk.JunctionSides sides); + public void set_parent (Gtk.StyleContext parent); public void set_path (Gtk.WidgetPath path); public void set_screen (Gdk.Screen screen); public void set_state (Gtk.StateFlags flags); public bool state_is_running (Gtk.StateType state, double progress); public Gtk.TextDirection direction { get; set; } + public Gtk.StyleContext parent { get; set; } public Gdk.Screen screen { get; set; } public virtual signal void changed (); } @@ -4155,7 +4180,7 @@ public void unset_property (string property, Gtk.StateFlags state); } [CCode (cheader_filename = "gtk/gtk.h")] - public class Switch : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class Switch : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public Switch (); public bool get_active (); @@ -4754,7 +4779,7 @@ public virtual signal void toggled (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable { [CCode (has_construct_function = false, type = "GtkWidget*")] public ToggleButton (); public bool get_active (); @@ -4775,7 +4800,7 @@ public virtual signal void toggled (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable { [CCode (has_construct_function = false, type = "GtkToolItem*")] public ToggleToolButton (); [CCode (has_construct_function = false, type = "GtkToolItem*")] @@ -4786,7 +4811,7 @@ public virtual signal void toggled (); } [CCode (cheader_filename = "gtk/gtk.h")] - public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable { + public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable { [CCode (has_construct_function = false, type = "GtkToolItem*")] public ToolButton (Gtk.Widget? icon_widget, string? label); [CCode (has_construct_function = false, type = "GtkToolItem*")] @@ -5302,6 +5327,7 @@ public UIManager (); public void add_ui (uint merge_id, string path, string name, string? action, Gtk.UIManagerItemType type, bool top); public uint add_ui_from_file (string filename) throws GLib.Error; + public uint add_ui_from_resource (string resource_path) throws GLib.Error; public uint add_ui_from_string (string buffer, ssize_t length) throws GLib.Error; public void ensure_update (); public unowned Gtk.AccelGroup get_accel_group (); @@ -5372,7 +5398,7 @@ public Gtk.ShadowType shadow_type { get; set; } } [CCode (cheader_filename = "gtk/gtk.h")] - public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Orientable { + public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable, Gtk.Orientable { [CCode (has_construct_function = false, type = "GtkWidget*")] public VolumeButton (); [NoAccessorMethod] @@ -5396,6 +5422,7 @@ public void class_path (out uint path_length, out unowned string path, out unowned string path_reversed); public virtual bool compute_expand (Gtk.Orientation orientation); [CCode (vfunc_name = "compute_expand")] + [NoWrapper] public virtual void compute_expand_internal (out bool hexpand, out bool vexpand); public Pango.Context create_pango_context (); public Pango.Layout create_pango_layout (string? text); @@ -5448,9 +5475,15 @@ public void get_pointer (out int x, out int y); public virtual void get_preferred_height (out int minimum_height, out int natural_height); public virtual void get_preferred_height_for_width (int width, out int minimum_height, out int natural_height); + [CCode (vfunc_name = "get_preferred_height_for_width")] + [NoWrapper] + public virtual void get_preferred_height_for_width_internal (int width, out int minimum_height, out int natural_height); public void get_preferred_size (out Gtk.Requisition minimum_size, out Gtk.Requisition natural_size); public virtual void get_preferred_width (out int minimum_width, out int natural_width); public virtual void get_preferred_width_for_height (int height, out int minimum_width, out int natural_width); + [CCode (vfunc_name = "get_preferred_width_for_height")] + [NoWrapper] + public virtual void get_preferred_width_for_height_internal (int height, out int minimum_width, out int natural_width); public bool get_realized (); public bool get_receives_default (); public virtual Gtk.SizeRequestMode get_request_mode (); @@ -5746,7 +5779,7 @@ public bool iter_has_qclass (int pos, GLib.Quark qname); public bool iter_has_qname (int pos, GLib.Quark qname); public bool iter_has_qregion (int pos, GLib.Quark qname, Gtk.RegionFlags flags); - public bool iter_has_region (int pos, string name, Gtk.RegionFlags flags); + public bool iter_has_region (int pos, string name, out Gtk.RegionFlags flags); public unowned GLib.SList iter_list_classes (int pos); public unowned GLib.SList iter_list_regions (int pos); public void iter_remove_class (int pos, string name); @@ -5772,6 +5805,7 @@ public void fullscreen (); public bool get_accept_focus (); public unowned Gtk.Application get_application (); + public unowned Gtk.Widget get_attached_to (); public bool get_decorated (); public static GLib.List get_default_icon_list (); public static unowned string get_default_icon_name (); @@ -5824,6 +5858,7 @@ public void resize_to_geometry (int width, int height); public void set_accept_focus (bool setting); public void set_application (Gtk.Application application); + public void set_attached_to (Gtk.Widget attach_widget); public static void set_auto_startup_notification (bool setting); public void set_decorated (bool setting); public void set_default (Gtk.Widget default_widget); @@ -5864,13 +5899,13 @@ public void set_type_hint (Gdk.WindowTypeHint hint); public void set_urgency_hint (bool setting); public void set_wmclass (string wmclass_name, string wmclass_class); - public void setup_persistent_state (GLib.Settings settings, string child_name); public void stick (); public void unfullscreen (); public void unmaximize (); public void unstick (); public bool accept_focus { get; set; } public Gtk.Application application { get; set; } + public Gtk.Widget attached_to { get; set construct; } public bool decorated { get; set; } [NoAccessorMethod] public int default_height { get; set; } @@ -5933,6 +5968,18 @@ public void remove_window (Gtk.Window window); } [CCode (cheader_filename = "gtk/gtk.h")] + public interface Actionable : Gtk.Widget { + public abstract unowned string get_action_name (); + public abstract unowned GLib.Variant get_action_target_value (); + public abstract void set_action_name (string action_name); + public void set_action_target (string format_string); + public abstract void set_action_target_value (GLib.Variant target_value); + public void set_detailed_action_name (string detailed_action_name); + public string action_name { get; set; } + [NoAccessorMethod] + public GLib.Variant action_target { owned get; set; } + } + [CCode (cheader_filename = "gtk/gtk.h")] public interface Activatable : GLib.Object { public void do_set_related_action (Gtk.Action action); public unowned Gtk.Action get_related_action (); @@ -6500,6 +6547,20 @@ END, CENTER } + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_APPLICATION_")] + public enum ApplicationEndSessionStyle { + LOGOUT, + REBOOT, + SHUTDOWN + } + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_APPLICATION_INHIBIT_")] + [Flags] + public enum ApplicationInhibitFlags { + LOGOUT, + SWITCH, + SUSPEND, + IDLE + } [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ARROWS_")] public enum ArrowPlacement { BOTH, @@ -6535,7 +6596,13 @@ NONE, SOLID, INSET, - OUTSET + OUTSET, + HIDDEN, + DOTTED, + DASHED, + DOUBLE, + GROOVE, + RIDGE } [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUTTONBOX_")] public enum ButtonBoxStyle { @@ -7177,7 +7244,7 @@ INSENSITIVE, INCONSISTENT, FOCUSED, - WINDOW_UNFOCUSED + BACKDROP } [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_STATE_")] public enum StateType { diff -Nru vala-0.16-0.15.1/vapi/libpeas-1.0.vapi vala-0.16-0.15.2/vapi/libpeas-1.0.vapi --- vala-0.16-0.15.1/vapi/libpeas-1.0.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/libpeas-1.0.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -111,8 +111,8 @@ DEP_LOADING_FAILED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "libpeas/peas.h", has_target = false)] - public delegate void ExtensionSetForeachFunc (Peas.ExtensionSet @set, Peas.PluginInfo info, Peas.Extension exten, void* data); + [CCode (cheader_filename = "libpeas/peas.h", instance_pos = 3.9)] + public delegate void ExtensionSetForeachFunc (Peas.ExtensionSet @set, Peas.PluginInfo info, Peas.Extension exten); [CCode (cheader_filename = "libpeas/peas.h", instance_pos = 1.9)] public delegate GLib.Object FactoryFunc ([CCode (array_length_cname = "n_parameters", array_length_pos = 0.5, array_length_type = "guint")] GLib.Parameter[] parameters); } diff -Nru vala-0.16-0.15.1/vapi/libsoup-2.4.vapi vala-0.16-0.15.2/vapi/libsoup-2.4.vapi --- vala-0.16-0.15.1/vapi/libsoup-2.4.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/libsoup-2.4.vapi 2012-02-25 15:42:33.000000000 +0000 @@ -10,7 +10,7 @@ [CCode (cheader_filename = "libsoup/soup.h")] public static string encode (...); [CCode (cheader_filename = "libsoup/soup.h")] - public static string encode_datalist (GLib.Datalist form_data_set); + public static string encode_datalist (GLib.Datalist form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] public static string encode_hash (GLib.HashTable form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] @@ -18,7 +18,7 @@ [CCode (cheader_filename = "libsoup/soup.h")] public static Soup.Message request_new (string method, string uri, ...); [CCode (cheader_filename = "libsoup/soup.h")] - public static Soup.Message request_new_from_datalist (string method, string uri, GLib.Datalist form_data_set); + public static Soup.Message request_new_from_datalist (string method, string uri, GLib.Datalist form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] public static Soup.Message request_new_from_hash (string method, string uri, GLib.HashTable form_data_set); [CCode (cheader_filename = "libsoup/soup.h")] @@ -450,7 +450,7 @@ public Soup.Expectation get_expectations (); public unowned string get_list (string name); public unowned string get_one (string name); - public bool get_ranges (int64 total_length, out Soup.Range ranges, int length); + public bool get_ranges (int64 total_length, [CCode (array_length_cname = "length", array_length_pos = 2.1, type = "SoupRange**")] out Soup.Range[] ranges); public void remove (string name); public void replace (string name, string value); public void set_content_disposition (string disposition, GLib.HashTable? @params); diff -Nru vala-0.16-0.15.1/vapi/libvala-0.16.vapi vala-0.16-0.15.2/vapi/libvala-0.16.vapi --- vala-0.16-0.15.1/vapi/libvala-0.16.vapi 2012-01-26 21:08:17.000000000 +0000 +++ vala-0.16-0.15.2/vapi/libvala-0.16.vapi 2012-02-25 16:22:07.000000000 +0000 @@ -3184,6 +3184,7 @@ public string copy_function { get; } public string default_value { get; } public bool delegate_target { get; private set; } + public string delegate_target_name { get; } public string destroy_function { get; } public string finish_name { get; } public string finish_real_name { get; } @@ -3372,6 +3373,7 @@ public static string get_ccode_declarator_suffix (Vala.DataType type); public static string get_ccode_default_value (Vala.TypeSymbol sym); public static bool get_ccode_delegate_target (Vala.CodeNode node); + public static string get_ccode_delegate_target_name (Vala.Variable variable); public static double get_ccode_delegate_target_pos (Vala.CodeNode node); public static string get_ccode_destroy_function (Vala.TypeSymbol sym); public static double get_ccode_destroy_notify_pos (Vala.CodeNode node); diff -Nru vala-0.16-0.15.1/vapi/Makefile.am vala-0.16-0.15.2/vapi/Makefile.am --- vala-0.16-0.15.1/vapi/Makefile.am 2012-01-26 13:47:48.000000000 +0000 +++ vala-0.16-0.15.2/vapi/Makefile.am 2012-02-09 18:32:59.000000000 +0000 @@ -250,7 +250,95 @@ config.vapi \ $(NULL) -BINDINGS = atk clutter-1.0 clutter-gtk-0.10 clutter-gtk-1.0 cogl-1.0 cogl-pango-1.0 gconf-2.0 gdk-2.0 gdk-3.0 gdk-pixbuf-2.0 gdk-x11-2.0 gdk-x11-3.0 gdl-1.0 gdl-3.0 gdu gdu-gtk gedit-2.20 gedit gio-2.0 gio-unix-2.0 gnome-desktop-2.0 gnome-keyring-1 gnome-vfs-2.0 goocanvas gstreamer-0.10 gstreamer-app-0.10 gstreamer-audio-0.10 gstreamer-base-0.10 gstreamer-cdda-0.10 gstreamer-check-0.10 gstreamer-controller-0.10 gstreamer-dataprotocol-0.10 gstreamer-fft-0.10 gstreamer-interfaces-0.10 gstreamer-net-0.10 gstreamer-netbuffer-0.10 gstreamer-pbutils-0.10 gstreamer-riff-0.10 gstreamer-rtp-0.10 gstreamer-rtsp-0.10 gstreamer-sdp-0.10 gstreamer-tag-0.10 gstreamer-video-0.10 gtk+-2.0 gtk+-3.0 gtksourceview-2.0 gtksourceview-3.0 gudev-1.0 hildon-1 hildon-fm-2 json-glib-1.0 libepc-1.0 libgda-4.0 libgda-report-4.0 libgdata libglade-2.0 libgnome-2.0 libgnome-menu libgnomeui-2.0 libgsf-1 libnotify liboobs-1 libpeas-1.0 librsvg-2.0 libsexy libsoup-2.2 libsoup-2.4 libwnck-1.0 loudmouth-1.0 mx-1.0 packagekit-glib2 pango pangocairo poppler-glib purple rest-0.6 rest-extras-0.6 rest-0.7 tracker-indexer-module-1.0 twitter-glib-1.0 unique-1.0 vte vte-2.90 webkit-1.0 +GIDL_BINDINGS = \ + clutter-gtk-1.0 \ + cogl-1.0 \ + gconf-2.0 \ + gdk-2.0 \ + gdk-x11-2.0 \ + gdk-x11-3.0 \ + gdl-1.0 \ + gdu \ + gdk-gtk \ + gedit-2.20 \ + gnome-desktop-2.0 \ + gnome-keyring-1 \ + gnome-vfs-2.0 \ + goocanvas \ + gstreamer-0.10 \ + gstreamer-app-0.10 \ + gstreamer-audio-0.10 \ + gstreamer-base-0.10 \ + gstreamer-cdda-0.10 \ + gstreamer-check-0.10 \ + gstreamer-controller-0.10 \ + gstreamer-dataprotocol-0.10 \ + gstreamer-fft-0.10 \ + gstreamer-interfaces-0.10 \ + gstreamer-net-0.10 \ + gstreamer-netbuffer-0.10 \ + gstreamer-pbutils-0.10 \ + gstreamer-riff-0.10 \ + gstreamer-rtp-0.10 \ + gstreamer-rtsp-0.10 \ + gstreamer-sdp-0.10 \ + gstreamer-tag-0.10 \ + gstreamer-video-0.10 \ + gtk+-2.0 \ + gtk+-3.0 \ + gtksourceview-2.0 \ + hildon-1 \ + hildon-fm-2 \ + libepc-1.0 \ + libgda-4.0 \ + libgda-report-4.0 \ + libglade-2.0 \ + libgnome-2.0 \ + libgnome-menu \ + libgnomeui-2.0 \ + libgsf-1 \ + libnotify \ + liboobs-1 \ + librsvg-2.0 \ + libsexy \ + libsoup-2.2 \ + loudmouth-1.0 \ + pango \ + purple \ + rest-0.6 \ + rest-extras-0.6 \ + tracker-indexer-module-1.0 \ + twitter-glib-1.0 \ + unique-1.0 \ + vte \ + webkit-1.0 \ + $(NULL) + +GIR_BINDINGS = \ + atk \ + clutter-1.0 \ + cogl-pango \ + gdk-3.0 \ + gdk-pixbuf-2.0 \ + gdl-3.0 \ + gedit \ + gio-2.0 \ + gtksourceview-3.0 \ + gudev-1.0 \ + json-glib-1.0 \ + libgdata \ + libpeas-1.0 \ + libsoup-2.4 \ + libwnck-3.0 \ + mx-1.0 \ + packagekit-glib2 \ + pangocairo \ + poppler-glib \ + rest-0.7 \ + vte-2.90 \ + $(NULL) + +BINDINGS = $(GIR_BINDINGS) $(GIDL_BINDINGS) VAPIGEN = $(top_builddir)/vapigen/vapigen VAPIGENFLAGS = --vapidir $(srcdir) @@ -262,7 +350,11 @@ .PHONY: all-bindings $(BINDINGS) -all-bindings: $(BINDINGS) +gir-bindings: $(GIR_BINDINGS) + +gidl-bindings: $(GIDL_BINDINGS) + +all-bindings: gir-bindings gidl-bindings atk: $(GENVAPI) --library $(srcdir)/atk --metadatadir $(METADATADIR) $(METADATADIR)/Atk-1.0-custom.vala $(GIRDIR)/Atk-1.0.gir @@ -487,7 +579,7 @@ $(GENVAPI) --library $(srcdir)/pangocairo --metadatadir $(METADATADIR) $(GIRDIR)/PangoCairo-1.0.gir poppler-glib: - $(GENVAPI) --library $(srcdir)/poppler-glib $(PACKAGESDIR)/poppler-glib/poppler-glib.gi + $(GENVAPI) --library $(srcdir)/poppler-glib --metadatadir $(METADATADIR) $(GIRDIR)/Poppler-0.18.gir purple: $(GENVAPI) --library $(srcdir)/purple $(PACKAGESDIR)/purple/purple-custom.vala $(PACKAGESDIR)/purple/purple.gi diff -Nru vala-0.16-0.15.1/vapi/Makefile.in vala-0.16-0.15.2/vapi/Makefile.in --- vala-0.16-0.15.1/vapi/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/vapi/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -47,11 +47,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = @@ -471,27 +471,95 @@ config.vapi \ $(NULL) -BINDINGS = atk clutter-1.0 clutter-gtk-0.10 clutter-gtk-1.0 cogl-1.0 \ - cogl-pango-1.0 gconf-2.0 gdk-2.0 gdk-3.0 gdk-pixbuf-2.0 \ - gdk-x11-2.0 gdk-x11-3.0 gdl-1.0 gdl-3.0 gdu gdu-gtk gedit-2.20 \ - gedit gio-2.0 gio-unix-2.0 gnome-desktop-2.0 gnome-keyring-1 \ - gnome-vfs-2.0 goocanvas gstreamer-0.10 gstreamer-app-0.10 \ - gstreamer-audio-0.10 gstreamer-base-0.10 gstreamer-cdda-0.10 \ - gstreamer-check-0.10 gstreamer-controller-0.10 \ - gstreamer-dataprotocol-0.10 gstreamer-fft-0.10 \ - gstreamer-interfaces-0.10 gstreamer-net-0.10 \ - gstreamer-netbuffer-0.10 gstreamer-pbutils-0.10 \ - gstreamer-riff-0.10 gstreamer-rtp-0.10 gstreamer-rtsp-0.10 \ - gstreamer-sdp-0.10 gstreamer-tag-0.10 gstreamer-video-0.10 \ - gtk+-2.0 gtk+-3.0 gtksourceview-2.0 gtksourceview-3.0 \ - gudev-1.0 hildon-1 hildon-fm-2 json-glib-1.0 libepc-1.0 \ - libgda-4.0 libgda-report-4.0 libgdata libglade-2.0 \ - libgnome-2.0 libgnome-menu libgnomeui-2.0 libgsf-1 libnotify \ - liboobs-1 libpeas-1.0 librsvg-2.0 libsexy libsoup-2.2 \ - libsoup-2.4 libwnck-1.0 loudmouth-1.0 mx-1.0 packagekit-glib2 \ - pango pangocairo poppler-glib purple rest-0.6 rest-extras-0.6 \ - rest-0.7 tracker-indexer-module-1.0 twitter-glib-1.0 \ - unique-1.0 vte vte-2.90 webkit-1.0 +GIDL_BINDINGS = \ + clutter-gtk-1.0 \ + cogl-1.0 \ + gconf-2.0 \ + gdk-2.0 \ + gdk-x11-2.0 \ + gdk-x11-3.0 \ + gdl-1.0 \ + gdu \ + gdk-gtk \ + gedit-2.20 \ + gnome-desktop-2.0 \ + gnome-keyring-1 \ + gnome-vfs-2.0 \ + goocanvas \ + gstreamer-0.10 \ + gstreamer-app-0.10 \ + gstreamer-audio-0.10 \ + gstreamer-base-0.10 \ + gstreamer-cdda-0.10 \ + gstreamer-check-0.10 \ + gstreamer-controller-0.10 \ + gstreamer-dataprotocol-0.10 \ + gstreamer-fft-0.10 \ + gstreamer-interfaces-0.10 \ + gstreamer-net-0.10 \ + gstreamer-netbuffer-0.10 \ + gstreamer-pbutils-0.10 \ + gstreamer-riff-0.10 \ + gstreamer-rtp-0.10 \ + gstreamer-rtsp-0.10 \ + gstreamer-sdp-0.10 \ + gstreamer-tag-0.10 \ + gstreamer-video-0.10 \ + gtk+-2.0 \ + gtk+-3.0 \ + gtksourceview-2.0 \ + hildon-1 \ + hildon-fm-2 \ + libepc-1.0 \ + libgda-4.0 \ + libgda-report-4.0 \ + libglade-2.0 \ + libgnome-2.0 \ + libgnome-menu \ + libgnomeui-2.0 \ + libgsf-1 \ + libnotify \ + liboobs-1 \ + librsvg-2.0 \ + libsexy \ + libsoup-2.2 \ + loudmouth-1.0 \ + pango \ + purple \ + rest-0.6 \ + rest-extras-0.6 \ + tracker-indexer-module-1.0 \ + twitter-glib-1.0 \ + unique-1.0 \ + vte \ + webkit-1.0 \ + $(NULL) + +GIR_BINDINGS = \ + atk \ + clutter-1.0 \ + cogl-pango \ + gdk-3.0 \ + gdk-pixbuf-2.0 \ + gdl-3.0 \ + gedit \ + gio-2.0 \ + gtksourceview-3.0 \ + gudev-1.0 \ + json-glib-1.0 \ + libgdata \ + libpeas-1.0 \ + libsoup-2.4 \ + libwnck-3.0 \ + mx-1.0 \ + packagekit-glib2 \ + pangocairo \ + poppler-glib \ + rest-0.7 \ + vte-2.90 \ + $(NULL) + +BINDINGS = $(GIR_BINDINGS) $(GIDL_BINDINGS) VAPIGEN = $(top_builddir)/vapigen/vapigen VAPIGENFLAGS = --vapidir $(srcdir) GENVAPI = $(VAPIGEN) $(VAPIGENFLAGS) @@ -716,7 +784,11 @@ .PHONY: all-bindings $(BINDINGS) -all-bindings: $(BINDINGS) +gir-bindings: $(GIR_BINDINGS) + +gidl-bindings: $(GIDL_BINDINGS) + +all-bindings: gir-bindings gidl-bindings atk: $(GENVAPI) --library $(srcdir)/atk --metadatadir $(METADATADIR) $(METADATADIR)/Atk-1.0-custom.vala $(GIRDIR)/Atk-1.0.gir @@ -941,7 +1013,7 @@ $(GENVAPI) --library $(srcdir)/pangocairo --metadatadir $(METADATADIR) $(GIRDIR)/PangoCairo-1.0.gir poppler-glib: - $(GENVAPI) --library $(srcdir)/poppler-glib $(PACKAGESDIR)/poppler-glib/poppler-glib.gi + $(GENVAPI) --library $(srcdir)/poppler-glib --metadatadir $(METADATADIR) $(GIRDIR)/Poppler-0.18.gir purple: $(GENVAPI) --library $(srcdir)/purple $(PACKAGESDIR)/purple/purple-custom.vala $(PACKAGESDIR)/purple/purple.gi diff -Nru vala-0.16-0.15.1/vapi/poppler-glib.vapi vala-0.16-0.15.2/vapi/poppler-glib.vapi --- vala-0.16-0.15.1/vapi/poppler-glib.vapi 2011-10-03 09:19:41.000000000 +0000 +++ vala-0.16-0.15.2/vapi/poppler-glib.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -1,32 +1,59 @@ /* poppler-glib.vapi generated by vapigen, do not modify. */ +[CCode (cprefix = "Poppler", gir_namespace = "Poppler", gir_version = "0.18", lower_case_cprefix = "poppler_")] namespace Poppler { - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_action_copy", type_id = "poppler_action_get_type ()")] + namespace AnnotTextIcon { + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_CIRCLE")] + public const string CIRCLE; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_COMMENT")] + public const string COMMENT; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_CROSS")] + public const string CROSS; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_HELP")] + public const string HELP; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_INSERT")] + public const string INSERT; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_KEY")] + public const string KEY; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_NEW_PARAGRAPH")] + public const string NEW_PARAGRAPH; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_NOTE")] + public const string NOTE; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_ANNOT_TEXT_ICON_PARAGRAPH")] + public const string PARAGRAPH; + } + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_action_get_type ()")] [Compact] public class Action { public Poppler.ActionAny any; public Poppler.ActionGotoDest goto_dest; public Poppler.ActionGotoRemote goto_remote; + public Poppler.ActionJavascript javascript; public Poppler.ActionLaunch launch; public Poppler.ActionMovie movie; public Poppler.ActionNamed named; + public Poppler.ActionOCGState ocg_state; + public Poppler.ActionRendition rendition; public Poppler.ActionType type; public Poppler.ActionUri uri; public Poppler.Action copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_get_type ()")] public class Annot : GLib.Object { [CCode (has_construct_function = false)] protected Annot (); public Poppler.AnnotType get_annot_type (); - public unowned Poppler.Color get_color (); - public unowned string get_contents (); + public Poppler.Color get_color (); + public string get_contents (); public Poppler.AnnotFlag get_flags (); - public unowned string get_modified (); - public unowned string get_name (); + public string get_modified (); + public string get_name (); + public int get_page_index (); + public void set_color (Poppler.Color? poppler_color); public void set_contents (string contents); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_callout_line_copy", type_id = "poppler_annot_callout_line_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_annot_callout_line_get_type ()")] [Compact] public class AnnotCalloutLine { public bool multiline; @@ -38,60 +65,88 @@ public double y3; [CCode (has_construct_function = false)] public AnnotCalloutLine (); - public unowned Poppler.AnnotCalloutLine copy (); + public Poppler.AnnotCalloutLine copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_file_attachment_get_type ()")] + public class AnnotFileAttachment : Poppler.AnnotMarkup { + [CCode (has_construct_function = false)] + protected AnnotFileAttachment (); + public Poppler.Attachment get_attachment (); + public string get_name (); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_free_text_get_type ()")] public class AnnotFreeText : Poppler.AnnotMarkup { [CCode (has_construct_function = false)] protected AnnotFreeText (); - public unowned Poppler.AnnotCalloutLine get_callout_line (); + public Poppler.AnnotCalloutLine get_callout_line (); public Poppler.AnnotFreeTextQuadding get_quadding (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_annot_mapping_copy", type_id = "poppler_annot_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_annot_mapping_get_type ()")] [Compact] public class AnnotMapping { - public weak Poppler.Annot annot; + public Poppler.Annot annot; public Poppler.Rectangle area; [CCode (has_construct_function = false)] public AnnotMapping (); - public unowned Poppler.AnnotMapping copy (); + public Poppler.AnnotMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_markup_get_type ()")] public class AnnotMarkup : Poppler.Annot { [CCode (has_construct_function = false)] protected AnnotMarkup (); public GLib.Date get_date (); public Poppler.AnnotExternalDataType get_external_data (); - public unowned string get_label (); + public string get_label (); public double get_opacity (); public bool get_popup_is_open (); - public bool get_popup_rectangle (Poppler.Rectangle poppler_rect); + public bool get_popup_rectangle (out Poppler.Rectangle poppler_rect); public Poppler.AnnotMarkupReplyType get_reply_to (); - public unowned string get_subject (); + public string get_subject (); public bool has_popup (); + public void set_label (string? label); + public void set_opacity (double opacity); + public void set_popup (Poppler.Rectangle popup_rect); + public void set_popup_is_open (bool is_open); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_movie_get_type ()")] + public class AnnotMovie : Poppler.Annot { + [CCode (has_construct_function = false)] + protected AnnotMovie (); + public unowned Poppler.Movie get_movie (); + public string get_title (); } - [CCode (cheader_filename = "poppler.h")] - public class AnnotText : Poppler.AnnotMarkup { + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_screen_get_type ()")] + public class AnnotScreen : Poppler.Annot { [CCode (has_construct_function = false)] - protected AnnotText (); - public unowned string get_icon (); + protected AnnotScreen (); + public unowned Poppler.Action get_action (); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_annot_text_get_type ()")] + public class AnnotText : Poppler.AnnotMarkup { + [CCode (has_construct_function = false, type = "PopplerAnnot*")] + public AnnotText (Poppler.Document doc, Poppler.Rectangle rect); + public string get_icon (); public bool get_is_open (); public Poppler.AnnotTextState get_state (); + public void set_icon (string icon); + public void set_is_open (bool is_open); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_attachment_get_type ()")] public class Attachment : GLib.Object { - public weak GLib.StringBuilder checksum; + public GLib.StringBuilder checksum; public GLib.Time ctime; - public weak string description; + public string description; public GLib.Time mtime; - public weak string name; + public string name; public size_t size; [CCode (has_construct_function = false)] protected Attachment (); public bool save (string filename) throws GLib.Error; public bool save_to_callback (Poppler.AttachmentSaveFunc save_func) throws GLib.Error; } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_color_copy", type_id = "poppler_color_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_color_get_type ()")] [Compact] public class Color { public uint16 blue; @@ -99,9 +154,10 @@ public uint16 red; [CCode (has_construct_function = false)] public Color (); - public unowned Poppler.Color copy (); + public Poppler.Color copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_dest_copy", type_id = "poppler_dest_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_dest_get_type ()")] [Compact] public class Dest { public double bottom; @@ -109,36 +165,51 @@ public uint change_top; public uint change_zoom; public double left; - public weak string named_dest; + public string named_dest; public int page_num; public double right; public double top; public Poppler.DestType type; public double zoom; public Poppler.Dest copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_document_get_type ()")] public class Document : GLib.Object { [CCode (has_construct_function = false)] protected Document (); - public unowned Poppler.Dest find_dest (string link_name); + public Poppler.Dest find_dest (string link_name); [CCode (has_construct_function = false)] - public Document.from_data (string data, int length, string password) throws GLib.Error; + public Document.from_data (string data, int length, string? password) throws GLib.Error; [CCode (has_construct_function = false)] public Document.from_file (string uri, string? password) throws GLib.Error; - public unowned GLib.List get_attachments (); - public unowned Poppler.FormField get_form_field (int id); + public GLib.List get_attachments (); + public string get_author (); + public long get_creation_date (); + public string get_creator (); + public Poppler.FormField get_form_field (int id); + public bool get_id (out string permanent_id, out string update_id); + public string get_keywords (); + public string get_metadata (); + public long get_modification_date (); + public uint get_n_attachments (); public int get_n_pages (); - public unowned Poppler.Page get_page (int index); - public unowned Poppler.Page get_page_by_label (string label); + public Poppler.Page get_page (int index); + public Poppler.Page get_page_by_label (string label); + public Poppler.PageLayout get_page_layout (); + public Poppler.PageMode get_page_mode (); + public void get_pdf_version (out uint major_version, out uint minor_version); + public string get_pdf_version_string (); + public Poppler.Permissions get_permissions (); + public string get_producer (); + public string get_subject (); + public string get_title (); public bool has_attachments (); + public bool is_linearized (); public bool save (string uri) throws GLib.Error; public bool save_a_copy (string uri) throws GLib.Error; - [NoAccessorMethod] public string author { owned get; } - [NoAccessorMethod] public int creation_date { get; } - [NoAccessorMethod] public string creator { owned get; } [NoAccessorMethod] public string format { owned get; } @@ -146,40 +217,33 @@ public uint format_major { get; } [NoAccessorMethod] public uint format_minor { get; } - [NoAccessorMethod] public string keywords { owned get; } [NoAccessorMethod] - public string linearized { owned get; } - [NoAccessorMethod] + public bool linearized { get; } public string metadata { owned get; } [NoAccessorMethod] public int mod_date { get; } - [NoAccessorMethod] public Poppler.PageLayout page_layout { get; } - [NoAccessorMethod] public Poppler.PageMode page_mode { get; } - [NoAccessorMethod] public Poppler.Permissions permissions { get; } - [NoAccessorMethod] public string producer { owned get; } - [NoAccessorMethod] public string subject { owned get; } - [NoAccessorMethod] public string title { owned get; } [NoAccessorMethod] public Poppler.ViewerPreferences viewer_preferences { get; } } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_font_info_get_type ()")] public class FontInfo : GLib.Object { [CCode (has_construct_function = false)] public FontInfo (Poppler.Document document); public void free (); - public bool scan (int n_pages, out unowned Poppler.FontsIter iter); + public bool scan (int n_pages, out Poppler.FontsIter iter); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_fonts_iter_copy", type_id = "poppler_fonts_iter_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_fonts_iter_get_type ()")] [Compact] public class FontsIter { public Poppler.FontsIter copy (); + public void free (); public unowned string get_file_name (); public Poppler.FontType get_font_type (); public unowned string get_full_name (); @@ -188,7 +252,7 @@ public bool is_subset (); public bool next (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_form_field_get_type ()")] public class FormField : GLib.Object { [CCode (has_construct_function = false)] protected FormField (); @@ -199,38 +263,43 @@ public bool choice_commit_on_change (); public bool choice_do_spell_check (); public Poppler.FormChoiceType choice_get_choice_type (); - public unowned string choice_get_item (int index); + public string choice_get_item (int index); public int choice_get_n_items (); - public unowned string choice_get_text (); + public string choice_get_text (); public bool choice_is_editable (); public bool choice_is_item_selected (int index); public void choice_select_item (int index); public void choice_set_text (string text); public void choice_toggle_item (int index); public void choice_unselect_all (); + public unowned Poppler.Action get_action (); public Poppler.FormFieldType get_field_type (); public double get_font_size (); public int get_id (); + public string get_mapping_name (); + public string get_name (); + public string get_partial_name (); public bool is_read_only (); public bool text_do_scroll (); public bool text_do_spell_check (); public int text_get_max_len (); - public unowned string text_get_text (); + public string text_get_text (); public Poppler.FormTextType text_get_text_type (); public bool text_is_password (); public bool text_is_rich_text (); public void text_set_text (string text); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_form_field_mapping_copy", type_id = "poppler_form_field_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_form_field_mapping_get_type ()")] [Compact] public class FormFieldMapping { public Poppler.Rectangle area; - public weak Poppler.FormField field; + public Poppler.FormField field; [CCode (has_construct_function = false)] public FormFieldMapping (); public Poppler.FormFieldMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_image_mapping_copy", type_id = "poppler_image_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_image_mapping_get_type ()")] [Compact] public class ImageMapping { public Poppler.Rectangle area; @@ -238,19 +307,21 @@ [CCode (has_construct_function = false)] public ImageMapping (); public Poppler.ImageMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_index_iter_copy", type_id = "poppler_index_iter_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_index_iter_get_type ()")] [Compact] public class IndexIter { [CCode (has_construct_function = false)] public IndexIter (Poppler.Document document); public Poppler.IndexIter copy (); - public unowned Poppler.Action get_action (); - public unowned Poppler.IndexIter get_child (); + public void free (); + public Poppler.Action get_action (); + public Poppler.IndexIter get_child (); public bool is_open (); public bool next (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_layer_get_type ()")] public class Layer : GLib.Object { [CCode (has_construct_function = false)] protected Layer (); @@ -261,27 +332,47 @@ public bool is_visible (); public void show (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_layers_iter_copy", type_id = "poppler_layers_iter_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_layers_iter_get_type ()")] [Compact] public class LayersIter { [CCode (has_construct_function = false)] public LayersIter (Poppler.Document document); - public unowned Poppler.LayersIter copy (); - public unowned Poppler.LayersIter get_child (); - public unowned Poppler.Layer get_layer (); - public unowned string get_title (); + public Poppler.LayersIter copy (); + public void free (); + public Poppler.LayersIter get_child (); + public Poppler.Layer get_layer (); + public string get_title (); public bool next (); } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_link_mapping_copy", type_id = "poppler_link_mapping_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_link_mapping_get_type ()")] [Compact] public class LinkMapping { - public weak Poppler.Action action; + public Poppler.Action action; public Poppler.Rectangle area; [CCode (has_construct_function = false)] public LinkMapping (); public Poppler.LinkMapping copy (); + public void free (); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_media_get_type ()")] + public class Media : GLib.Object { + [CCode (has_construct_function = false)] + protected Media (); + public unowned string get_filename (); + public unowned string get_mime_type (); + public bool is_embedded (); + public bool save (string filename) throws GLib.Error; + public bool save_to_callback (Poppler.MediaSaveFunc save_func) throws GLib.Error; + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_movie_get_type ()")] + public class Movie : GLib.Object { + [CCode (has_construct_function = false)] + protected Movie (); + public unowned string get_filename (); + public bool need_poster (); + public bool show_controls (); + } + [CCode (cheader_filename = "poppler.h", type_id = "poppler_ps_file_get_type ()")] public class PSFile : GLib.Object { [CCode (has_construct_function = false)] public PSFile (Poppler.Document document, string filename, int first_page, int n_pages); @@ -289,42 +380,46 @@ public void set_duplex (bool duplex); public void set_paper_size (double width, double height); } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_page_get_type ()")] public class Page : GLib.Object { [CCode (has_construct_function = false)] protected Page (); - public unowned GLib.List find_text (string text); - public static void free_annot_mapping (GLib.List list); - public static void free_form_field_mapping (GLib.List list); - public static void free_image_mapping (GLib.List list); - public static void free_link_mapping (GLib.List list); - public unowned GLib.List get_annot_mapping (); - public void get_crop_box (out Poppler.Rectangle rect); + public void add_annot (Poppler.Annot annot); + public GLib.List find_text (string text); + public static void free_annot_mapping (GLib.List list); + public static void free_form_field_mapping (GLib.List list); + public static void free_image_mapping (GLib.List list); + public static void free_link_mapping (GLib.List list); + public static void free_text_attributes (GLib.List list); + public GLib.List get_annot_mapping (); + public Poppler.Rectangle get_crop_box (); public double get_duration (); - public unowned GLib.List get_form_field_mapping (); - public unowned Cairo.Surface get_image (int image_id); - public unowned GLib.List get_image_mapping (); + public GLib.List get_form_field_mapping (); + public Cairo.Surface get_image (int image_id); + public GLib.List get_image_mapping (); public int get_index (); - public unowned GLib.List get_link_mapping (); - public unowned GLib.List get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection); + public string get_label (); + public GLib.List get_link_mapping (); + public Cairo.Region get_selected_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection); + public string get_selected_text (Poppler.SelectionStyle style, Poppler.Rectangle selection); + [Deprecated (since = "0.16")] + public GLib.List get_selection_region (double scale, Poppler.SelectionStyle style, Poppler.Rectangle selection); public void get_size (out double width, out double height); - public unowned string get_text (Poppler.SelectionStyle style, Poppler.Rectangle rect); - public unowned Cairo.Surface get_thumbnail (); - public unowned Gdk.Pixbuf get_thumbnail_pixbuf (); + public string get_text (); + public GLib.List get_text_attributes (); + public bool get_text_layout ([CCode (array_length_cname = "n_rectangles", array_length_pos = 1.1, array_length_type = "guint")] out Poppler.Rectangle[] rectangles); + public Cairo.Surface get_thumbnail (); public bool get_thumbnail_size (int width, int height); - public unowned Poppler.PageTransition get_transition (); - public void render (Cairo.Context cairo); - public void render_for_printing (Cairo.Context cairo); - public void render_selection (Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Poppler.Color glyph_color, Poppler.Color background_color); - public void render_selection_to_pixbuf (double scale, int rotation, Gdk.Pixbuf pixbuf, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Gdk.Color glyph_color, Gdk.Color background_color); - public void render_to_pixbuf (int src_x, int src_y, int src_width, int src_height, double scale, int rotation, Gdk.Pixbuf pixbuf); - public void render_to_pixbuf_for_printing (int src_x, int src_y, int src_width, int src_height, double scale, int rotation, Gdk.Pixbuf pixbuf); + public Poppler.PageTransition get_transition (); + public void render ([CCode (type = "cairo_t*")] Cairo.Context cairo); + public void render_for_printing ([CCode (type = "cairo_t*")] Cairo.Context cairo); + public void render_for_printing_with_options ([CCode (type = "cairo_t*")] Cairo.Context cairo, Poppler.PrintFlags options); + public void render_selection ([CCode (type = "cairo_t*")] Cairo.Context cairo, Poppler.Rectangle selection, Poppler.Rectangle old_selection, Poppler.SelectionStyle style, Poppler.Color glyph_color, Poppler.Color background_color); public void render_to_ps (Poppler.PSFile ps_file); - public static void selection_region_free (GLib.List region); - [NoAccessorMethod] + public static void selection_region_free (GLib.List region); public string label { owned get; } } - [CCode (cheader_filename = "poppler.h", copy_function = "poppler_page_transition_copy", type_id = "poppler_page_transition_get_type ()")] + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_page_transition_get_type ()")] [Compact] public class PageTransition { public Poppler.PageTransitionAlignment alignment; @@ -337,55 +432,113 @@ [CCode (has_construct_function = false)] public PageTransition (); public Poppler.PageTransition copy (); + public void free (); + } + [CCode (cheader_filename = "poppler.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "poppler_text_attributes_get_type ()")] + [Compact] + public class TextAttributes { + public Poppler.Color color; + public int end_index; + public string font_name; + public double font_size; + public bool is_underlined; + public int start_index; + [CCode (has_construct_function = false)] + public TextAttributes (); + public Poppler.TextAttributes copy (); + public void free (); } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionAny { public Poppler.ActionType type; - public weak string title; + public string title; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionGotoDest { public Poppler.ActionType type; - public weak string title; - public weak Poppler.Dest dest; + public string title; + public Poppler.Dest dest; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionGotoRemote { public Poppler.ActionType type; - public weak string title; - public weak string file_name; - public weak Poppler.Dest dest; + public string title; + public string file_name; + public Poppler.Dest dest; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionJavascript { + public Poppler.ActionType type; + public string title; + public string script; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionLaunch { public Poppler.ActionType type; - public weak string title; - public weak string file_name; - public weak string @params; + public string title; + public string file_name; + public string @params; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionLayer { + public Poppler.ActionLayerAction action; + public weak GLib.List layers; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionMovie { public Poppler.ActionType type; - public weak string title; + public string title; + public Poppler.ActionMovieOperation operation; + public Poppler.Movie movie; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionNamed { public Poppler.ActionType type; - public weak string title; - public weak string named_dest; + public string title; + public string named_dest; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionOCGState { + public Poppler.ActionType type; + public string title; + public GLib.List state_list; + } + [CCode (cheader_filename = "poppler.h", has_type_id = false)] + public struct ActionRendition { + public Poppler.ActionType type; + public string title; + public int op; + public Poppler.Media media; } [CCode (cheader_filename = "poppler.h", has_type_id = false)] public struct ActionUri { public Poppler.ActionType type; - public weak string title; - public weak string uri; + public string title; + public string uri; } - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", type_id = "poppler_rectangle_get_type ()")] public struct Rectangle { public double x1; public double y1; public double x2; public double y2; + [CCode (has_construct_function = false, type = "PopplerRectangle*")] + public Rectangle (); + public Poppler.Rectangle copy (); + public void free (); + } + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_LAYER_")] + public enum ActionLayerAction { + ON, + OFF, + TOGGLE + } + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_MOVIE_")] + public enum ActionMovieOperation { + PLAY, + PAUSE, + RESUME, + STOP } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ACTION_")] public enum ActionType { @@ -396,7 +549,10 @@ LAUNCH, URI, NAMED, - MOVIE + MOVIE, + RENDITION, + OCG_STATE, + JAVASCRIPT } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ANNOT_EXTERNAL_DATA_MARKUP_")] public enum AnnotExternalDataType { @@ -488,14 +644,6 @@ FITBV, NAMED } - [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ERROR_")] - public enum Error { - INVALID, - ENCRYPTED, - OPEN_FILE, - BAD_CATALOG, - DAMAGED - } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_FONT_TYPE_")] public enum FontType { UNKNOWN, @@ -596,8 +744,19 @@ OK_TO_COPY, OK_TO_ADD_NOTES, OK_TO_FILL_FORM, + OK_TO_EXTRACT_CONTENTS, + OK_TO_ASSEMBLE, + OK_TO_PRINT_HIGH_RESOLUTION, FULL } + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_PRINT_")] + [Flags] + public enum PrintFlags { + DOCUMENT, + MARKUP_ANNOTS, + STAMP_ANNOTS_ONLY, + ALL + } [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_SELECTION_")] public enum SelectionStyle { GLYPH, @@ -616,22 +775,29 @@ DISPLAY_DOC_TITLE, DIRECTION_RTL } - [CCode (cheader_filename = "poppler.h", has_target = false)] - public delegate bool AttachmentSaveFunc (string buf, size_t count, void* data) throws GLib.Error; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ERROR_")] + public errordomain Error { + INVALID, + ENCRYPTED, + OPEN_FILE, + BAD_CATALOG, + DAMAGED; + public static GLib.Quark quark (); + } + [CCode (cheader_filename = "poppler.h", instance_pos = 1.9)] + public delegate bool AttachmentSaveFunc ([CCode (array_length_cname = "count", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] buf) throws GLib.Error; + [CCode (cheader_filename = "poppler.h", instance_pos = 1.9)] + public delegate bool MediaSaveFunc ([CCode (array_length_cname = "count", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] buf) throws GLib.Error; + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_HAS_CAIRO")] public const int HAS_CAIRO; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_MAJOR_VERSION")] public const int MAJOR_VERSION; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_MICRO_VERSION")] public const int MICRO_VERSION; - [CCode (cheader_filename = "poppler.h")] + [CCode (cheader_filename = "poppler.h", cname = "POPPLER_MINOR_VERSION")] public const int MINOR_VERSION; [CCode (cheader_filename = "poppler.h")] - public const int WITH_GDK; - [CCode (cheader_filename = "poppler.h")] - public static bool date_parse (string date, ulong timet); - [CCode (cheader_filename = "poppler.h")] - public static GLib.Quark error_quark (); + public static bool date_parse (string date, long timet); [CCode (cheader_filename = "poppler.h")] public static Poppler.Backend get_backend (); [CCode (cheader_filename = "poppler.h")] diff -Nru vala-0.16-0.15.1/vapi/posix.vapi vala-0.16-0.15.2/vapi/posix.vapi --- vala-0.16-0.15.1/vapi/posix.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/posix.vapi 2012-02-23 14:49:44.000000000 +0000 @@ -484,6 +484,8 @@ [CCode (cheader_filename = "arpa/inet.h")] unowned string inet_ntop (int af, void* src, uint8[] dst); [CCode (cheader_filename = "arpa/inet.h")] + public int inet_pton (int af, string src, void* dst); + [CCode (cheader_filename = "arpa/inet.h")] public uint32 htonl (uint32 hostlong); [CCode (cheader_filename = "arpa/inet.h")] public uint32 ntohl (uint32 netlong); @@ -1490,6 +1492,11 @@ public uint32 s_addr; } + [CCode (cname = "struct in6_addr", cheader_filename = "sys/socket.h", destroy_function = "")] + public struct In6Addr { + public uchar[] s6_addr[16]; + } + [CCode (cname = "struct sockaddr", cheader_filename = "sys/socket.h", destroy_function = "")] public struct SockAddr { public int sa_family; @@ -1504,6 +1511,15 @@ public InAddr sin_addr; } + [CCode (cname = "struct sockaddr_in6", cheader_filename = "netinet/in.h", destroy_function = "")] + public struct SockAddrIn6 { + public int sin6_family; + public uint16 sin6_port; + public uint32 sin6_flowinfo; + public In6Addr sin6_addr; + public uint32 sin6_scope_id; + } + [CCode (cheader_filename = "sys/stat.h")] public int mkfifo (string filename, mode_t mode); diff -Nru vala-0.16-0.15.1/vapi/sdl.vapi vala-0.16-0.15.2/vapi/sdl.vapi --- vala-0.16-0.15.1/vapi/sdl.vapi 2011-09-22 16:13:35.000000000 +0000 +++ vala-0.16-0.15.2/vapi/sdl.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -981,9 +981,11 @@ STOPPED, PLAYING, PAUSED }// AudioStatus + [CCode (instance_pos = 0.1)] + public delegate void AudioCallback(uint8[] stream); + [CCode (cname="SDL_AudioSpec")] - [Compact] - public class AudioSpec { + public struct AudioSpec { public int freq; public AudioFormat format; public uchar channels; @@ -991,8 +993,8 @@ public uint16 samples; public uint16 padding; public uint32 size; - - public void* userdata; + [CCode (delegate_target_cname = "userdata")] + public unowned AudioCallback callback; }// AudioSpec [CCode (cname="SDL_AudioCVT")] @@ -1021,11 +1023,14 @@ [Compact] public class Audio { + [CCode (cname="SDL_MIX_MAXVOLUME")] + public const int MIX_MAXVOLUME; + [CCode (cname="SDL_AudioDriverName")] public static unowned string driver_name(string namebuf, int maxlen); [CCode (cname="SDL_OpenAudio")] - public static int open(AudioSpec desired, AudioSpec obtained); + public static int open(AudioSpec desired, out AudioSpec obtained); [CCode (cname="SDL_GetAudioStatus")] public static AudioStatus status(); @@ -1034,13 +1039,13 @@ public static void pause(int pause_on); [CCode (cname="SDL_LoadWAV_RW")] - public static AudioSpec load(RWops src, int freesrc=0, AudioSpec spec, uchar** audio_buf, ref uint32 audio_len); + public static unowned AudioSpec? load(RWops src, int freesrc=0, ref AudioSpec spec, out uint8[] audio_buf); [CCode (cname="SDL_FreeWAV")] public static void free(uchar* audio_buf); [CCode (cname="SDL_MixAudio")] - public static void mix(uchar[] dst, uchar[] src, uint32 len, int volume); + public static void mix([CCode (array_length = false)] uchar[] dst, [CCode (array_length = false)] uchar[] src, uint32 len, int volume); [CCode (cname="SDL_LockAudio")] public static void do_lock(); diff -Nru vala-0.16-0.15.1/vapi/x11.vapi vala-0.16-0.15.2/vapi/x11.vapi --- vala-0.16-0.15.1/vapi/x11.vapi 2012-01-23 10:17:40.000000000 +0000 +++ vala-0.16-0.15.2/vapi/x11.vapi 2012-02-09 18:32:59.000000000 +0000 @@ -345,6 +345,7 @@ public struct Status { } + [GIR (name = "XID")] [SimpleType] [IntegerType (rank = 9)] [CCode (cname = "XID", type_id = "G_TYPE_INT", diff -Nru vala-0.16-0.15.1/vapigen/Makefile.in vala-0.16-0.15.2/vapigen/Makefile.in --- vala-0.16-0.15.1/vapigen/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/vapigen/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -61,8 +61,8 @@ vapicheck_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ../codegen/libvala@PACKAGE_SUFFIX@.la \ ../gobject-introspection/libgidl.la $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__objects_3 = valagidlparser.$(OBJEXT) valavapigen.$(OBJEXT) \ $(am__objects_1) @@ -81,21 +81,21 @@ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(vapicheck_SOURCES) $(vapigen_SOURCES) DIST_SOURCES = $(vapicheck_SOURCES) $(vapigen_SOURCES) @@ -458,10 +458,10 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -vapicheck$(EXEEXT): $(vapicheck_OBJECTS) $(vapicheck_DEPENDENCIES) +vapicheck$(EXEEXT): $(vapicheck_OBJECTS) $(vapicheck_DEPENDENCIES) $(EXTRA_vapicheck_DEPENDENCIES) @rm -f vapicheck$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vapicheck_OBJECTS) $(vapicheck_LDADD) $(LIBS) -vapigen$(EXEEXT): $(vapigen_OBJECTS) $(vapigen_DEPENDENCIES) +vapigen$(EXEEXT): $(vapigen_OBJECTS) $(vapigen_DEPENDENCIES) $(EXTRA_vapigen_DEPENDENCIES) @rm -f vapigen$(EXEEXT) $(AM_V_CCLD)$(LINK) $(vapigen_OBJECTS) $(vapigen_LDADD) $(LIBS) diff -Nru vala-0.16-0.15.1/vapigen/vala-gen-introspect/Makefile.in vala-0.16-0.15.2/vapigen/vala-gen-introspect/Makefile.in --- vala-0.16-0.15.1/vapigen/vala-gen-introspect/Makefile.in 2012-01-26 21:07:37.000000000 +0000 +++ vala-0.16-0.15.2/vapigen/vala-gen-introspect/Makefile.in 2012-02-25 16:17:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.2 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -76,11 +76,11 @@ } am__installdirs = "$(DESTDIR)$(bindir)" SCRIPTS = $(bin_SCRIPTS) -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = diff -Nru vala-0.16-0.15.1/.version vala-0.16-0.15.2/.version --- vala-0.16-0.15.1/.version 2012-01-26 21:07:44.000000000 +0000 +++ vala-0.16-0.15.2/.version 2012-02-25 16:21:38.000000000 +0000 @@ -1 +1 @@ -0.15.1 +0.15.2