diff options
| author | Andrey Ponomarenko <andrewponomarenko@yandex.ru> | 2016-06-24 16:45:43 +0300 |
|---|---|---|
| committer | Andrey Ponomarenko <andrewponomarenko@yandex.ru> | 2016-06-24 16:45:43 +0300 |
| commit | be41071033f9a235c2efbc727b8f943cc3490f8c (patch) | |
| tree | aec8c4e231323469eb1921f45728712766a5efe2 | |
| parent | 0bc284bf5efb53df13715b403613fe89f795c2ec (diff) | |
| download | abi-dumper-be41071033f9a235c2efbc727b8f943cc3490f8c.tar.gz | |
Fixed extracting of ABI info for pointers to anon enums.
| -rw-r--r-- | abi-dumper.pl | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/abi-dumper.pl b/abi-dumper.pl index 4bd534e..dd0fc65 100644 --- a/abi-dumper.pl +++ b/abi-dumper.pl @@ -2267,8 +2267,7 @@ sub complete_ABI() foreach my $Tid (sort {int($a) <=> int($b)} keys(%TypeInfo)) { - if(defined $TypeInfo{$Tid} - and $TypeInfo{$Tid}{"Type"} eq "Typedef") + if($TypeInfo{$Tid}{"Type"} eq "Typedef") { my $TN = $TypeInfo{$Tid}{"Name"}; my $TL = $TypeInfo{$Tid}{"Line"}; @@ -2277,7 +2276,8 @@ sub complete_ABI() if(my $BTid = $TypeInfo{$Tid}{"BaseType"}) { if(defined $TypeInfo{$BTid} - and $TypeInfo{$BTid}{"Name"}=~/\Aanon\-(\w+)\-/) + and $TypeInfo{$BTid}{"Name"}=~/\Aanon\-(\w+)\-/ + and $TypeInfo{$BTid}{"Type"} eq "Enum") { %{$TypeInfo{$Tid}} = %{$TypeInfo{$BTid}}; $TypeInfo{$Tid}{"Name"} = $1." ".$TN; @@ -2296,7 +2296,24 @@ sub complete_ABI() if($NS) { $TypeInfo{$Tid}{"NameSpace"} = $NS; } - $Delete{$BTid} = 1; + $Delete{$BTid} = $Tid; + } + } + } + elsif($TypeInfo{$Tid}{"Type"} eq "Pointer") + { + if(my $BTid = $TypeInfo{$Tid}{"BaseType"}) + { + if(my $To = $Delete{$BTid}) + { + $TypeInfo{$Tid}{"BaseType"} = $To; + $TypeInfo{$Tid}{"Name"} = $TypeInfo{$To}{"Name"}."*"; + + my $Name = $TypeInfo{$Tid}{"Name"}; + my $Type = $TypeInfo{$Tid}{"Type"}; + + $TName_Tid{$Type}{$Name} = $Tid; + $TName_Tids{$Type}{$Name}{$Tid} = 1; } } } |