Author: bernhard
Date: Tue May 1 12:48:37 2007
New Revision: 18378
Modified:
trunk/config/init/hints/dragonflybsd.pm
trunk/t/codingstd/c_indent.t
trunk/t/codingstd/linelength.t
trunk/t/configure/03-steplist.t
trunk/t/tools/pmc2cutils/00-qualify.t
trunk/tools/dev/extract_file_descriptions.pl
Log:
#42427: [CAGE] cleanup perlcritic errors
clean up some Perl::Critic errors.
Modified: trunk/config/init/hints/dragonflybsd.pm
==============================================================================
--- trunk/config/init/hints/dragonflybsd.pm (original)
+++ trunk/config/init/hints/dragonflybsd.pm Tue May 1 12:48:37 2007
@@ -4,6 +4,7 @@
package init::hints::dragonflybsd;
use strict;
+use warnings;
sub runstep
{
@@ -27,3 +28,10 @@
}
1;
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/t/codingstd/c_indent.t
==============================================================================
--- trunk/t/codingstd/c_indent.t (original)
+++ trunk/t/codingstd/c_indent.t Tue May 1 12:48:37 2007
@@ -174,7 +174,7 @@
#
# The indentation of the previous line is not considered.
# Check sanity by verifying that the indentation of the current
line
- # is divisible by four.
+ # is divisible by four.
if ($indent % 4 && !$in_comment && $prev_last_char eq ';')
{
push @c_indent => "$path:$line\n"
Modified: trunk/t/codingstd/linelength.t
==============================================================================
--- trunk/t/codingstd/linelength.t (original)
+++ trunk/t/codingstd/linelength.t Tue May 1 12:48:37 2007
@@ -38,7 +38,7 @@
use ExtUtils::Manifest qw( maniread );
# a list of languages where we want to test line length
-my %lang_is_checked = map { $_ => 1 }
+my %lang_is_checked = map { $_ => 1 }
qw{ APL
WMLScript
amber
Modified: trunk/t/configure/03-steplist.t
==============================================================================
--- trunk/t/configure/03-steplist.t (original)
+++ trunk/t/configure/03-steplist.t Tue May 1 12:48:37 2007
@@ -48,3 +48,10 @@
Parrot::Configure::Step::List, F<Configure.pl>.
=cut
+
+# Local Variables:
+# mode: cperl
+# cperl-indent-level: 4
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4:
Modified: trunk/t/tools/pmc2cutils/00-qualify.t
==============================================================================
--- trunk/t/tools/pmc2cutils/00-qualify.t (original)
+++ trunk/t/tools/pmc2cutils/00-qualify.t Tue May 1 12:48:37 2007
@@ -23,7 +23,7 @@
}
}
-# In src/pmc, we should have only .pmc files (81+ of them), 1 .num file,
+# In src/pmc, we should have only .pmc files (81+ of them), 1 .num file,
# and >= .h files none of whose names may begin 'pmc_' (lest they be left over
# from a previous build).
my $suffixqty = scalar(keys %sfx);
@@ -46,20 +46,20 @@
my $message = <<END_OF_MESSAGE;
-The files in this directory test the publicly callable methods of
-Parrot::Pmc2c::Utils. By doing so, they test the functionality
+The files in this directory test the publicly callable methods of
+Parrot::Pmc2c::Utils. By doing so, they test the functionality
of the pmc2c.pl utility.
-Since pmc2c.pl is invoked many times during 'make', tests of its
-functionality can give meaningful results only if you run them
-when your file system under the top-level Parrot directory is in
-a 'pre-make' state, i.e., you have run 'perl Configure.pl' but
-have *not* yet run 'make'. These tests should pass if run at
-that point in the build process, but some will necessarily fail
-if 'make' has already been executed. Hence, they should not be
+Since pmc2c.pl is invoked many times during 'make', tests of its
+functionality can give meaningful results only if you run them
+when your file system under the top-level Parrot directory is in
+a 'pre-make' state, i.e., you have run 'perl Configure.pl' but
+have *not* yet run 'make'. These tests should pass if run at
+that point in the build process, but some will necessarily fail
+if 'make' has already been executed. Hence, they should not be
included in the set of tests run by 'make test'.
-In short, these are tests of Parrot::Pmc2c::Utils but are *not*
+In short, these are tests of Parrot::Pmc2c::Utils but are *not*
tests of Parrot itself.
END_OF_MESSAGE
Modified: trunk/tools/dev/extract_file_descriptions.pl
==============================================================================
--- trunk/tools/dev/extract_file_descriptions.pl (original)
+++ trunk/tools/dev/extract_file_descriptions.pl Tue May 1 12:48:37 2007
@@ -1,8 +1,6 @@
#! perl
-################################################################################
# Copyright (C) 2001-2003, The Perl Foundation.
# $Id$
-################################################################################
=head1 NAME
@@ -61,8 +59,6 @@
=cut
-################################################################################
-
use strict;
use warnings;
use Regexp::Common qw/comment/;
@@ -114,6 +110,7 @@
sub describe_file {
my ($path) = @_;
+
my $info = {};
$info->{path} = $path;
my $text = `cat $info->{path}`;
@@ -129,6 +126,7 @@
sub describe_misc_file {
my ( $info, $text ) = @_;
+
my $top = $text;
clip_excess_lines( $top, 15 );
$top =~ s/^ {0,1}(\S)/ $1/mg; # minimum indent
@@ -138,6 +136,7 @@
sub describe_perl_file {
my ( $info, $text ) = @_;
+
my $desc;
if ( $text =~ /^\#/ ) { # perl file (or sh)
my ($comment) = $text =~ /^(\#[^\n]*\n( *\n)?(\#[^\n]*\n)*)/s;
@@ -183,6 +182,7 @@
sub describe_c_file {
my ( $info, $text ) = @_;
+
my $comment_is_at_beginning = $text =~ /^\/\*/;
my ($first_comment) = $text =~ /($RE{comment}{C})/;
($first_comment) = $text =~ /(($RE{comment}{'C++'}\s*)+)/
@@ -253,7 +253,7 @@
my $cnt = defined $_[1] ? $_[1] : 20;
$_[0] =~ s/(([^\n]*\n){0,$cnt}).*/$1 [...]\n/s
if $_[0] =~ tr/\n/\n/ > $cnt;
- return undef;
+ return;
}
# Local Variables:
