[kaffe] CVS kaffe (doogie): For each file, include the count of warnings.

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Sat Apr 3 21:06:02 2004


PatchSet 4618 
Date: 2004/04/04 05:02:55
Author: doogie
Branch: HEAD
Tag: (none) 
Log:
* For each file, include the count of warnings.
* No longer print Param: when there are no params.
* When there are no params, print Line: with no blank lines.

Members: 
	ChangeLog:1.2195->1.2196 
	scripts/sort-warnings.pl:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2195 kaffe/ChangeLog:1.2196
--- kaffe/ChangeLog:1.2195	Sun Apr  4 04:52:35 2004
+++ kaffe/ChangeLog	Sun Apr  4 05:02:55 2004
@@ -1,5 +1,12 @@
 2004-04-03  Adam Heath <doogie@debian.org>
 
+        * scripts/sort-warnings.pl:
+	  * For each file, include the count of warnings.
+	  * No longer print Param: when there are no params.
+	  * When there are no params, print Line: with no blank lines.
+
+2004-04-03  Adam Heath <doogie@debian.org>
+
 	* config/i386/jit3-i386.def, kaffe/kaffevm/jit3/funcs.c:
 	  Fix 641 'use of compound as lvalue is deprecated' warnings.
 
Index: kaffe/scripts/sort-warnings.pl
diff -u kaffe/scripts/sort-warnings.pl:1.3 kaffe/scripts/sort-warnings.pl:1.4
--- kaffe/scripts/sort-warnings.pl:1.3	Sun Apr  4 03:43:25 2004
+++ kaffe/scripts/sort-warnings.pl	Sun Apr  4 05:02:56 2004
@@ -108,7 +108,7 @@
 		my ( $file, $line, ) = ( shift( @matches ), shift( @matches ) );
 		$file =~ s,(?:(?:\.\./)+|/tmp/topic/)(include|kaffe|libraries|config)/,$1/,;
 		next if ( $file =~ m,^/, );
-		push( @{ $errors{ $type }{ $file }{ $line } }, [ @matches ] );
+		push( @{ $errors{ $type }{ $file }{ $line } }, [ grep( { defined( $_ ) } @matches ) ] );
 		$allfiles{ $file } = 1;
 		$error_counts{ $type }++;
 		$count++;
@@ -125,15 +125,20 @@
 	my $h1 = $errors{ $type };
 	print( "Type: $type\nCount: $error_counts{ $type }\n" );
 	foreach my $file ( sort( keys( %$h1 ) ) ) {
-		print( "\tFile: $file\n" );
+		my @text = ();
+		my $file_warning_count = 0;
 		my $h2 = $h1->{ $file };
 		foreach my $line ( sort( { $a <=> $b } keys( %$h2 ) ) ) {
 			my $params = $h2->{ $line };
 			foreach my $param ( @$params ) {
-				print( "\t\tLine: $line\n" );
-				print( "\t\tParams: " . join( ',', grep( { defined( $_ ) } @$param ) ) . "\n\n" ) if ( @$params );
+				my $text .= "\t\tLine: $line\n";
+				$text .= "\t\tParams: " . join( ',', @$param ) . "\n" if ( @$param );
+				push( @text, $text );
+				$file_warning_count++;
 			}
 		}
+		print( "\tFile: $file ($file_warning_count)\n" );
+		print( join( "", @text ) . "\n" );
 	}
 }
 print( $text );