04-map.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        * automake.in (&scan_texinfo_file, &handle_dist, &handle_gettext)
        (&handle_footer, &handle_factored_dependencies, &handle_emacs_lisp)
        (&am_primary_prefixes): Use `map' rather than `grep'.

Index: automake.in
--- automake.in Sat, 12 May 2001 11:28:03 +0200 akim (am/f/39_automake.i 
1.266.1.7 755)
+++ automake.in Sat, 12 May 2001 11:54:42 +0200 akim (am/f/39_automake.i 
1.266.1.7 755)
@@ -2807,8 +2807,8 @@ sub scan_texinfo_file

     my $infobase = basename ($filename);
     $infobase =~ s/\.te?xi(nfo)?$//;
-    my %clean_files;
-    grep { $clean_files{"$infobase.$_"} = 1    } @clean_suffixes;
+    # FIXME: I don't understand why, but I can't use "$infobase.$_" => 1.
+    my %clean_files = map { "$infobase" . ".$_" => 1 } @clean_suffixes;
     grep { delete $clean_files{"$infobase.$_"} } @syncodeindexes;
     return ($outfile, $vfile, (sort keys %clean_files));
 }
@@ -3247,8 +3247,7 @@ sub handle_dist
                     'GETTEXT'        => $seen_gettext);

     # Prepend $(distdir) to each directory given.
-    my %rewritten;
-    grep ($rewritten{'$(distdir)/' . $_} = 1, keys %dist_dirs);
+    my %rewritten = map { '$(distdir)/' . "$_" => 1 } keys %dist_dirs;
     $transform{'DISTDIRS'} = join (' ', sort keys %rewritten);

     # If we have SUBDIRS, create all dist subdirectories and do
@@ -3766,8 +3765,7 @@ sub handle_gettext
     # each po file is mentioned in ALL_LINGUAS.
     if ($seen_linguas)
     {
-       my %linguas = ();
-       grep ($linguas{$_} = 1, split (' ', $all_linguas));
+       my %linguas = map { $_ => 1 } split (' ', $all_linguas);

        foreach (<po/*.po>)
        {
@@ -3822,8 +3820,7 @@ sub handle_footer
                             ? &variable_value_as_list ('SUFFIXES', '')
                             : ());

-       my %suffixes;
-       grep ($suffixes{$_} = 1, @suffixes);
+       my %suffixes = map { $_ => 1 } @suffixes;
        delete @address@hidden;

        $output_header .= (".SUFFIXES: "
@@ -4058,7 +4055,7 @@ sub handle_factored_dependencies
     }

     # All the required targets are phony.
-    grep { &depend ('.PHONY', $_) } keys %required_targets;
+    depend ('.PHONY', keys %required_targets);

     # Actually output gathered targets.
     foreach (sort target_cmp keys %dependencies)
@@ -4122,8 +4119,8 @@ sub handle_emacs_lisp
     return if ! @elfiles;

     # Generate .elc files.
-    grep ($_ .= 'c', @elfiles);
-    &define_pretty_variable ('ELCFILES', '', @elfiles);
+    my @elcfiles = map { $_ . 'c' } @elfiles;
+    &define_pretty_variable ('ELCFILES', '', @elcfiles);

     push (@all, '$(ELCFILES)');

@@ -6958,8 +6955,7 @@ sub am_primary_prefixes
 {
     my ($primary, $can_dist, @prefixes) = @_;

-    my %valid;
-    grep ($valid{$_} = 0, @prefixes);
+    my %valid = map { $_ => 0 } @prefixes;
     $valid{'EXTRA'} = 0;
     foreach my $varname (keys %var_value)
     {