Hello community, here is the log from the commit of package vala for openSUSE:Factory checked in at 2016-12-01 10:23:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vala (Old) and /work/SRC/openSUSE:Factory/.vala.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vala" Changes: -------- --- /work/SRC/openSUSE:Factory/vala/vala.changes 2016-10-28 10:43:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vala.new/vala.changes 2016-12-01 10:23:54.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 23 21:24:50 UTC 2016 - [email protected] + +- Update to version 0.34.3: + + Bug fixes and binding updates. + +------------------------------------------------------------------- Old: ---- vala-0.34.2.tar.xz New: ---- vala-0.34.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vala.spec ++++++ --- /var/tmp/diff_new_pack.gEwFDf/_old 2016-12-01 10:23:55.000000000 +0100 +++ /var/tmp/diff_new_pack.gEwFDf/_new 2016-12-01 10:23:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: vala -Version: 0.34.2 +Version: 0.34.3 Release: 0 %define vala_version 0.34 %define vala_libversion 0_34 ++++++ vala-0.34.2.tar.xz -> vala-0.34.3.tar.xz ++++++ ++++ 2725 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/.tarball-version new/vala-0.34.3/.tarball-version --- old/vala-0.34.2/.tarball-version 2016-10-23 20:22:44.000000000 +0200 +++ new/vala-0.34.3/.tarball-version 2016-11-22 13:19:50.000000000 +0100 @@ -1 +1 @@ -0.34.2 +0.34.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/.version new/vala-0.34.3/.version --- old/vala-0.34.2/.version 2016-10-23 20:20:24.000000000 +0200 +++ new/vala-0.34.3/.version 2016-11-22 13:18:04.000000000 +0100 @@ -1 +1 @@ -0.34.2 +0.34.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/ChangeLog new/vala-0.34.3/ChangeLog --- old/vala-0.34.2/ChangeLog 2016-10-23 20:22:44.000000000 +0200 +++ new/vala-0.34.3/ChangeLog 2016-11-22 13:19:50.000000000 +0100 @@ -1,3 +1,44 @@ +2016-11-22 Rico Tzschichholz <[email protected]> + + Release 0.34.3 + +2016-11-21 Rico Tzschichholz <[email protected]> + + gstreamer-1.0: Make ElementFactory.get_static_pad_templates fully "unowned" + https://bugzilla.gnome.org/show_bug.cgi?id=774791 + +2016-11-13 Rico Tzschichholz <[email protected]> + + Fix build with -Werror=enum-compare + + codegen: Don't write declaration of CreationMethod for compact-classes twice + https://bugzilla.gnome.org/show_bug.cgi?id=772661 + +2016-11-06 Rico Tzschichholz <[email protected]> + + Update bugreport and package urls + +2016-11-06 Timm Bäder <[email protected]> + + method: Print encountered type if return types mismatch + If a class overrides a method of a base type, print both the encountered + return type and the return type expected by the base class. + + https://bugzilla.gnome.org/show_bug.cgi?id=769501 + +2016-11-06 Andrea Del Signore <[email protected]> + + girwriter: Use the correct tag- and element-name for an annotation + The correct syntax is <attribute name=".." value=".."/> + + https://bugzilla.gnome.org/show_bug.cgi?id=769597 + +2016-10-30 Rico Tzschichholz <[email protected]> + + gdk-3.0: Update to 3.22.2+0ad5d51d + + gdk-3.0: Update to 3.22.1+a1115c05 + 2016-10-23 Jürg Billeter <[email protected]> Release 0.34.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/NEWS new/vala-0.34.3/NEWS --- old/vala-0.34.2/NEWS 2016-10-23 20:19:17.000000000 +0200 +++ new/vala-0.34.3/NEWS 2016-11-22 13:13:47.000000000 +0100 @@ -1,3 +1,8 @@ +Vala 0.34.3 +=========== + + * Bug fixes and binding updates. + Vala 0.34.2 =========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/codegen/valaccodemethodmodule.c new/vala-0.34.3/codegen/valaccodemethodmodule.c --- old/vala-0.34.2/codegen/valaccodemethodmodule.c 2016-10-23 20:20:44.000000000 +0200 +++ new/vala-0.34.3/codegen/valaccodemethodmodule.c 2016-11-22 13:18:47.000000000 +0100 @@ -1204,8 +1204,8 @@ gboolean _tmp68_ = FALSE; gboolean _tmp69_ = FALSE; ValaMethod* _tmp70_ = NULL; - gboolean _tmp88_ = FALSE; - ValaMethod* _tmp89_ = NULL; + ValaMethod* _tmp88_ = NULL; + gboolean _tmp89_ = FALSE; self = (ValaCCodeMethodModule*) base; g_return_if_fail (m != NULL); g_return_if_fail (decl_space != NULL); @@ -1402,143 +1402,137 @@ _tmp87_ = function; vala_ccode_file_add_function_declaration (_tmp86_, _tmp87_); } - _tmp89_ = m; - if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp89_, VALA_TYPE_CREATION_METHOD)) { - ValaClass* _tmp90_ = NULL; - _tmp90_ = cl; - _tmp88_ = _tmp90_ != NULL; - } else { - _tmp88_ = FALSE; - } - if (_tmp88_) { - ValaMethod* _tmp91_ = NULL; + _tmp88_ = m; + _tmp89_ = vala_ccode_method_module_is_gtypeinstance_creation_method (self, _tmp88_); + if (_tmp89_) { + ValaMethod* _tmp90_ = NULL; + gchar* _tmp91_ = NULL; gchar* _tmp92_ = NULL; - gchar* _tmp93_ = NULL; - ValaCCodeFunction* _tmp94_ = NULL; - ValaMethod* _tmp95_ = NULL; - gboolean _tmp96_ = FALSE; - GHashFunc _tmp112_ = NULL; + ValaCCodeFunction* _tmp93_ = NULL; + ValaMethod* _tmp94_ = NULL; + gboolean _tmp95_ = FALSE; + GHashFunc _tmp111_ = NULL; + GEqualFunc _tmp112_ = NULL; GEqualFunc _tmp113_ = NULL; - GEqualFunc _tmp114_ = NULL; - ValaHashMap* _tmp115_ = NULL; + ValaHashMap* _tmp114_ = NULL; gboolean etv_tmp = FALSE; - gboolean _tmp116_ = FALSE; - ValaMethod* _tmp117_ = NULL; - ValaCCodeFile* _tmp118_ = NULL; - ValaHashMap* _tmp119_ = NULL; - ValaCCodeFunction* _tmp120_ = NULL; - gboolean _tmp121_ = FALSE; - ValaCCodeFile* _tmp122_ = NULL; - ValaCCodeFunction* _tmp123_ = NULL; - ValaMethod* _tmp124_ = NULL; - gboolean _tmp125_ = FALSE; - _tmp91_ = m; - _tmp92_ = vala_ccode_base_module_get_ccode_real_name ((ValaSymbol*) _tmp91_); - _tmp93_ = _tmp92_; - _tmp94_ = vala_ccode_function_new (_tmp93_, "void"); + gboolean _tmp115_ = FALSE; + ValaMethod* _tmp116_ = NULL; + ValaCCodeFile* _tmp117_ = NULL; + ValaHashMap* _tmp118_ = NULL; + ValaCCodeFunction* _tmp119_ = NULL; + gboolean _tmp120_ = FALSE; + ValaCCodeFile* _tmp121_ = NULL; + ValaCCodeFunction* _tmp122_ = NULL; + ValaMethod* _tmp123_ = NULL; + gboolean _tmp124_ = FALSE; + _tmp90_ = m; + _tmp91_ = vala_ccode_base_module_get_ccode_real_name ((ValaSymbol*) _tmp90_); + _tmp92_ = _tmp91_; + _tmp93_ = vala_ccode_function_new (_tmp92_, "void"); _vala_ccode_node_unref0 (function); - function = _tmp94_; - _g_free0 (_tmp93_); - _tmp95_ = m; - _tmp96_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp95_); - if (_tmp96_) { + function = _tmp93_; + _g_free0 (_tmp92_); + _tmp94_ = m; + _tmp95_ = vala_symbol_is_private_symbol ((ValaSymbol*) _tmp94_); + if (_tmp95_) { + ValaCCodeFunction* _tmp96_ = NULL; ValaCCodeFunction* _tmp97_ = NULL; - ValaCCodeFunction* _tmp98_ = NULL; + ValaCCodeModifiers _tmp98_ = 0; ValaCCodeModifiers _tmp99_ = 0; - ValaCCodeModifiers _tmp100_ = 0; + _tmp96_ = function; _tmp97_ = function; - _tmp98_ = function; - _tmp99_ = vala_ccode_function_get_modifiers (_tmp98_); - _tmp100_ = _tmp99_; - vala_ccode_function_set_modifiers (_tmp98_, _tmp100_ | VALA_CCODE_MODIFIERS_STATIC); + _tmp98_ = vala_ccode_function_get_modifiers (_tmp97_); + _tmp99_ = _tmp98_; + vala_ccode_function_set_modifiers (_tmp97_, _tmp99_ | VALA_CCODE_MODIFIERS_STATIC); } else { - gboolean _tmp101_ = FALSE; + gboolean _tmp100_ = FALSE; + ValaCodeContext* _tmp101_ = NULL; ValaCodeContext* _tmp102_ = NULL; - ValaCodeContext* _tmp103_ = NULL; + gboolean _tmp103_ = FALSE; gboolean _tmp104_ = FALSE; - gboolean _tmp105_ = FALSE; - _tmp102_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); - _tmp103_ = _tmp102_; - _tmp104_ = vala_code_context_get_hide_internal (_tmp103_); - _tmp105_ = _tmp104_; - if (_tmp105_) { - ValaMethod* _tmp106_ = NULL; - gboolean _tmp107_ = FALSE; - _tmp106_ = m; - _tmp107_ = vala_symbol_is_internal_symbol ((ValaSymbol*) _tmp106_); - _tmp101_ = _tmp107_; + _tmp101_ = vala_ccode_base_module_get_context ((ValaCCodeBaseModule*) self); + _tmp102_ = _tmp101_; + _tmp103_ = vala_code_context_get_hide_internal (_tmp102_); + _tmp104_ = _tmp103_; + if (_tmp104_) { + ValaMethod* _tmp105_ = NULL; + gboolean _tmp106_ = FALSE; + _tmp105_ = m; + _tmp106_ = vala_symbol_is_internal_symbol ((ValaSymbol*) _tmp105_); + _tmp100_ = _tmp106_; } else { - _tmp101_ = FALSE; + _tmp100_ = FALSE; } - if (_tmp101_) { + if (_tmp100_) { + ValaCCodeFunction* _tmp107_ = NULL; ValaCCodeFunction* _tmp108_ = NULL; - ValaCCodeFunction* _tmp109_ = NULL; + ValaCCodeModifiers _tmp109_ = 0; ValaCCodeModifiers _tmp110_ = 0; - ValaCCodeModifiers _tmp111_ = 0; + _tmp107_ = function; _tmp108_ = function; - _tmp109_ = function; - _tmp110_ = vala_ccode_function_get_modifiers (_tmp109_); - _tmp111_ = _tmp110_; - vala_ccode_function_set_modifiers (_tmp109_, _tmp111_ | VALA_CCODE_MODIFIERS_INTERNAL); + _tmp109_ = vala_ccode_function_get_modifiers (_tmp108_); + _tmp110_ = _tmp109_; + vala_ccode_function_set_modifiers (_tmp108_, _tmp110_ | VALA_CCODE_MODIFIERS_INTERNAL); } } - _tmp112_ = g_direct_hash; + _tmp111_ = g_direct_hash; + _tmp112_ = g_direct_equal; _tmp113_ = g_direct_equal; - _tmp114_ = g_direct_equal; - _tmp115_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_PARAMETER, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp112_, _tmp113_, _tmp114_); + _tmp114_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_PARAMETER, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp111_, _tmp112_, _tmp113_); _vala_map_unref0 (cparam_map); - cparam_map = _tmp115_; - _tmp116_ = self->priv->ellipses_to_valist; - etv_tmp = _tmp116_; + cparam_map = _tmp114_; + _tmp115_ = self->priv->ellipses_to_valist; + etv_tmp = _tmp115_; self->priv->ellipses_to_valist = FALSE; - _tmp117_ = m; - _tmp118_ = decl_space; - _tmp119_ = cparam_map; - _tmp120_ = function; - vala_ccode_base_module_generate_cparameters ((ValaCCodeBaseModule*) self, _tmp117_, _tmp118_, (ValaMap*) _tmp119_, _tmp120_, NULL, NULL, NULL, 3); - _tmp121_ = etv_tmp; - self->priv->ellipses_to_valist = _tmp121_; - _tmp122_ = decl_space; - _tmp123_ = function; - vala_ccode_file_add_function_declaration (_tmp122_, _tmp123_); - _tmp124_ = m; - _tmp125_ = vala_method_is_variadic (_tmp124_); - if (_tmp125_) { - ValaMethod* _tmp126_ = NULL; + _tmp116_ = m; + _tmp117_ = decl_space; + _tmp118_ = cparam_map; + _tmp119_ = function; + vala_ccode_base_module_generate_cparameters ((ValaCCodeBaseModule*) self, _tmp116_, _tmp117_, (ValaMap*) _tmp118_, _tmp119_, NULL, NULL, NULL, 3); + _tmp120_ = etv_tmp; + self->priv->ellipses_to_valist = _tmp120_; + _tmp121_ = decl_space; + _tmp122_ = function; + vala_ccode_file_add_function_declaration (_tmp121_, _tmp122_); + _tmp123_ = m; + _tmp124_ = vala_method_is_variadic (_tmp123_); + if (_tmp124_) { + ValaMethod* _tmp125_ = NULL; + gchar* _tmp126_ = NULL; gchar* _tmp127_ = NULL; - gchar* _tmp128_ = NULL; - ValaCCodeFunction* _tmp129_ = NULL; - GHashFunc _tmp130_ = NULL; + ValaCCodeFunction* _tmp128_ = NULL; + GHashFunc _tmp129_ = NULL; + GEqualFunc _tmp130_ = NULL; GEqualFunc _tmp131_ = NULL; - GEqualFunc _tmp132_ = NULL; - ValaHashMap* _tmp133_ = NULL; - ValaMethod* _tmp134_ = NULL; - ValaCCodeFile* _tmp135_ = NULL; - ValaHashMap* _tmp136_ = NULL; - ValaCCodeFunction* _tmp137_ = NULL; - ValaCCodeFile* _tmp138_ = NULL; - ValaCCodeFunction* _tmp139_ = NULL; - _tmp126_ = m; - _tmp127_ = vala_ccode_base_module_get_ccode_constructv_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, VALA_TYPE_CREATION_METHOD, ValaCreationMethod)); - _tmp128_ = _tmp127_; - _tmp129_ = vala_ccode_function_new (_tmp128_, "void"); + ValaHashMap* _tmp132_ = NULL; + ValaMethod* _tmp133_ = NULL; + ValaCCodeFile* _tmp134_ = NULL; + ValaHashMap* _tmp135_ = NULL; + ValaCCodeFunction* _tmp136_ = NULL; + ValaCCodeFile* _tmp137_ = NULL; + ValaCCodeFunction* _tmp138_ = NULL; + _tmp125_ = m; + _tmp126_ = vala_ccode_base_module_get_ccode_constructv_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, VALA_TYPE_CREATION_METHOD, ValaCreationMethod)); + _tmp127_ = _tmp126_; + _tmp128_ = vala_ccode_function_new (_tmp127_, "void"); _vala_ccode_node_unref0 (function); - function = _tmp129_; - _g_free0 (_tmp128_); - _tmp130_ = g_direct_hash; + function = _tmp128_; + _g_free0 (_tmp127_); + _tmp129_ = g_direct_hash; + _tmp130_ = g_direct_equal; _tmp131_ = g_direct_equal; - _tmp132_ = g_direct_equal; - _tmp133_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_PARAMETER, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp130_, _tmp131_, _tmp132_); + _tmp132_ = vala_hash_map_new (G_TYPE_INT, NULL, NULL, VALA_TYPE_CCODE_PARAMETER, (GBoxedCopyFunc) vala_ccode_node_ref, vala_ccode_node_unref, _tmp129_, _tmp130_, _tmp131_); _vala_map_unref0 (cparam_map); - cparam_map = _tmp133_; - _tmp134_ = m; - _tmp135_ = decl_space; - _tmp136_ = cparam_map; - _tmp137_ = function; - vala_ccode_base_module_generate_cparameters ((ValaCCodeBaseModule*) self, _tmp134_, _tmp135_, (ValaMap*) _tmp136_, _tmp137_, NULL, NULL, NULL, 3); - _tmp138_ = decl_space; - _tmp139_ = function; - vala_ccode_file_add_function_declaration (_tmp138_, _tmp139_); + cparam_map = _tmp132_; + _tmp133_ = m; + _tmp134_ = decl_space; + _tmp135_ = cparam_map; + _tmp136_ = function; + vala_ccode_base_module_generate_cparameters ((ValaCCodeBaseModule*) self, _tmp133_, _tmp134_, (ValaMap*) _tmp135_, _tmp136_, NULL, NULL, NULL, 3); + _tmp137_ = decl_space; + _tmp138_ = function; + vala_ccode_file_add_function_declaration (_tmp137_, _tmp138_); } } _vala_code_node_unref0 (cl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/codegen/valaccodemethodmodule.vala new/vala-0.34.3/codegen/valaccodemethodmodule.vala --- old/vala-0.34.2/codegen/valaccodemethodmodule.vala 2016-10-23 20:19:03.000000000 +0200 +++ new/vala-0.34.3/codegen/valaccodemethodmodule.vala 2016-11-22 13:13:06.000000000 +0100 @@ -188,7 +188,7 @@ decl_space.add_function_declaration (function); } - if (m is CreationMethod && cl != null) { + if (is_gtypeinstance_creation_method (m)) { // _construct function function = new CCodeFunction (get_ccode_real_name (m)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/codegen/valagirwriter.c new/vala-0.34.3/codegen/valagirwriter.c --- old/vala-0.34.2/codegen/valagirwriter.c 2016-10-23 20:20:45.000000000 +0200 +++ new/vala-0.34.3/codegen/valagirwriter.c 2016-11-22 13:18:47.000000000 +0100 @@ -6417,7 +6417,7 @@ _tmp29_ = vala_gir_writer_camel_case_to_canonical (self, _tmp28_); _tmp30_ = _tmp29_; _tmp31_ = value; - g_string_append_printf (_tmp26_, "<annotation key=\"%s.%s\" value=\"%s\"/>\n", _tmp27_, _tmp30_, _tmp31_); + g_string_append_printf (_tmp26_, "<attribute name=\"%s.%s\" value=\"%s\"/>\n", _tmp27_, _tmp30_, _tmp31_); _g_free0 (_tmp30_); _g_free0 (value); _g_free0 (arg_name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/codegen/valagirwriter.vala new/vala-0.34.3/codegen/valagirwriter.vala --- old/vala-0.34.2/codegen/valagirwriter.vala 2016-10-23 20:19:03.000000000 +0200 +++ new/vala-0.34.3/codegen/valagirwriter.vala 2016-11-22 13:13:06.000000000 +0100 @@ -1369,7 +1369,7 @@ } write_indent (); - buffer.append_printf ("<annotation key=\"%s.%s\" value=\"%s\"/>\n", + buffer.append_printf ("<attribute name=\"%s.%s\" value=\"%s\"/>\n", name, camel_case_to_canonical (arg_name), value); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/configure.ac new/vala-0.34.3/configure.ac --- old/vala-0.34.2/configure.ac 2016-10-23 20:19:03.000000000 +0200 +++ new/vala-0.34.3/configure.ac 2016-11-22 13:13:06.000000000 +0100 @@ -1,5 +1,8 @@ AC_PREREQ([2.65]) -AC_INIT([vala], m4_esyscmd([build-aux/git-version-gen .tarball-version]), [[email protected]], [vala]) +AC_INIT([vala], m4_esyscmd([build-aux/git-version-gen .tarball-version]), + [https://bugzilla.gnome.org/browse.cgi?product=vala], + [vala], + [https://wiki.gnome.org/Projects/Vala]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS(config.h) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/gee/hashmap.c new/vala-0.34.3/gee/hashmap.c --- old/vala-0.34.2/gee/hashmap.c 2016-10-23 20:20:24.000000000 +0200 +++ new/vala-0.34.3/gee/hashmap.c 2016-11-22 13:18:04.000000000 +0100 @@ -453,7 +453,6 @@ static gpointer vala_hash_map_real_get (ValaMap* base, gconstpointer key); static void vala_hash_map_real_set (ValaMap* base, gconstpointer key, gconstpointer value); static ValaHashMapNode* vala_hash_map_node_new (gpointer k, gpointer v, guint hash); -static ValaHashMapNode* vala_hash_map_node_new (gpointer k, gpointer v, guint hash); static void vala_hash_map_resize (ValaHashMap* self); static gboolean vala_hash_map_real_remove (ValaMap* base, gconstpointer key); static void vala_hash_map_real_clear (ValaMap* base); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/gee/hashset.c new/vala-0.34.3/gee/hashset.c --- old/vala-0.34.2/gee/hashset.c 2016-10-23 20:20:24.000000000 +0200 +++ new/vala-0.34.3/gee/hashset.c 2016-11-22 13:18:04.000000000 +0100 @@ -242,7 +242,6 @@ static GType vala_hash_set_iterator_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; static gboolean vala_hash_set_real_add (ValaCollection* base, gconstpointer key); static ValaHashSetNode* vala_hash_set_node_new (gpointer k, guint hash); -static ValaHashSetNode* vala_hash_set_node_new (gpointer k, guint hash); static void vala_hash_set_resize (ValaHashSet* self); static gboolean vala_hash_set_real_remove (ValaCollection* base, gconstpointer key); static void vala_hash_set_real_clear (ValaCollection* base); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/gobject-introspection/gidl.vapi new/vala-0.34.3/gobject-introspection/gidl.vapi --- old/vala-0.34.2/gobject-introspection/gidl.vapi 2011-06-16 16:39:52.000000000 +0200 +++ new/vala-0.34.3/gobject-introspection/gidl.vapi 2016-11-17 09:05:07.000000000 +0100 @@ -249,7 +249,7 @@ public string[] errors; } - [CCode (cname = "GITypeTag", cprefix = "TYPE_TAG_", cheader_filename = "gmetadata.h")] + [CCode (cname = "TypeTag", cprefix = "TYPE_TAG_", cheader_filename = "gmetadata.h")] public enum TypeTag { VOID, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/gobject-introspection/scannerlexer.c new/vala-0.34.3/gobject-introspection/scannerlexer.c --- old/vala-0.34.2/gobject-introspection/scannerlexer.c 2016-10-23 20:20:55.000000000 +0200 +++ new/vala-0.34.3/gobject-introspection/scannerlexer.c 2016-11-22 13:19:05.000000000 +0100 @@ -221,7 +221,7 @@ int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -2590,9 +2590,9 @@ ); if ( ! (yy_buffer_stack) ) YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + (yy_buffer_stack_max) = num_to_alloc; (yy_buffer_stack_top) = 0; return; @@ -2621,7 +2621,7 @@ * @param base the character buffer * @param size the size in bytes of the character buffer * - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) { @@ -2737,7 +2737,7 @@ */ int yyget_lineno (void) { - + return yylineno; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/m4/libtool.m4 new/vala-0.34.3/m4/libtool.m4 --- old/vala-0.34.2/m4/libtool.m4 2016-10-23 20:19:44.000000000 +0200 +++ new/vala-0.34.3/m4/libtool.m4 2016-11-22 13:17:45.000000000 +0100 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2887,6 +2886,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3546,7 +3557,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4424,7 +4435,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4936,6 +4947,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4998,6 +5012,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5252,7 +5269,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5773,6 +5790,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5794,7 +5812,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/vala/valamethod.c new/vala-0.34.3/vala/valamethod.c --- old/vala-0.34.2/vala/valamethod.c 2016-10-23 20:20:29.000000000 +0200 +++ new/vala-0.34.3/vala/valamethod.c 2016-11-22 13:18:15.000000000 +0100 @@ -1469,6 +1469,7 @@ void vala_data_type_add_type_argument (ValaDataType* self, ValaDataType* arg); ValaDataType* vala_data_type_get_actual_type (ValaDataType* self, ValaDataType* derived_instance_type, ValaList* method_type_arguments, ValaCodeNode* node_reference); gboolean vala_data_type_equals (ValaDataType* self, ValaDataType* type2); +gchar* vala_data_type_to_qualified_string (ValaDataType* self, ValaScope* scope); GType vala_parameter_direction_get_type (void) G_GNUC_CONST; ValaParameterDirection vala_parameter_get_direction (ValaParameter* self); ValaDataType* vala_variable_get_variable_type (ValaVariable* self); @@ -2225,14 +2226,14 @@ ValaDataType* _tmp79_ = NULL; gboolean _tmp80_ = FALSE; ValaIterator* method_params_it = NULL; - ValaList* _tmp82_ = NULL; - ValaIterator* _tmp83_ = NULL; + ValaList* _tmp89_ = NULL; + ValaIterator* _tmp90_ = NULL; gint param_index = 0; - ValaIterator* _tmp133_ = NULL; - gboolean _tmp134_ = FALSE; - ValaMethod* _tmp165_ = NULL; - gboolean _tmp166_ = FALSE; - gboolean _tmp167_ = FALSE; + ValaIterator* _tmp140_ = NULL; + gboolean _tmp141_ = FALSE; + ValaMethod* _tmp172_ = NULL; + gboolean _tmp173_ = FALSE; + gboolean _tmp174_ = FALSE; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (base_method != NULL, FALSE); _tmp0_ = self->priv->_binding; @@ -2466,10 +2467,26 @@ _tmp79_ = actual_base_type; _tmp80_ = vala_data_type_equals (_tmp78_, _tmp79_); if (!_tmp80_) { - gchar* _tmp81_ = NULL; - _tmp81_ = g_strdup ("incompatible return type"); + ValaDataType* _tmp81_ = NULL; + gchar* _tmp82_ = NULL; + gchar* _tmp83_ = NULL; + ValaDataType* _tmp84_ = NULL; + ValaDataType* _tmp85_ = NULL; + gchar* _tmp86_ = NULL; + gchar* _tmp87_ = NULL; + gchar* _tmp88_ = NULL; + _tmp81_ = actual_base_type; + _tmp82_ = vala_data_type_to_qualified_string (_tmp81_, NULL); + _tmp83_ = _tmp82_; + _tmp84_ = vala_method_get_return_type (self); + _tmp85_ = _tmp84_; + _tmp86_ = vala_data_type_to_qualified_string (_tmp85_, NULL); + _tmp87_ = _tmp86_; + _tmp88_ = g_strdup_printf ("Base method expected return type `%s', but `%s' was provided", _tmp83_, _tmp87_); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp81_; + _vala_invalid_match = _tmp88_; + _g_free0 (_tmp87_); + _g_free0 (_tmp83_); result = FALSE; _vala_code_node_unref0 (actual_base_type); _vala_iterable_unref0 (method_type_args); @@ -2481,70 +2498,70 @@ } return result; } - _tmp82_ = self->priv->parameters; - _tmp83_ = vala_iterable_iterator ((ValaIterable*) _tmp82_); - method_params_it = _tmp83_; + _tmp89_ = self->priv->parameters; + _tmp90_ = vala_iterable_iterator ((ValaIterable*) _tmp89_); + method_params_it = _tmp90_; param_index = 1; { ValaList* _base_param_list = NULL; - ValaMethod* _tmp84_ = NULL; - ValaList* _tmp85_ = NULL; - ValaList* _tmp86_ = NULL; + ValaMethod* _tmp91_ = NULL; + ValaList* _tmp92_ = NULL; + ValaList* _tmp93_ = NULL; gint _base_param_size = 0; - ValaList* _tmp87_ = NULL; - gint _tmp88_ = 0; - gint _tmp89_ = 0; + ValaList* _tmp94_ = NULL; + gint _tmp95_ = 0; + gint _tmp96_ = 0; gint _base_param_index = 0; - _tmp84_ = base_method; - _tmp85_ = _tmp84_->priv->parameters; - _tmp86_ = _vala_iterable_ref0 (_tmp85_); - _base_param_list = _tmp86_; - _tmp87_ = _base_param_list; - _tmp88_ = vala_collection_get_size ((ValaCollection*) _tmp87_); - _tmp89_ = _tmp88_; - _base_param_size = _tmp89_; + _tmp91_ = base_method; + _tmp92_ = _tmp91_->priv->parameters; + _tmp93_ = _vala_iterable_ref0 (_tmp92_); + _base_param_list = _tmp93_; + _tmp94_ = _base_param_list; + _tmp95_ = vala_collection_get_size ((ValaCollection*) _tmp94_); + _tmp96_ = _tmp95_; + _base_param_size = _tmp96_; _base_param_index = -1; while (TRUE) { - gint _tmp90_ = 0; - gint _tmp91_ = 0; - gint _tmp92_ = 0; + gint _tmp97_ = 0; + gint _tmp98_ = 0; + gint _tmp99_ = 0; ValaParameter* base_param = NULL; - ValaList* _tmp93_ = NULL; - gint _tmp94_ = 0; - gpointer _tmp95_ = NULL; - ValaIterator* _tmp96_ = NULL; - gboolean _tmp97_ = FALSE; + ValaList* _tmp100_ = NULL; + gint _tmp101_ = 0; + gpointer _tmp102_ = NULL; + ValaIterator* _tmp103_ = NULL; + gboolean _tmp104_ = FALSE; ValaParameter* param = NULL; - ValaIterator* _tmp99_ = NULL; - gpointer _tmp100_ = NULL; - ValaParameter* _tmp101_ = NULL; - gboolean _tmp102_ = FALSE; - gboolean _tmp103_ = FALSE; - ValaParameter* _tmp104_ = NULL; - gboolean _tmp105_ = FALSE; - gboolean _tmp106_ = FALSE; + ValaIterator* _tmp106_ = NULL; + gpointer _tmp107_ = NULL; ValaParameter* _tmp108_ = NULL; gboolean _tmp109_ = FALSE; gboolean _tmp110_ = FALSE; - gint _tmp132_ = 0; - _tmp90_ = _base_param_index; - _base_param_index = _tmp90_ + 1; - _tmp91_ = _base_param_index; - _tmp92_ = _base_param_size; - if (!(_tmp91_ < _tmp92_)) { + ValaParameter* _tmp111_ = NULL; + gboolean _tmp112_ = FALSE; + gboolean _tmp113_ = FALSE; + ValaParameter* _tmp115_ = NULL; + gboolean _tmp116_ = FALSE; + gboolean _tmp117_ = FALSE; + gint _tmp139_ = 0; + _tmp97_ = _base_param_index; + _base_param_index = _tmp97_ + 1; + _tmp98_ = _base_param_index; + _tmp99_ = _base_param_size; + if (!(_tmp98_ < _tmp99_)) { break; } - _tmp93_ = _base_param_list; - _tmp94_ = _base_param_index; - _tmp95_ = vala_list_get (_tmp93_, _tmp94_); - base_param = (ValaParameter*) _tmp95_; - _tmp96_ = method_params_it; - _tmp97_ = vala_iterator_next (_tmp96_); - if (!_tmp97_) { - gchar* _tmp98_ = NULL; - _tmp98_ = g_strdup ("too few parameters"); + _tmp100_ = _base_param_list; + _tmp101_ = _base_param_index; + _tmp102_ = vala_list_get (_tmp100_, _tmp101_); + base_param = (ValaParameter*) _tmp102_; + _tmp103_ = method_params_it; + _tmp104_ = vala_iterator_next (_tmp103_); + if (!_tmp104_) { + gchar* _tmp105_ = NULL; + _tmp105_ = g_strdup ("too few parameters"); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp98_; + _vala_invalid_match = _tmp105_; result = FALSE; _vala_code_node_unref0 (base_param); _vala_iterable_unref0 (_base_param_list); @@ -2559,20 +2576,20 @@ } return result; } - _tmp99_ = method_params_it; - _tmp100_ = vala_iterator_get (_tmp99_); - param = (ValaParameter*) _tmp100_; - _tmp101_ = base_param; - _tmp102_ = vala_parameter_get_ellipsis (_tmp101_); - _tmp103_ = _tmp102_; - _tmp104_ = param; - _tmp105_ = vala_parameter_get_ellipsis (_tmp104_); - _tmp106_ = _tmp105_; - if (_tmp103_ != _tmp106_) { - gchar* _tmp107_ = NULL; - _tmp107_ = g_strdup ("ellipsis parameter mismatch"); + _tmp106_ = method_params_it; + _tmp107_ = vala_iterator_get (_tmp106_); + param = (ValaParameter*) _tmp107_; + _tmp108_ = base_param; + _tmp109_ = vala_parameter_get_ellipsis (_tmp108_); + _tmp110_ = _tmp109_; + _tmp111_ = param; + _tmp112_ = vala_parameter_get_ellipsis (_tmp111_); + _tmp113_ = _tmp112_; + if (_tmp110_ != _tmp113_) { + gchar* _tmp114_ = NULL; + _tmp114_ = g_strdup ("ellipsis parameter mismatch"); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp107_; + _vala_invalid_match = _tmp114_; result = FALSE; _vala_code_node_unref0 (param); _vala_code_node_unref0 (base_param); @@ -2588,40 +2605,40 @@ } return result; } - _tmp108_ = base_param; - _tmp109_ = vala_parameter_get_ellipsis (_tmp108_); - _tmp110_ = _tmp109_; - if (!_tmp110_) { - ValaParameter* _tmp111_ = NULL; - ValaParameterDirection _tmp112_ = 0; - ValaParameterDirection _tmp113_ = 0; - ValaParameter* _tmp114_ = NULL; - ValaParameterDirection _tmp115_ = 0; - ValaParameterDirection _tmp116_ = 0; - ValaParameter* _tmp119_ = NULL; - ValaDataType* _tmp120_ = NULL; - ValaDataType* _tmp121_ = NULL; - ValaObjectType* _tmp122_ = NULL; - ValaList* _tmp123_ = NULL; - ValaDataType* _tmp124_ = NULL; - ValaDataType* _tmp125_ = NULL; + _tmp115_ = base_param; + _tmp116_ = vala_parameter_get_ellipsis (_tmp115_); + _tmp117_ = _tmp116_; + if (!_tmp117_) { + ValaParameter* _tmp118_ = NULL; + ValaParameterDirection _tmp119_ = 0; + ValaParameterDirection _tmp120_ = 0; + ValaParameter* _tmp121_ = NULL; + ValaParameterDirection _tmp122_ = 0; + ValaParameterDirection _tmp123_ = 0; ValaParameter* _tmp126_ = NULL; ValaDataType* _tmp127_ = NULL; ValaDataType* _tmp128_ = NULL; - gboolean _tmp129_ = FALSE; - _tmp111_ = base_param; - _tmp112_ = vala_parameter_get_direction (_tmp111_); - _tmp113_ = _tmp112_; - _tmp114_ = param; - _tmp115_ = vala_parameter_get_direction (_tmp114_); - _tmp116_ = _tmp115_; - if (_tmp113_ != _tmp116_) { - gint _tmp117_ = 0; - gchar* _tmp118_ = NULL; - _tmp117_ = param_index; - _tmp118_ = g_strdup_printf ("incompatible direction of parameter %d", _tmp117_); + ValaObjectType* _tmp129_ = NULL; + ValaList* _tmp130_ = NULL; + ValaDataType* _tmp131_ = NULL; + ValaDataType* _tmp132_ = NULL; + ValaParameter* _tmp133_ = NULL; + ValaDataType* _tmp134_ = NULL; + ValaDataType* _tmp135_ = NULL; + gboolean _tmp136_ = FALSE; + _tmp118_ = base_param; + _tmp119_ = vala_parameter_get_direction (_tmp118_); + _tmp120_ = _tmp119_; + _tmp121_ = param; + _tmp122_ = vala_parameter_get_direction (_tmp121_); + _tmp123_ = _tmp122_; + if (_tmp120_ != _tmp123_) { + gint _tmp124_ = 0; + gchar* _tmp125_ = NULL; + _tmp124_ = param_index; + _tmp125_ = g_strdup_printf ("incompatible direction of parameter %d", _tmp124_); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp118_; + _vala_invalid_match = _tmp125_; result = FALSE; _vala_code_node_unref0 (param); _vala_code_node_unref0 (base_param); @@ -2637,26 +2654,26 @@ } return result; } - _tmp119_ = base_param; - _tmp120_ = vala_variable_get_variable_type ((ValaVariable*) _tmp119_); - _tmp121_ = _tmp120_; - _tmp122_ = object_type; - _tmp123_ = method_type_args; - _tmp124_ = vala_data_type_get_actual_type (_tmp121_, (ValaDataType*) _tmp122_, _tmp123_, (ValaCodeNode*) self); - _vala_code_node_unref0 (actual_base_type); - actual_base_type = _tmp124_; - _tmp125_ = actual_base_type; - _tmp126_ = param; + _tmp126_ = base_param; _tmp127_ = vala_variable_get_variable_type ((ValaVariable*) _tmp126_); _tmp128_ = _tmp127_; - _tmp129_ = vala_data_type_equals (_tmp125_, _tmp128_); - if (!_tmp129_) { - gint _tmp130_ = 0; - gchar* _tmp131_ = NULL; - _tmp130_ = param_index; - _tmp131_ = g_strdup_printf ("incompatible type of parameter %d", _tmp130_); + _tmp129_ = object_type; + _tmp130_ = method_type_args; + _tmp131_ = vala_data_type_get_actual_type (_tmp128_, (ValaDataType*) _tmp129_, _tmp130_, (ValaCodeNode*) self); + _vala_code_node_unref0 (actual_base_type); + actual_base_type = _tmp131_; + _tmp132_ = actual_base_type; + _tmp133_ = param; + _tmp134_ = vala_variable_get_variable_type ((ValaVariable*) _tmp133_); + _tmp135_ = _tmp134_; + _tmp136_ = vala_data_type_equals (_tmp132_, _tmp135_); + if (!_tmp136_) { + gint _tmp137_ = 0; + gchar* _tmp138_ = NULL; + _tmp137_ = param_index; + _tmp138_ = g_strdup_printf ("incompatible type of parameter %d", _tmp137_); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp131_; + _vala_invalid_match = _tmp138_; result = FALSE; _vala_code_node_unref0 (param); _vala_code_node_unref0 (base_param); @@ -2673,20 +2690,20 @@ return result; } } - _tmp132_ = param_index; - param_index = _tmp132_ + 1; + _tmp139_ = param_index; + param_index = _tmp139_ + 1; _vala_code_node_unref0 (param); _vala_code_node_unref0 (base_param); } _vala_iterable_unref0 (_base_param_list); } - _tmp133_ = method_params_it; - _tmp134_ = vala_iterator_next (_tmp133_); - if (_tmp134_) { - gchar* _tmp135_ = NULL; - _tmp135_ = g_strdup ("too many parameters"); + _tmp140_ = method_params_it; + _tmp141_ = vala_iterator_next (_tmp140_); + if (_tmp141_) { + gchar* _tmp142_ = NULL; + _tmp142_ = g_strdup ("too many parameters"); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp135_; + _vala_invalid_match = _tmp142_; result = FALSE; _vala_iterator_unref0 (method_params_it); _vala_code_node_unref0 (actual_base_type); @@ -2701,84 +2718,84 @@ } { ValaList* _method_error_type_list = NULL; - ValaList* _tmp136_ = NULL; + ValaList* _tmp143_ = NULL; gint _method_error_type_size = 0; - ValaList* _tmp137_ = NULL; - gint _tmp138_ = 0; - gint _tmp139_ = 0; + ValaList* _tmp144_ = NULL; + gint _tmp145_ = 0; + gint _tmp146_ = 0; gint _method_error_type_index = 0; - _tmp136_ = vala_code_node_get_error_types ((ValaCodeNode*) self); - _method_error_type_list = _tmp136_; - _tmp137_ = _method_error_type_list; - _tmp138_ = vala_collection_get_size ((ValaCollection*) _tmp137_); - _tmp139_ = _tmp138_; - _method_error_type_size = _tmp139_; + _tmp143_ = vala_code_node_get_error_types ((ValaCodeNode*) self); + _method_error_type_list = _tmp143_; + _tmp144_ = _method_error_type_list; + _tmp145_ = vala_collection_get_size ((ValaCollection*) _tmp144_); + _tmp146_ = _tmp145_; + _method_error_type_size = _tmp146_; _method_error_type_index = -1; while (TRUE) { - gint _tmp140_ = 0; - gint _tmp141_ = 0; - gint _tmp142_ = 0; + gint _tmp147_ = 0; + gint _tmp148_ = 0; + gint _tmp149_ = 0; ValaDataType* method_error_type = NULL; - ValaList* _tmp143_ = NULL; - gint _tmp144_ = 0; - gpointer _tmp145_ = NULL; + ValaList* _tmp150_ = NULL; + gint _tmp151_ = 0; + gpointer _tmp152_ = NULL; gboolean match = FALSE; - gboolean _tmp160_ = FALSE; - _tmp140_ = _method_error_type_index; - _method_error_type_index = _tmp140_ + 1; - _tmp141_ = _method_error_type_index; - _tmp142_ = _method_error_type_size; - if (!(_tmp141_ < _tmp142_)) { + gboolean _tmp167_ = FALSE; + _tmp147_ = _method_error_type_index; + _method_error_type_index = _tmp147_ + 1; + _tmp148_ = _method_error_type_index; + _tmp149_ = _method_error_type_size; + if (!(_tmp148_ < _tmp149_)) { break; } - _tmp143_ = _method_error_type_list; - _tmp144_ = _method_error_type_index; - _tmp145_ = vala_list_get (_tmp143_, _tmp144_); - method_error_type = (ValaDataType*) _tmp145_; + _tmp150_ = _method_error_type_list; + _tmp151_ = _method_error_type_index; + _tmp152_ = vala_list_get (_tmp150_, _tmp151_); + method_error_type = (ValaDataType*) _tmp152_; match = FALSE; { ValaList* _base_method_error_type_list = NULL; - ValaMethod* _tmp146_ = NULL; - ValaList* _tmp147_ = NULL; + ValaMethod* _tmp153_ = NULL; + ValaList* _tmp154_ = NULL; gint _base_method_error_type_size = 0; - ValaList* _tmp148_ = NULL; - gint _tmp149_ = 0; - gint _tmp150_ = 0; + ValaList* _tmp155_ = NULL; + gint _tmp156_ = 0; + gint _tmp157_ = 0; gint _base_method_error_type_index = 0; - _tmp146_ = base_method; - _tmp147_ = vala_code_node_get_error_types ((ValaCodeNode*) _tmp146_); - _base_method_error_type_list = _tmp147_; - _tmp148_ = _base_method_error_type_list; - _tmp149_ = vala_collection_get_size ((ValaCollection*) _tmp148_); - _tmp150_ = _tmp149_; - _base_method_error_type_size = _tmp150_; + _tmp153_ = base_method; + _tmp154_ = vala_code_node_get_error_types ((ValaCodeNode*) _tmp153_); + _base_method_error_type_list = _tmp154_; + _tmp155_ = _base_method_error_type_list; + _tmp156_ = vala_collection_get_size ((ValaCollection*) _tmp155_); + _tmp157_ = _tmp156_; + _base_method_error_type_size = _tmp157_; _base_method_error_type_index = -1; while (TRUE) { - gint _tmp151_ = 0; - gint _tmp152_ = 0; - gint _tmp153_ = 0; + gint _tmp158_ = 0; + gint _tmp159_ = 0; + gint _tmp160_ = 0; ValaDataType* base_method_error_type = NULL; - ValaList* _tmp154_ = NULL; - gint _tmp155_ = 0; - gpointer _tmp156_ = NULL; - ValaDataType* _tmp157_ = NULL; - ValaDataType* _tmp158_ = NULL; - gboolean _tmp159_ = FALSE; - _tmp151_ = _base_method_error_type_index; - _base_method_error_type_index = _tmp151_ + 1; - _tmp152_ = _base_method_error_type_index; - _tmp153_ = _base_method_error_type_size; - if (!(_tmp152_ < _tmp153_)) { + ValaList* _tmp161_ = NULL; + gint _tmp162_ = 0; + gpointer _tmp163_ = NULL; + ValaDataType* _tmp164_ = NULL; + ValaDataType* _tmp165_ = NULL; + gboolean _tmp166_ = FALSE; + _tmp158_ = _base_method_error_type_index; + _base_method_error_type_index = _tmp158_ + 1; + _tmp159_ = _base_method_error_type_index; + _tmp160_ = _base_method_error_type_size; + if (!(_tmp159_ < _tmp160_)) { break; } - _tmp154_ = _base_method_error_type_list; - _tmp155_ = _base_method_error_type_index; - _tmp156_ = vala_list_get (_tmp154_, _tmp155_); - base_method_error_type = (ValaDataType*) _tmp156_; - _tmp157_ = method_error_type; - _tmp158_ = base_method_error_type; - _tmp159_ = vala_data_type_compatible (_tmp157_, _tmp158_); - if (_tmp159_) { + _tmp161_ = _base_method_error_type_list; + _tmp162_ = _base_method_error_type_index; + _tmp163_ = vala_list_get (_tmp161_, _tmp162_); + base_method_error_type = (ValaDataType*) _tmp163_; + _tmp164_ = method_error_type; + _tmp165_ = base_method_error_type; + _tmp166_ = vala_data_type_compatible (_tmp164_, _tmp165_); + if (_tmp166_) { match = TRUE; _vala_code_node_unref0 (base_method_error_type); break; @@ -2787,19 +2804,19 @@ } _vala_iterable_unref0 (_base_method_error_type_list); } - _tmp160_ = match; - if (!_tmp160_) { - ValaDataType* _tmp161_ = NULL; - gchar* _tmp162_ = NULL; - gchar* _tmp163_ = NULL; - gchar* _tmp164_ = NULL; - _tmp161_ = method_error_type; - _tmp162_ = vala_code_node_to_string ((ValaCodeNode*) _tmp161_); - _tmp163_ = _tmp162_; - _tmp164_ = g_strdup_printf ("incompatible error type `%s'", _tmp163_); + _tmp167_ = match; + if (!_tmp167_) { + ValaDataType* _tmp168_ = NULL; + gchar* _tmp169_ = NULL; + gchar* _tmp170_ = NULL; + gchar* _tmp171_ = NULL; + _tmp168_ = method_error_type; + _tmp169_ = vala_code_node_to_string ((ValaCodeNode*) _tmp168_); + _tmp170_ = _tmp169_; + _tmp171_ = g_strdup_printf ("incompatible error type `%s'", _tmp170_); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp164_; - _g_free0 (_tmp163_); + _vala_invalid_match = _tmp171_; + _g_free0 (_tmp170_); result = FALSE; _vala_code_node_unref0 (method_error_type); _vala_iterable_unref0 (_method_error_type_list); @@ -2818,14 +2835,14 @@ } _vala_iterable_unref0 (_method_error_type_list); } - _tmp165_ = base_method; - _tmp166_ = _tmp165_->priv->_coroutine; - _tmp167_ = self->priv->_coroutine; - if (_tmp166_ != _tmp167_) { - gchar* _tmp168_ = NULL; - _tmp168_ = g_strdup ("async mismatch"); + _tmp172_ = base_method; + _tmp173_ = _tmp172_->priv->_coroutine; + _tmp174_ = self->priv->_coroutine; + if (_tmp173_ != _tmp174_) { + gchar* _tmp175_ = NULL; + _tmp175_ = g_strdup ("async mismatch"); _g_free0 (_vala_invalid_match); - _vala_invalid_match = _tmp168_; + _vala_invalid_match = _tmp175_; result = FALSE; _vala_iterator_unref0 (method_params_it); _vala_code_node_unref0 (actual_base_type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/vala/valamethod.vala new/vala-0.34.3/vala/valamethod.vala --- old/vala-0.34.2/vala/valamethod.vala 2016-10-23 20:19:03.000000000 +0200 +++ new/vala-0.34.3/vala/valamethod.vala 2016-11-22 13:13:06.000000000 +0100 @@ -342,7 +342,7 @@ var actual_base_type = base_method.return_type.get_actual_type (object_type, method_type_args, this); if (!return_type.equals (actual_base_type)) { - invalid_match = "incompatible return type"; + invalid_match = "Base method expected return type `%s', but `%s' was provided".printf (actual_base_type.to_qualified_string (), return_type.to_qualified_string ()); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/vapi/gdk-3.0.vapi new/vala-0.34.3/vapi/gdk-3.0.vapi --- old/vala-0.34.2/vapi/gdk-3.0.vapi 2016-10-23 19:47:20.000000000 +0200 +++ new/vala-0.34.3/vapi/gdk-3.0.vapi 2016-11-17 09:05:07.000000000 +0100 @@ -5411,7 +5411,7 @@ [Version (since = "3.16")] public void set_required_version (int major, int minor); [Version (since = "3.22")] - public void set_use_es (bool use_es); + public void set_use_es (int use_es); [Version (since = "3.16")] public Gdk.Display display { get; construct; } [Version (since = "3.16")] @@ -5494,7 +5494,7 @@ public class Screen : GLib.Object { [CCode (has_construct_function = false)] protected Screen (); - [Version (since = "2.10")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.10")] public Gdk.Window? get_active_window (); [Version (since = "2.2")] public static unowned Gdk.Screen? get_default (); @@ -5502,31 +5502,31 @@ public unowned Gdk.Display get_display (); [Version (since = "2.10")] public unowned Cairo.FontOptions? get_font_options (); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_height (); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_height_mm (); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_monitor_at_point (int x, int y); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_monitor_at_window (Gdk.Window window); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public void get_monitor_geometry (int monitor_num, out Gdk.Rectangle dest); - [Version (since = "2.14")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.14")] public int get_monitor_height_mm (int monitor_num); - [Version (since = "2.14")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.14")] public string? get_monitor_plug_name (int monitor_num); - [Version (since = "3.10")] + [Version (deprecated = true, deprecated_since = "3.22", since = "3.10")] public int get_monitor_scale_factor (int monitor_num); - [Version (since = "2.14")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.14")] public int get_monitor_width_mm (int monitor_num); - [Version (since = "3.4")] + [Version (deprecated = true, deprecated_since = "3.22", since = "3.4")] public Gdk.Rectangle get_monitor_workarea (int monitor_num); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_n_monitors (); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_number (); - [Version (since = "2.20")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.20")] public int get_primary_monitor (); [Version (since = "2.10")] public double get_resolution (); @@ -5540,25 +5540,29 @@ public unowned Gdk.Visual get_system_visual (); [Version (since = "2.2")] public GLib.List<weak Gdk.Window> get_toplevel_windows (); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_width (); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public int get_width_mm (); [Version (since = "2.10")] public GLib.List<Gdk.Window>? get_window_stack (); + [Version (deprecated = true, deprecated_since = "3.22")] public static int height (); + [Version (deprecated = true, deprecated_since = "3.22")] public static int height_mm (); [Version (since = "2.10")] public bool is_composited (); [Version (since = "2.2")] public GLib.List<weak Gdk.Visual> list_visuals (); - [Version (since = "2.2")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.2")] public string make_display_name (); [Version (since = "2.10")] public void set_font_options (Cairo.FontOptions? options); [Version (since = "2.10")] public void set_resolution (double dpi); + [Version (deprecated = true, deprecated_since = "3.22")] public static int width (); + [Version (deprecated = true, deprecated_since = "3.22")] public static int width_mm (); public void* font_options { get; set; } public double resolution { get; set; } @@ -5601,11 +5605,17 @@ public class Visual : GLib.Object { [CCode (has_construct_function = false)] protected Visual (); + [Version (deprecated = true, deprecated_since = "3.22")] public static unowned Gdk.Visual get_best (); + [Version (deprecated = true, deprecated_since = "3.22")] public static int get_best_depth (); + [Version (deprecated = true, deprecated_since = "3.22")] public static Gdk.VisualType get_best_type (); + [Version (deprecated = true, deprecated_since = "3.22")] public static unowned Gdk.Visual? get_best_with_both (int depth, Gdk.VisualType visual_type); + [Version (deprecated = true, deprecated_since = "3.22")] public static unowned Gdk.Visual get_best_with_depth (int depth); + [Version (deprecated = true, deprecated_since = "3.22")] public static unowned Gdk.Visual get_best_with_type (Gdk.VisualType visual_type); [Version (deprecated = true, deprecated_since = "3.22.", since = "2.22")] public int get_bits_per_rgb (); @@ -5623,6 +5633,7 @@ public void get_red_pixel_details (out uint32 mask, out int shift, out int precision); [Version (since = "2.2")] public unowned Gdk.Screen get_screen (); + [Version (deprecated = true, deprecated_since = "3.22")] public static unowned Gdk.Visual get_system (); [Version (since = "2.22")] public Gdk.VisualType get_visual_type (); @@ -5684,7 +5695,7 @@ public void geometry_changed (); [Version (since = "2.22")] public bool get_accept_focus (); - [Version (since = "2.22")] + [Version (deprecated = true, deprecated_since = "3.22", since = "2.22")] public unowned Cairo.Pattern? get_background_pattern (); public GLib.List<weak Gdk.Window> get_children (); [Version (since = "3.10")] @@ -5800,7 +5811,9 @@ public void set_accept_focus (bool accept_focus); [Version (deprecated = true, deprecated_since = "3.4")] public void set_background (Gdk.Color color); + [Version (deprecated = true, deprecated_since = "3.22")] public void set_background_pattern (Cairo.Pattern? pattern); + [Version (deprecated = true, deprecated_since = "3.22")] public void set_background_rgba (Gdk.RGBA rgba); [Version (since = "2.10")] public void set_child_input_shapes (); @@ -5808,6 +5821,7 @@ [Version (deprecated = true, deprecated_since = "3.16", since = "2.12")] public void set_composited (bool composited); public void set_cursor (Gdk.Cursor? cursor); + [Version (deprecated = true, deprecated_since = "3.22")] public static void set_debug_updates (bool setting); public void set_decorations (Gdk.WMDecoration decorations); [Version (since = "3.0")] @@ -6758,6 +6772,7 @@ [CCode (cheader_filename = "gdk/gdk.h")] public static uint keyval_to_upper (uint keyval); [CCode (cheader_filename = "gdk/gdk.h")] + [Version (deprecated = true, deprecated_since = "3.22")] public static GLib.List<weak Gdk.Visual> list_visuals (); [CCode (cheader_filename = "gdk/gdk.h")] [Version (since = "2.2")] @@ -6809,8 +6824,10 @@ [CCode (cheader_filename = "gdk/gdk.h")] public static bool property_get (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, out Gdk.Atom actual_property_type, out int actual_format, [CCode (array_length_cname = "actual_length", array_length_pos = 8.5)] out uint8[] data); [CCode (cheader_filename = "gdk/gdk.h")] + [Version (deprecated = true, deprecated_since = "3.22")] public static void query_depths ([CCode (array_length_cname = "count", array_length_pos = 1.1)] out unowned int[] depths); [CCode (cheader_filename = "gdk/gdk.h")] + [Version (deprecated = true, deprecated_since = "3.22")] public static void query_visual_types ([CCode (array_length_cname = "count", array_length_pos = 1.1)] out unowned Gdk.VisualType[] visual_types); [CCode (cheader_filename = "gdk/gdk.h")] [Version (deprecated_since = "vala-0.12", replacement = "Selection.convert")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/vapi/gstreamer-1.0.vapi new/vala-0.34.3/vapi/gstreamer-1.0.vapi --- old/vala-0.34.2/vapi/gstreamer-1.0.vapi 2016-10-23 20:19:03.000000000 +0200 +++ new/vala-0.34.3/vapi/gstreamer-1.0.vapi 2016-11-22 13:13:06.000000000 +0100 @@ -1288,7 +1288,7 @@ [CCode (array_length = false, array_null_terminated = true)] public string[]? get_metadata_keys (); public uint get_num_pad_templates (); - public GLib.List<Gst.StaticPadTemplate?> get_static_pad_templates (); + public unowned GLib.List<Gst.StaticPadTemplate?> get_static_pad_templates (); [CCode (array_length = false, array_null_terminated = true)] public unowned string[] get_uri_protocols (); public Gst.URIType get_uri_type (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/vala-0.34.2/vapigen/valagidlparser.c new/vala-0.34.3/vapigen/valagidlparser.c --- old/vala-0.34.2/vapigen/valagidlparser.c 2016-10-23 20:20:56.000000000 +0200 +++ new/vala-0.34.3/vapigen/valagidlparser.c 2016-11-22 13:19:07.000000000 +0100 @@ -10981,7 +10981,7 @@ ValaUnresolvedType* type = NULL; ValaUnresolvedType* _tmp0_ = NULL; GIdlNodeType* _tmp1_ = NULL; - GITypeTag _tmp2_ = 0; + TypeTag _tmp2_ = 0; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (type_node != NULL, NULL); _vala_direction = VALA_PARAMETER_DIRECTION_IN; @@ -11022,7 +11022,7 @@ } } else { GIdlNodeType* _tmp10_ = NULL; - GITypeTag _tmp11_ = 0; + TypeTag _tmp11_ = 0; _tmp10_ = type_node; _tmp11_ = _tmp10_->tag; if (_tmp11_ == TYPE_TAG_BOOLEAN) { @@ -11036,7 +11036,7 @@ _vala_code_node_unref0 (_tmp14_); } else { GIdlNodeType* _tmp15_ = NULL; - GITypeTag _tmp16_ = 0; + TypeTag _tmp16_ = 0; _tmp15_ = type_node; _tmp16_ = _tmp15_->tag; if (_tmp16_ == TYPE_TAG_INT8) { @@ -11050,7 +11050,7 @@ _vala_code_node_unref0 (_tmp19_); } else { GIdlNodeType* _tmp20_ = NULL; - GITypeTag _tmp21_ = 0; + TypeTag _tmp21_ = 0; _tmp20_ = type_node; _tmp21_ = _tmp20_->tag; if (_tmp21_ == TYPE_TAG_UINT8) { @@ -11064,7 +11064,7 @@ _vala_code_node_unref0 (_tmp24_); } else { GIdlNodeType* _tmp25_ = NULL; - GITypeTag _tmp26_ = 0; + TypeTag _tmp26_ = 0; _tmp25_ = type_node; _tmp26_ = _tmp25_->tag; if (_tmp26_ == TYPE_TAG_INT16) { @@ -11078,7 +11078,7 @@ _vala_code_node_unref0 (_tmp29_); } else { GIdlNodeType* _tmp30_ = NULL; - GITypeTag _tmp31_ = 0; + TypeTag _tmp31_ = 0; _tmp30_ = type_node; _tmp31_ = _tmp30_->tag; if (_tmp31_ == TYPE_TAG_UINT16) { @@ -11092,7 +11092,7 @@ _vala_code_node_unref0 (_tmp34_); } else { GIdlNodeType* _tmp35_ = NULL; - GITypeTag _tmp36_ = 0; + TypeTag _tmp36_ = 0; _tmp35_ = type_node; _tmp36_ = _tmp35_->tag; if (_tmp36_ == TYPE_TAG_INT32) { @@ -11106,7 +11106,7 @@ _vala_code_node_unref0 (_tmp39_); } else { GIdlNodeType* _tmp40_ = NULL; - GITypeTag _tmp41_ = 0; + TypeTag _tmp41_ = 0; _tmp40_ = type_node; _tmp41_ = _tmp40_->tag; if (_tmp41_ == TYPE_TAG_UINT32) { @@ -11120,7 +11120,7 @@ _vala_code_node_unref0 (_tmp44_); } else { GIdlNodeType* _tmp45_ = NULL; - GITypeTag _tmp46_ = 0; + TypeTag _tmp46_ = 0; _tmp45_ = type_node; _tmp46_ = _tmp45_->tag; if (_tmp46_ == TYPE_TAG_INT64) { @@ -11134,7 +11134,7 @@ _vala_code_node_unref0 (_tmp49_); } else { GIdlNodeType* _tmp50_ = NULL; - GITypeTag _tmp51_ = 0; + TypeTag _tmp51_ = 0; _tmp50_ = type_node; _tmp51_ = _tmp50_->tag; if (_tmp51_ == TYPE_TAG_UINT64) { @@ -11148,7 +11148,7 @@ _vala_code_node_unref0 (_tmp54_); } else { GIdlNodeType* _tmp55_ = NULL; - GITypeTag _tmp56_ = 0; + TypeTag _tmp56_ = 0; _tmp55_ = type_node; _tmp56_ = _tmp55_->tag; if (_tmp56_ == TYPE_TAG_INT) { @@ -11162,7 +11162,7 @@ _vala_code_node_unref0 (_tmp59_); } else { GIdlNodeType* _tmp60_ = NULL; - GITypeTag _tmp61_ = 0; + TypeTag _tmp61_ = 0; _tmp60_ = type_node; _tmp61_ = _tmp60_->tag; if (_tmp61_ == TYPE_TAG_UINT) { @@ -11176,7 +11176,7 @@ _vala_code_node_unref0 (_tmp64_); } else { GIdlNodeType* _tmp65_ = NULL; - GITypeTag _tmp66_ = 0; + TypeTag _tmp66_ = 0; _tmp65_ = type_node; _tmp66_ = _tmp65_->tag; if (_tmp66_ == TYPE_TAG_LONG) { @@ -11190,7 +11190,7 @@ _vala_code_node_unref0 (_tmp69_); } else { GIdlNodeType* _tmp70_ = NULL; - GITypeTag _tmp71_ = 0; + TypeTag _tmp71_ = 0; _tmp70_ = type_node; _tmp71_ = _tmp70_->tag; if (_tmp71_ == TYPE_TAG_ULONG) { @@ -11204,7 +11204,7 @@ _vala_code_node_unref0 (_tmp74_); } else { GIdlNodeType* _tmp75_ = NULL; - GITypeTag _tmp76_ = 0; + TypeTag _tmp76_ = 0; _tmp75_ = type_node; _tmp76_ = _tmp75_->tag; if (_tmp76_ == TYPE_TAG_SSIZE) { @@ -11218,7 +11218,7 @@ _vala_code_node_unref0 (_tmp79_); } else { GIdlNodeType* _tmp80_ = NULL; - GITypeTag _tmp81_ = 0; + TypeTag _tmp81_ = 0; _tmp80_ = type_node; _tmp81_ = _tmp80_->tag; if (_tmp81_ == TYPE_TAG_SIZE) { @@ -11232,7 +11232,7 @@ _vala_code_node_unref0 (_tmp84_); } else { GIdlNodeType* _tmp85_ = NULL; - GITypeTag _tmp86_ = 0; + TypeTag _tmp86_ = 0; _tmp85_ = type_node; _tmp86_ = _tmp85_->tag; if (_tmp86_ == TYPE_TAG_FLOAT) { @@ -11246,7 +11246,7 @@ _vala_code_node_unref0 (_tmp89_); } else { GIdlNodeType* _tmp90_ = NULL; - GITypeTag _tmp91_ = 0; + TypeTag _tmp91_ = 0; _tmp90_ = type_node; _tmp91_ = _tmp90_->tag; if (_tmp91_ == TYPE_TAG_DOUBLE) { @@ -11260,7 +11260,7 @@ _vala_code_node_unref0 (_tmp94_); } else { GIdlNodeType* _tmp95_ = NULL; - GITypeTag _tmp96_ = 0; + TypeTag _tmp96_ = 0; _tmp95_ = type_node; _tmp96_ = _tmp95_->tag; if (_tmp96_ == TYPE_TAG_UTF8) { @@ -11274,7 +11274,7 @@ _vala_code_node_unref0 (_tmp99_); } else { GIdlNodeType* _tmp100_ = NULL; - GITypeTag _tmp101_ = 0; + TypeTag _tmp101_ = 0; _tmp100_ = type_node; _tmp101_ = _tmp100_->tag; if (_tmp101_ == TYPE_TAG_FILENAME) { @@ -11288,7 +11288,7 @@ _vala_code_node_unref0 (_tmp104_); } else { GIdlNodeType* _tmp105_ = NULL; - GITypeTag _tmp106_ = 0; + TypeTag _tmp106_ = 0; _tmp105_ = type_node; _tmp106_ = _tmp105_->tag; if (_tmp106_ == TYPE_TAG_ARRAY) { @@ -11338,7 +11338,7 @@ return result; } else { GIdlNodeType* _tmp119_ = NULL; - GITypeTag _tmp120_ = 0; + TypeTag _tmp120_ = 0; _tmp119_ = type_node; _tmp120_ = _tmp119_->tag; if (_tmp120_ == TYPE_TAG_LIST) { @@ -11357,7 +11357,7 @@ _vala_code_node_unref0 (_tmp123_); } else { GIdlNodeType* _tmp126_ = NULL; - GITypeTag _tmp127_ = 0; + TypeTag _tmp127_ = 0; _tmp126_ = type_node; _tmp127_ = _tmp126_->tag; if (_tmp127_ == TYPE_TAG_SLIST) { @@ -11376,7 +11376,7 @@ _vala_code_node_unref0 (_tmp130_); } else { GIdlNodeType* _tmp133_ = NULL; - GITypeTag _tmp134_ = 0; + TypeTag _tmp134_ = 0; _tmp133_ = type_node; _tmp134_ = _tmp133_->tag; if (_tmp134_ == TYPE_TAG_HASH) { @@ -11395,7 +11395,7 @@ _vala_code_node_unref0 (_tmp137_); } else { GIdlNodeType* _tmp140_ = NULL; - GITypeTag _tmp141_ = 0; + TypeTag _tmp141_ = 0; _tmp140_ = type_node; _tmp141_ = _tmp140_->tag; if (_tmp141_ == TYPE_TAG_ERROR) { @@ -12035,7 +12035,7 @@ } else { FILE* _tmp334_ = NULL; GIdlNodeType* _tmp335_ = NULL; - GITypeTag _tmp336_ = 0; + TypeTag _tmp336_ = 0; _tmp334_ = stdout; _tmp335_ = type_node; _tmp336_ = _tmp335_->tag;
