@@ -17,15 +17,13 @@ use warnings;
17
17
18
18
package Getopt::Long ;
19
19
20
- use vars qw( $VERSION) ;
21
- $VERSION = 2.52;
20
+ our $VERSION = 2.52 ;
21
+
22
22
# For testing versions only.
23
- use vars qw( $VERSION_STRING) ;
24
- $VERSION_STRING = " 2.52" ;
23
+ our $VERSION_STRING = " 2.52" ;
25
24
26
25
use Exporter;
27
- use vars qw( @ISA @EXPORT @EXPORT_OK) ;
28
- @ISA = qw( Exporter) ;
26
+ our @ISA = qw( Exporter) ;
29
27
30
28
# Exported subroutines.
31
29
sub GetOptions (@); # always
@@ -35,21 +33,28 @@ sub Configure(@); # on demand
35
33
sub HelpMessage (@); # on demand
36
34
sub VersionMessage (@); # in demand
37
35
36
+
37
+ # ############### Initialization ################
38
+ # Values for $order. See GNU getopt.c for details.
39
+ our ($REQUIRE_ORDER , $PERMUTE , $RETURN_IN_ORDER ) = (0..2);
40
+ # Version major/minor numbers.
41
+ our ($major_version , $minor_version ) = $VERSION =~ / ^(\d +)\. (\d +)/ ;
42
+
43
+ our (@EXPORT , @EXPORT_OK );
38
44
BEGIN {
39
- # Init immediately so their contents can be used in the 'use vars' below.
40
45
@EXPORT = qw( &GetOptions $REQUIRE_ORDER $PERMUTE $RETURN_IN_ORDER) ;
41
46
@EXPORT_OK = qw( &HelpMessage &VersionMessage &Configure
42
47
&GetOptionsFromArray &GetOptionsFromString) ;
43
48
}
44
49
45
50
# User visible variables.
46
- use vars @EXPORT , @EXPORT_OK ;
47
- use vars qw( $error $debug $major_version $minor_version ) ;
51
+ our ( $error , $debug ) ;
52
+
48
53
# Deprecated visible variables.
49
- use vars qw ( $autoabbrev $getopt_compat $ignorecase $bundling $order
54
+ our ($autoabbrev , $getopt_compat , $ignorecase , $bundling , $order ,
50
55
$passthrough );
51
56
# Official invisible variables.
52
- use vars qw ( $genprefix $caller $gnu_compat $auto_help $auto_version $longprefix) ;
57
+ our ($genprefix , $caller , $gnu_compat , $auto_help , $auto_version , $longprefix );
53
58
54
59
# Really invisible variables.
55
60
my $bundling_values ;
@@ -121,13 +126,6 @@ sub import {
121
126
Configure(@config ) if @config ;
122
127
}
123
128
124
- # ############### Initialization ################
125
-
126
- # Values for $order. See GNU getopt.c for details.
127
- ($REQUIRE_ORDER , $PERMUTE , $RETURN_IN_ORDER ) = (0..2);
128
- # Version major/minor numbers.
129
- ($major_version , $minor_version ) = $VERSION =~ / ^(\d +)\. (\d +)/ ;
130
-
131
129
ConfigDefaults();
132
130
133
131
# ############### OO Interface ################
0 commit comments