Upgrade to Devel::PPPort 3.06_01

[p5sagit/p5-mst-13.2.git] / ext / Devel / PPPort / parts / ppptools.pl

diff --git a/ext/Devel/PPPort/parts/ppptools.pl b/ext/Devel/PPPort/parts/ppptools.pl
index 9e27e62..e78f89a 100644 (file)
--- a/ext/Devel/PPPort/parts/ppptools.pl
+++ b/ext/Devel/PPPort/parts/ppptools.pl
@@ -4,9 +4,9 @@
 #
 ################################################################################
 #
-#  $Revision: 13 $
+#  $Revision: 15 $
 #  $Author: mhx $
-#  $Date: 2005/01/31 08:10:54 +0100 $
+#  $Date: 2005/06/24 19:01:33 +0200 $
 #
 ################################################################################
 #
@@ -211,15 +211,17 @@ sub ppcond
 sub trim_arg
 {
   my $in = shift;
+  my $remove = join '|', qw( NN NULLOK );
 
   $in eq '...' and return ($in);
 
   local $_ = $in;
   my $id;
- 
+
   s/[*()]/ /g;
   s/\[[^\]]*\]/ /g;
   s/\b(?:auto|const|extern|inline|register|static|volatile|restrict)\b//g;
+  s/\b(?:$remove)\b//;
   s/^\s*//; s/\s*$//;
 
   if( /^\b(?:struct|union|enum)\s+\w+(?:\s+(\w+))?$/ ) {
@@ -240,6 +242,7 @@ sub trim_arg
 
   # these don't matter at all
   s/\b(?:auto|extern|inline|register|static|volatile|restrict)\b//g;
+  s/\b(?:$remove)\b//;
 
   s/(?=<\*)\s+(?=\*)//g;
   s/\s*(\*+)\s*/ $1 /g;