diff options
author | Stefan Sauer <ensonic@users.sf.net> | 2014-02-06 22:18:22 +0100 |
---|---|---|
committer | Stefan Sauer <ensonic@users.sf.net> | 2014-02-06 22:19:39 +0100 |
commit | eb231f9f4ecc5a3cd3790a05cf20f5eb0ad14218 (patch) | |
tree | cca54263b3a1a54b117510eab460fcf7516d1dfb /gtkdoc-scan.in | |
parent | af3bf981888ceeb05d6c13d18dcf91e03165dba9 (diff) | |
download | gtk-doc-eb231f9f4ecc5a3cd3790a05cf20f5eb0ad14218.tar.gz |
scan: tweak the matching of types
Join the prefix + type name to make the code easier to read.
Diffstat (limited to 'gtkdoc-scan.in')
-rwxr-xr-x | gtkdoc-scan.in | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/gtkdoc-scan.in b/gtkdoc-scan.in index febb822..b2b9f84 100755 --- a/gtkdoc-scan.in +++ b/gtkdoc-scan.in @@ -873,19 +873,19 @@ sub ScanHeader { $lprefix = lc($prefix); $class = $2; $lclass = lc($class); - @TRACE@("Found gobject class '$class' from is class macro\n"); + @TRACE@("Found gobject type '${prefix}_$class' from is_class macro\n"); } elsif ($list =~ m/^(\S+)_IS_(\S*)\n/m) { $prefix = $1; $lprefix = lc($prefix); $class = $2; $lclass = lc($class); - @TRACE@("Found gobject class '$class' from is macro\n"); + @TRACE@("Found gobject type '${prefix}_$class' from is_ macro\n"); } elsif ($list =~ m/^(\S+?)_(\S*)_get_type\n/m) { $lprefix = $1; $prefix = uc($lprefix); $lclass = $2; $class = uc($lclass); - @TRACE@("Found gobject class '$class' from get_type function\n"); + @TRACE@("Found gobject type '${prefix}_$class' from get_type function\n"); } else { $class = $lclass = ""; } @@ -893,25 +893,26 @@ sub ScanHeader { if ($class ne "") { my ($cclass) = $lclass; $cclass =~ s/_//g; + my ($type) = $lprefix.$cclass; - if ($list =~ s/^\S+${cclass}Private\n//im) { $standard_decl .= $&; } + if ($list =~ s/^${type}Private\n//im) { $standard_decl .= $&; } # We only leave XxYy* in the normal section if they have docs - if (! defined($doc_comments{$lprefix.$cclass})) { - @TRACE@(" Hide instance docs for $lprefix$cclass"); - if ($list =~ s/^\S+${cclass}\n//im) { $standard_decl .= $&; } + if (! defined($doc_comments{$type})) { + @TRACE@(" Hide instance docs for $type"); + if ($list =~ s/^${type}\n//im) { $standard_decl .= $&; } } - if (! defined($doc_comments{$lprefix.$cclass."class"})) { - @TRACE@(" Hide class docs for $lprefix$cclass"); - if ($list =~ s/^\S+${cclass}Class\n//im) { $standard_decl .= $&; } + if (! defined($doc_comments{$type."class"})) { + @TRACE@(" Hide class docs for $type"); + if ($list =~ s/^${type}Class\n//im) { $standard_decl .= $&; } } - if (! defined($doc_comments{$lprefix.$cclass."interface"})) { - @TRACE@(" Hide iface docs for $lprefix$cclass"); - if ($list =~ s/^\S+${cclass}Interface\n//im) { $standard_decl .= $&; } + if (! defined($doc_comments{$type."interface"})) { + @TRACE@(" Hide iface docs for $type"); + if ($list =~ s/^$type}Interface\n//im) { $standard_decl .= $&; } } - if (! defined($doc_comments{$lprefix.$cclass."iface"})) { - @TRACE@(" Hide iface docs for $lprefix$cclass"); - if ($list =~ s/^\S+${cclass}Iface\n//im) { $standard_decl .= $&; } + if (! defined($doc_comments{$type."iface"})) { + @TRACE@(" Hide iface docs for $type"); + if ($list =~ s/${type}Iface\n//im) { $standard_decl .= $&; } } while ($list =~ s/^\S+_IS_$class\n//m) { $standard_decl .= $&; } |