diff options
Diffstat (limited to 'Master/tlpkg/tlperl/lib/Getopt')
| -rw-r--r-- | Master/tlpkg/tlperl/lib/Getopt/Long.pm | 21 | ||||
| -rw-r--r-- | Master/tlpkg/tlperl/lib/Getopt/Std.pm | 45 |
2 files changed, 37 insertions, 29 deletions
diff --git a/Master/tlpkg/tlperl/lib/Getopt/Long.pm b/Master/tlpkg/tlperl/lib/Getopt/Long.pm index e06f34bf62e..3ef7d997b85 100644 --- a/Master/tlpkg/tlperl/lib/Getopt/Long.pm +++ b/Master/tlpkg/tlperl/lib/Getopt/Long.pm @@ -4,8 +4,8 @@ # Author : Johan Vromans # Created On : Tue Sep 11 15:00:12 1990 # Last Modified By: Johan Vromans -# Last Modified On: Tue Mar 12 14:42:25 2013 -# Update Count : 1638 +# Last Modified On: Tue Oct 1 08:25:52 2013 +# Update Count : 1651 # Status : Released ################ Module Preamble ################ @@ -17,10 +17,10 @@ use 5.004; use strict; use vars qw($VERSION); -$VERSION = 2.39; +$VERSION = 2.42; # For testing versions only. use vars qw($VERSION_STRING); -$VERSION_STRING = "2.39"; +$VERSION_STRING = "2.42"; use Exporter; use vars qw(@ISA @EXPORT @EXPORT_OK); @@ -251,7 +251,7 @@ use constant PAT_XINT => "|". "0[0-7_]*". ")"; -use constant PAT_FLOAT => "[-+]?[0-9._]+(\.[0-9_]+)?([eE][-+]?[0-9_]+)?"; +use constant PAT_FLOAT => "[-+]?[0-9_]+(\.[0-9_]+)?([eE][-+]?[0-9_]+)?"; sub GetOptions(@) { # Shift in default array. @@ -984,9 +984,9 @@ sub FindOption ($$$$$) { # See if all matches are for the same option. my %hit; foreach ( @hits ) { - my $hit = $_; - $hit = $opctl->{$hit}->[CTL_CNAME] - if defined $opctl->{$hit}->[CTL_CNAME]; + my $hit = $opctl->{$_}->[CTL_CNAME] + if defined $opctl->{$_}->[CTL_CNAME]; + $hit = "no" . $hit if $opctl->{$_}->[CTL_TYPE] eq '!'; $hit{$hit} = 1; } # Remove auto-supplied options (version, help). @@ -1200,7 +1200,6 @@ sub FindOption ($$$$$) { elsif ( $type eq 'f' ) { # real number, int is also ok # We require at least one digit before a point or 'e', # and at least one digit following the point and 'e'. - # [-]NN[.NN][eNN] my $o_valid = PAT_FLOAT; if ( $bundling && defined $rest && $rest =~ /^($key_valid)($o_valid)(.*)$/s ) { @@ -2546,7 +2545,7 @@ briefly some of these 'features'. When no destination is specified for an option, GetOptions will store the resultant value in a global variable named C<opt_>I<XXX>, where -I<XXX> is the primary name of this option. When a progam executes +I<XXX> is the primary name of this option. When a program executes under C<use strict> (recommended), these variables must be pre-declared with our() or C<use vars>. @@ -2674,7 +2673,7 @@ Johan Vromans <jvromans@squirrel.nl> =head1 COPYRIGHT AND DISCLAIMER -This program is Copyright 1990,2010 by Johan Vromans. +This program is Copyright 1990,2013 by Johan Vromans. This program is free software; you can redistribute it and/or modify it under the terms of the Perl Artistic License or the GNU General Public License as published by the Free Software diff --git a/Master/tlpkg/tlperl/lib/Getopt/Std.pm b/Master/tlpkg/tlperl/lib/Getopt/Std.pm index d4ce9a35eee..ecb7ebbf971 100644 --- a/Master/tlpkg/tlperl/lib/Getopt/Std.pm +++ b/Master/tlpkg/tlperl/lib/Getopt/Std.pm @@ -10,36 +10,45 @@ getopt, getopts - Process single-character switches with switch clustering use Getopt::Std; - getopt('oDI'); # -o, -D & -I take arg. Sets $opt_* as a side effect. - getopt('oDI', \%opts); # -o, -D & -I take arg. Values in %opts getopts('oif:'); # -o & -i are boolean flags, -f takes an argument # Sets $opt_* as a side effect. getopts('oif:', \%opts); # options as above. Values in %opts + getopt('oDI'); # -o, -D & -I take arg. + # Sets $opt_* as a side effect. + getopt('oDI', \%opts); # -o, -D & -I take arg. Values in %opts =head1 DESCRIPTION -The getopt() function processes single-character switches with switch -clustering. Pass one argument which is a string containing all switches -that take an argument. For each switch found, sets $opt_x (where x is the -switch name) to the value of the argument if an argument is expected, -or 1 otherwise. Switches which take an argument don't care whether -there is a space between the switch and the argument. +The C<getopts()> function processes single-character switches with switch +clustering. Pass one argument which is a string containing all switches to be +recognized. For each switch found, if an argument is expected and provided, +C<getopts()> sets C<$opt_x> (where C<x> is the switch name) to the value of +the argument. If an argument is expected but none is provided, C<$opt_x> is +set to an undefined value. If a switch does not take an argument, C<$opt_x> +is set to C<1>. -The getopts() function is similar, but you should pass to it the list of all -switches to be recognized. If unspecified switches are found on the +Switches which take an argument don't care whether there is a space between +the switch and the argument. If unspecified switches are found on the command-line, the user will be warned that an unknown option was given. -The getopts() function returns true unless an invalid option was found. + +The C<getopts()> function returns true unless an invalid option was found. + +The C<getopt()> function is similar, but its argument is a string containing +all switches that take an argument. If no argument is provided for a switch, +say, C<y>, the corresponding C<$opt_y> will be set to an undefined value. +Unspecified switches are silently accepted. B<Use of C<getopts()> is not +recommended.> Note that, if your code is running under the recommended C<use strict -'vars'> pragma, you will need to declare these package variables -with "our": +vars> pragma, you will need to declare these package variables +with C<our>: our($opt_x, $opt_y); -For those of you who don't like additional global variables being created, getopt() -and getopts() will also accept a hash reference as an optional second argument. -Hash keys will be x (where x is the switch name) with key values the value of -the argument or 1 if no argument is specified. +For those of you who don't like additional global variables being created, +C<getopt()> and C<getopts()> will also accept a hash reference as an optional +second argument. Hash keys will be C<x> (where C<x> is the switch name) with +key values the value of the argument or C<1> if no argument is specified. To allow programs to process arguments that look like switches, but aren't, both functions will stop processing switches when they see the argument @@ -72,7 +81,7 @@ and version_mess() with the switches string as an argument. @ISA = qw(Exporter); @EXPORT = qw(getopt getopts); -$VERSION = '1.07'; +$VERSION = '1.10'; # uncomment the next line to disable 1.03-backward compatibility paranoia # $STANDARD_HELP_VERSION = 1; |