From: Stefano Lattarini Date: Mon, 27 May 2013 10:55:27 +0000 (+0200) Subject: Automake::Rule: rename: suffix_rule() -> next_in_suffix_chain() X-Git-Tag: v1.13.2b~11^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=986ca6c0a3e8c0b34f0981a8eb938906fb8ebfbc;p=platform%2Fupstream%2Fautomake.git Automake::Rule: rename: suffix_rule() -> next_in_suffix_chain() * lib/Automake/Rule.pm (suffix_rule): Rename ... (next_in_suffix_chain): ... like this. (%suffix_rules): Adjust comments. (@EXPORT): Adjust. * automake.in (derive_suffix): Likewise. Signed-off-by: Stefano Lattarini --- diff --git a/automake.in b/automake.in index 76028adef..63d5bdfdd 100644 --- a/automake.in +++ b/automake.in @@ -5992,7 +5992,7 @@ sub derive_suffix ($$) while (!$extension_map{$source_ext} && $source_ext ne $obj) { - my $new_source_ext = suffix_rule ($source_ext, $obj); + my $new_source_ext = next_in_suffix_chain ($source_ext, $obj); last if not defined $new_source_ext; $source_ext = $new_source_ext; } diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index 9e2648d96..b162865e3 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -29,7 +29,8 @@ use Automake::DisjConditions; require Exporter; use vars '@ISA', '@EXPORT', '@EXPORT_OK'; @ISA = qw/Automake::Item Exporter/; -@EXPORT = qw (reset register_suffix_rule suffix_rules_count suffix_rule +@EXPORT = qw (reset register_suffix_rule suffix_rules_count + next_in_suffix_chain suffixes rules $KNOWN_EXTENSIONS_PATTERN depend %dependencies %actions register_action accept_extensions @@ -123,8 +124,8 @@ only when keys exists in C<%dependencies>. use vars '%actions'; -# See comments in the implementation of the 'suffix_rule()' variable -# for details. +# See comments in the implementation of the 'next_in_suffix_chain()' +# variable for details. my %suffix_rules; # Same as $suffix_rules, but records only the default rules @@ -348,14 +349,14 @@ sub reset() %actions = (); } -=item C +=item C Return the target suffix for the next rule to use to reach C<$ext2> from C<$ext1>, or C if no such rule exists. =cut -sub suffix_rule ($$) +sub next_in_suffix_chain ($$) { my ($ext1, $ext2) = @_; return undef unless (exists $suffix_rules{$ext1} and