girparser: Ignore conflicting closure/destroy indexes

Reverse references from closure/destroy parameters back to the callback
break our later logic, so skip this additional information.

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 2c94e249a1e086f0d70edf6b512d100e30044fe4..617aaf0803df56bd5a130947d5a22da4b9cddb29 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -3262,13 +3262,17 @@ public class Vala.GirParser : CodeVisitor {
                                        if (instance_idx > -2 && instance_idx < closure_idx) {
                                                closure_idx--;
                                        }
-                                       current.closure_parameters.add (closure_idx);
+                                       if (current.closure_parameters.index_of (current_parameter_idx) < 0) {
+                                               current.closure_parameters.add (closure_idx);
+                                       }
                                }
                                if (destroy_idx != -1) {
                                        if (instance_idx > -2 && instance_idx < destroy_idx) {
                                                destroy_idx--;
                                        }
-                                       current.destroy_parameters.add (destroy_idx);
+                                       if (current.destroy_parameters.index_of (current_parameter_idx) < 0) {
+                                               current.destroy_parameters.add (destroy_idx);
+                                       }
                                }
                                if (param_comment != null) {
                                        if (comment == null) {