both extract full qualified and simple parent class names

Signed-off-by: satanson <ranpanf@gmail.com>
satanson · Jan 8, 2024 · af0564f · af0564f
1 parent b1cca75
commit af0564f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 30 deletions.
diff --git a/cpptree.pl b/cpptree.pl
@@ -535,27 +535,21 @@ ()
       last;
     }
     for my $e (@parent_matches) {
-      my ($fileline, $child, $parent) = @$e;
-      if (!defined($tree->{$parent})) {
-        $tree->{$parent} = [];
-      }
-
-      if (!exists $table{$parent}) {
-        $table{$parent} = [ "out-of-tree" ];
-      } 
+      my ($fileline, $child, $parent0) = @$e;
+      my $parent1 = [ split /\s*::\s*/, $parent0 ]->[-1];
+      my @parents = keys %{+{$parent0 => 1, $parent1 => 2}};
+      for my $parent (@parents) {
+        if (!defined($tree->{$parent})) {
+          $tree->{$parent} = [];
+        }
 
-      if ($child ne $parent) {
-        push @{$tree->{$parent}}, $e;
-      }
-      my $simple_parent = ($parent =~ /\b(\w+)\b$/g,$1);
-      if ($simple_parent eq $parent) {
-        next;
-      }
-      if (!exists $table{$simple_parent}) {
-        $table{$simple_parent} = [ "out-of-tree" ];
-      }
-      if ($child ne $simple_parent) {
-        push @{$tree->{$simple_parent}}, $e;
+        if (!exists $table{$parent}) {
+          $table{$parent} = [ "out-of-tree" ];
+        } 
+
+        if ($child ne $parent) {
+          push @{$tree->{$parent}}, $e;
+        }
       }
     }
   }

diff --git a/javatree.pl b/javatree.pl
@@ -532,17 +532,21 @@ ()
       next;
     }
     for my $e (@parent_matches) {
-      my ($fileline, $child, $parent) = @$e;
-      if (!defined($tree->{$parent})) {
-        $tree->{$parent} = [];
-      }
-
-      if (!exists $table{$parent}) {
-        $table{$parent} = [ "out-of-tree" ];
-      } 
+      my ($fileline, $child, $parent0) = @$e;
+      my $parent1 = [split /\s*\.\s*/,$parent0]->[-1];
+      my @parents = keys %{+{$parent0 => 1, $parent1 => 2}};
+      for my $parent (@parents) {
+        if (!defined($tree->{$parent})) {
+          $tree->{$parent} = [];
+        }
 
-      if ($child ne $parent) {
-        push @{$tree->{$parent}}, $e;
+        if (!exists $table{$parent}) {
+          $table{$parent} = [ "out-of-tree" ];
+        } 
+
+        if ($child ne $parent) {
+          push @{$tree->{$parent}}, $e;
+        }
       }
     }
   }