[vala/0.48] girparser: Reuse populated Node.gtype_struct_for instead of resolving again



commit 4af9471659b9c1de442d244ef60876f5586c36de
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Mar 3 10:05:00 2021 +0100

    girparser: Reuse populated Node.gtype_struct_for instead of resolving again
    
    This fixes the discovery of non-default type_cname for re-parented symbols.

 vala/valagirparser.vala | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index fe9ea451d..4775ccce2 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -1202,9 +1202,8 @@ public class Vala.GirParser : CodeVisitor {
                                                merged = true;
                                        } else {
                                                // record for a gtype
-                                               var gtype_struct_for = girdata["glib:is-gtype-struct-for"];
                                                if (gtype_struct_for != null) {
-                                                       var obj = parser.resolve_node (parent, 
parser.parse_symbol_from_string (gtype_struct_for, source_reference));
+                                                       var obj = parser.resolve_node (parent, 
gtype_struct_for);
                                                        if (obj != null && obj.symbol is Interface && 
"%sIface".printf (obj.get_cname ()) != get_cname ()) {
                                                                // set the interface struct name
                                                                obj.symbol.set_attribute_string ("CCode", 
"type_cname", get_cname ());


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]