From afb2d8f57d30f2ec0a77af532f8402a2d139911d Mon Sep 17 00:00:00 2001 From: Jeffrey Ryan Thalhammer Date: Sun, 26 Oct 2008 18:50:37 +0000 Subject: [PATCH] Incorporating some of Chris' suggestions. --- lib/Perl/Critic.pm | 2 +- lib/Perl/Critic/Document.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Perl/Critic.pm b/lib/Perl/Critic.pm index 971e06c..fab273f 100644 --- a/lib/Perl/Critic.pm +++ b/lib/Perl/Critic.pm @@ -207,7 +207,7 @@ sub _critique { VIOLATION: for my $violation ( $policy->violates( $element, $doc ) ) { my $line = $violation->location()->[0]; - next VIOLATION if $doc->line_is_disabled($line, $policy_name) + next VIOLATION if $doc->is_line_disabled($line, $policy_name) and not exists $policies_that_cannot_be_disabled{$policy_name}; push @violations, $violation; diff --git a/lib/Perl/Critic/Document.pm b/lib/Perl/Critic/Document.pm index 81ff126..4b41b3a 100644 --- a/lib/Perl/Critic/Document.pm +++ b/lib/Perl/Critic/Document.pm @@ -174,7 +174,7 @@ sub mark_disabled_lines { #----------------------------------------------------------------------------- -sub line_is_disabled { +sub is_line_disabled { my ($self, $line, $policy_name) = @_; return 0 if not exists $self->{_disabled_lines}->{$line}; return 1 if $self->{_disabled_lines}->{$line}->{$policy_name}; -- 1.9.1