girparser: Avoid possibily creating duplicated attributes

Don't append an attribute without checking if there is an existing one.
In case the attribute already exists append the new key/value pairs.

diff --git a/vala/valacodenode.vala b/vala/valacodenode.vala
index 05ba53a0a13f3589be5e468ecc5be1f8f9de0677..4ca44c8d916168bf2bbf50ce1f0fbc8b656ff148 100644 (file)
--- a/vala/valacodenode.vala
+++ b/vala/valacodenode.vala
@@ -120,6 +120,23 @@ public abstract class Vala.CodeNode {
                return null;
        }
 
+       /**
+        * Add attribute and append key/value pairs to an existing one.
+        *
+        * @param a  an attribute to add
+        */
+       public void add_attribute (Attribute a) {
+               unowned Attribute? old_a = get_attribute (a.name);
+               if (old_a == null) {
+                       attributes.append (a);
+               } else {
+                       var it = a.args.map_iterator ();
+                       while (it.next ()) {
+                               old_a.args.set (it.get_key (), it.get_value ());
+                       }
+               }
+       }
+
        unowned Attribute get_or_create_attribute (string name) {
                unowned Attribute? a = get_attribute (name);
                if (a == null) {

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index d59114020595c5fa22c8201a468cd5f5f69f4019..3acef3ff65b879bf8a9f7836fec13ff935ba9827 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -3933,7 +3933,7 @@ public class Vala.GirParser : CodeVisitor {
                        }
 
                        foreach (var attribute in orig.attributes) {
-                               deleg.attributes.append (attribute);
+                               deleg.add_attribute (attribute);
                        }
 
                        alias.symbol = deleg;
@@ -4373,7 +4373,7 @@ public class Vala.GirParser : CodeVisitor {
                                // cannot use List.copy()
                                // as it returns a list of unowned elements
                                foreach (Attribute a in m.attributes) {
-                                       method.attributes.append (a);
+                                       method.add_attribute (a);
                                }
 
                                method.set_attribute_string ("CCode", "cname", node.get_cname ());