Rename some ExtUtils::ParseXS 'constants'

Make them have properly descriptive, camel case names.

diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
index 2fcef91..38b41cc 100644 (file)
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS.pm
@@ -161,7 +161,7 @@ sub process_file {
 
   # Match an XS keyword
   $self->{BLOCK_re} = '\s*(' .
-    join('|' => @ExtUtils::ParseXS::Constants::keywords) .
+    join('|' => @ExtUtils::ParseXS::Constants::XSKeywords) .
     "|$END)\\s*:";
 
   our ($C_group_rex, $C_arg);

diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
index 4b8d90f..8631063 100644 (file)
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Constants.pm
@@ -11,7 +11,7 @@ ExtUtils::ParseXS::Constants - Initialization values for some globals
 
   use ExtUtils::ParseXS::Constants ();
 
-  $proto_re = $ExtUtils::ParseXS::Constants::proto_re;
+  $PrototypeRegexp = $ExtUtils::ParseXS::Constants::PrototypeRegexp;
 
 =head1 DESCRIPTION
 
@@ -23,13 +23,16 @@ Nothing is exported.  Use fully qualified variable names.
 
 =cut
 
-our @InitFileCode = ();
-our $FH           = Symbol::gensym();
-our $proto_re     = "[" . quotemeta('\$%&*@;[]_') . "]";
-our $Overload     = 0;
-our $errors       = 0;
-our $Fallback     = '&PL_sv_undef';
-our @keywords     = qw( 
+# FIXME: THESE ARE NOT CONSTANTS!
+our @InitFileCode;
+our $FH              = Symbol::gensym();
+our $Overload        = 0;
+our $errors          = 0;
+
+our $Fallback        = '&PL_sv_undef'; # FIXME Check: Is this a constant?
+
+our $PrototypeRegexp = "[" . quotemeta('\$%&*@;[]_') . "]";
+our @XSKeywords      = qw( 
   REQUIRE BOOT CASE PREINIT INPUT INIT CODE PPCODE
   OUTPUT CLEANUP ALIAS ATTRS PROTOTYPES PROTOTYPE
   VERSIONCHECK INCLUDE INCLUDE_COMMAND SCOPE INTERFACE

diff --git a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
index aa5fdf0..637fc67 100644 (file)
--- a/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
+++ b/dist/ExtUtils-ParseXS/lib/ExtUtils/ParseXS/Utilities.pm
@@ -262,7 +262,7 @@ Upon failure, returns C<0>.
 sub valid_proto_string {
   my($string) = @_;
 
-  if ( $string =~ /^$ExtUtils::ParseXS::Constants::proto_re+$/ ) {
+  if ( $string =~ /^$ExtUtils::ParseXS::Constants::PrototypeRegexp+$/ ) {
     return $string;
   }
 
@@ -440,7 +440,7 @@ sub process_single_typemap {
       # skip blank lines
       next if /^$/;
       my($type,$kind, $proto) =
-        m/^\s*(.*?\S)\s+(\S+)\s*($ExtUtils::ParseXS::Constants::proto_re*)\s*$/
+        m/^\s*(.*?\S)\s+(\S+)\s*($ExtUtils::ParseXS::Constants::PrototypeRegexp*)\s*$/
           or warn(
             "Warning: File '$typemap' Line $.  '$logged_line' " .
             "TYPEMAP entry needs 2 or 3 columns\n"