Mailing-List: contact modperl-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@perl.apache.org
Date: 15 Mar 2001 23:59:48 -0000
Message-ID: <20010315235948.68548.qmail@apache.org>
From: dougm@apache.org
To: modperl-2.0-cvs@apache.org
Subject: cvs commit: modperl-2.0/lib/ModPerl FunctionMap.pm TypeMap.pm

dougm       01/03/15 15:59:48

  Modified:    lib/ModPerl FunctionMap.pm TypeMap.pm
  Log:
  do a better job of guessing prefix and package
  
  Revision  Changes    Path
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FunctionMap.pm	2001/03/13 01:36:00	1.2
  +++ FunctionMap.pm	2001/03/15 23:59:45	1.3
  @@ -97,6 +97,10 @@
                   %cur = ();
               }
   
  +            if ($words{PACKAGE}) {
  +                delete $cur{CLASS};
  +            }
  +
               for (keys %words) {
                   $cur{$_} = $words{$_};
               }
  @@ -138,8 +142,6 @@
           for (keys %cur) {
               $entry->{lc $_} = $cur{$_};
           }
  -
  -        $entry->{prefix} ||= guess_prefix($entry);
   
           #avoid 'use of uninitialized value' warnings
           $entry->{$_} ||= "" for keys %{ $entry };
  
  
  
  1.4       +3 -0      modperl-2.0/lib/ModPerl/TypeMap.pm
  
  Index: TypeMap.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/TypeMap.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TypeMap.pm	2001/03/13 04:03:00	1.3
  +++ TypeMap.pm	2001/03/15 23:59:46	1.4
  @@ -215,6 +215,9 @@
       }
   
       $mf->{class}  = $map->{class}  || $self->first_class($mf);
  +
  +    $mf->{prefix} ||= ModPerl::FunctionMap::guess_prefix($mf);
  +
       $mf->{module} = $map->{module} || $mf->{class};
   
       $mf;