CppSharp.AST.Declaration - fix return QualifiedOriginalName, Qualifie…

…dLogicalOriginalName (#1740) Fixed properties getters of QualifiedOriginalName, QualifiedLogicalOriginalName and methods GetQualifiedName(), GatherNamespaces.
mono · Jul 4, 2023 · 9923d79 · 9923d79
1 parent 0272532
commit 9923d79
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/AST/Declaration.cs b/src/AST/Declaration.cs
@@ -189,15 +189,16 @@ public virtual string Name
         public static string QualifiedNameSeparator = "::";
 
         public string GetQualifiedName(Func<Declaration, string> getName,
-            Func<Declaration, DeclarationContext> getNamespace)
+            Func<Declaration, DeclarationContext> getNamespace, bool getOriginal)
         {
-            if (Namespace == null)
+            DeclarationContext @namespace = getNamespace(this);
+            if (@namespace == null)
                 return getName(this);
 
-            if (Namespace.IsRoot)
+            if (@namespace.IsRoot)
                 return getName(this);
 
-            var namespaces = GatherNamespaces(getNamespace(this));
+            var namespaces = GatherNamespaces(@namespace, getOriginal);
 
             var names = namespaces.Select(getName).ToList();
             names.Add(getName(this));
@@ -206,7 +207,7 @@ public string GetQualifiedName(Func<Declaration, string> getName,
             return string.Join(QualifiedNameSeparator, names);
         }
 
-        public static IEnumerable<Declaration> GatherNamespaces(DeclarationContext @namespace)
+        public static IEnumerable<Declaration> GatherNamespaces(DeclarationContext @namespace, bool getOriginal)
         {
             var namespaces = new Stack<Declaration>();
 
@@ -216,7 +217,7 @@ public static IEnumerable<Declaration> GatherNamespaces(DeclarationContext @name
                 var isInlineNamespace = currentNamespace is Namespace { IsInline: true };
                 if (!isInlineNamespace)
                     namespaces.Push(currentNamespace);
-                currentNamespace = currentNamespace.Namespace;
+                currentNamespace = getOriginal ? currentNamespace.OriginalNamespace : currentNamespace.Namespace;
             }
 
             return namespaces;
@@ -226,7 +227,7 @@ public string QualifiedName
         {
             get
             {
-                return GetQualifiedName(decl => GetDeclName(decl, decl.Name), decl => decl.Namespace);
+                return GetQualifiedName(decl => GetDeclName(decl, decl.Name), decl => decl.Namespace, false);
             }
         }
 
@@ -235,7 +236,7 @@ public string QualifiedOriginalName
             get
             {
                 return GetQualifiedName(
-                    decl => GetDeclName(decl, decl.OriginalName), decl => decl.OriginalNamespace);
+                    decl => GetDeclName(decl, decl.OriginalName), decl => decl.OriginalNamespace, true);
             }
         }
 
@@ -244,7 +245,7 @@ public string QualifiedLogicalName
             get
             {
                 return GetQualifiedName(
-                    decl => GetDeclName(decl, decl.LogicalName), decl => decl.Namespace);
+                    decl => GetDeclName(decl, decl.LogicalName), decl => decl.Namespace, false);
             }
         }
 
@@ -253,7 +254,7 @@ public string QualifiedLogicalOriginalName
             get
             {
                 return GetQualifiedName(
-                    decl => GetDeclName(decl, decl.LogicalOriginalName), decl => decl.OriginalNamespace);
+                    decl => GetDeclName(decl, decl.LogicalOriginalName), decl => decl.OriginalNamespace, true);
             }
         }