paramcheck: Use + quantifier and return copy.

diff --git a/ChangeLog b/ChangeLog
index 352af25f4d9738ea2821f21ad9285ef16479395c..82bcb86319c379ecfb08184a44b2f9a0b1fd797f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-16  Steven Schubiger  <stsc@member.fsf.org>
+
+       * util/paramcheck.pl: Match 1 or more times where applicable.
+       (extract_entries): Return a copy instead of reference.
+
 2011-09-04  Alan Hourihane <alanh@fairlite.co.uk> (tiny change)
 
        * configure.ac: Check for libz when gnutls is used.

diff --git a/util/paramcheck.pl b/util/paramcheck.pl
index 832f5dc7d6093e1f86e2020c83c816b7ab22258a..660cdb4f3080a76d3a00ab71f2c1a59a415b0a2e 100755 (executable)
--- a/util/paramcheck.pl
+++ b/util/paramcheck.pl
@@ -33,11 +33,11 @@ my $tex_content  = read_file($tex_file);
 
 my @args = ([
     $main_content,
-    qr/static \s+? struct \s+? cmdline_option \s+? option_data\[\] \s+? = \s+? \{ (.*?) \}\;/sx,
+    qr/static \s+? struct \s+? cmdline_option \s+? option_data\[\] \s+? = \s+? \{ (.+?) \}\;/sx,
     [ qw(long_name short_name type data argtype) ],
 ], [
     $init_content,
-    qr/commands\[\] \s+? = \s+? \{ (.*?) \}\;/sx,
+    qr/commands\[\] \s+? = \s+? \{ (.+?) \}\;/sx,
     [ qw(name place action) ],
 ]);
 
@@ -78,18 +78,18 @@ sub extract_entries
     my (@entries, %index, $i);
 
     foreach my $chunk (@$chunks) {
-        my ($args) = $chunk =~ /\{ \s+? (.*?) \s+? \}/sx;
+        my ($args) = $chunk =~ /\{ \s+? (.+?) \s+? \}/sx;
         next unless defined $args;
 
         my @args = map {
           tr/'"//d; $_
         } map {
-          /\((.*?)\)/ ? $1 : $_
+          /\((.+?)\)/ ? $1 : $_
         } split /\,\s+/, $args;
 
         my $entry = { map { $_ => shift @args } @$names };
 
-        ($entry->{line}) = $chunk =~ /^ \s+? (\{.*)/mx;
+        ($entry->{line}) = $chunk =~ /^ \s+? (\{.+)/mx;
         if ($chunk =~ /deprecated/i) {
             $entries[-1]->{deprecated} = true;
         }
@@ -103,9 +103,9 @@ sub extract_entries
         push @entries, $entry;
     }
 
-    push @entries, \%index;
+    push @entries, { %index };
 
-    return \@entries;
+    return [ @entries ];
 }
 
 sub output_results
@@ -281,7 +281,7 @@ sub emit_undocumented_opts
     while ($tex =~ /^\@item\w*? \s+? --([-a-z0-9]+)/gmx) {
         $tex_items{$1} = true;
     }
-    my ($help) = $main =~ /\n print_help .*? \{\n (.*) \n\} \n/sx;
+    my ($help) = $main =~ /\n print_help .*? \{\n (.+) \n\} \n/sx;
     while ($help =~ /--([-a-z0-9]+)/g) {
         $main_items{$1} = true;
     }