cvs commit: modperl-2.0/lib/ModPerl FunctionMap.pm WrapXS.pm

[dougm]

dougm       01/05/02 21:56:32

  Modified:    lib/ModPerl FunctionMap.pm WrapXS.pm
  Log:
  more better prefix guessing
  
  Revision  Changes    Path
  1.7       +4 -3      modperl-2.0/lib/ModPerl/FunctionMap.pm
  
  Index: FunctionMap.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/FunctionMap.pm,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FunctionMap.pm    2001/04/20 03:07:53     1.6
  +++ FunctionMap.pm    2001/05/03 04:56:31     1.7
  @@ -65,12 +65,13 @@
       my($name, $class) = ($entry->{name}, $entry->{class});
       my $prefix = "";
       $name =~ s/^DEFINE_//;
  +    $name =~ s/^mpxs_//i;
   
       (my $guess = lc($entry->{class} || $entry->{module}) . '_') =~ s/::/_/g;
  -    $guess =~ s/apache_/ap_/;
  +    $guess =~ s/(apache)_/($1|ap)_{1,2}/;
   
  -    if ($name =~ /^$guess/) {
  -        $prefix = $guess;
  +    if ($name =~ s/^($guess).*/$1/i) {
  +        $prefix = $1;
       }
       else {
           if ($name =~ /^(apr?_)/) {
  
  
  
  1.13      +1 -0      modperl-2.0/lib/ModPerl/WrapXS.pm
  
  Index: WrapXS.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/WrapXS.pm,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- WrapXS.pm 2001/05/03 04:01:53     1.12
  +++ WrapXS.pm 2001/05/03 04:56:31     1.13
  @@ -87,6 +87,7 @@
             @{ $func } {qw(dispatch orig_args)};
   
           if ($dispatch =~ /^MPXS_/) {
  +            $name =~ s/^mpxs_//;
               $name =~ s/^$func->{prefix}//;
               push @{ $self->{newXS}->{ $module } },
                 ["$class\::$name", $dispatch];