From c3ed8d41526221acc233182a85d66973078e8220 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 9 Dec 2014 09:48:58 +0100 Subject: [PATCH] Bug 6679: (follow-up) fix 9 perlcritic violations in C4/TmplTokenType.pm MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Kyle M Hall Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher (cherry picked from commit 8ca35dc7a9291a685a4d22aaf2c18e8023c7be4f) Signed-off-by: Julian Maurice (cherry picked from commit 8022419f58b7dc861f235e568b4abd4c9b26f352) Signed-off-by: Frédéric Demians --- C4/TmplToken.pm | 2 +- C4/TmplTokenType.pm | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/C4/TmplToken.pm b/C4/TmplToken.pm index 05648cea55..9bd959d821 100644 --- a/C4/TmplToken.pm +++ b/C4/TmplToken.pm @@ -92,7 +92,7 @@ sub set_children { # FIXME: DIRECTIVE is not necessarily TMPL_VAR !! sub parameters_and_fields { my $this = shift; - return map { $_->type == C4::TmplTokenType::DIRECTIVE? $_: + return map { $_->type == C4::TmplTokenType::DIRECTIVE() ? $_: ($_->type == C4::TmplTokenType::TAG && $_->string =~ /^{'_kids'}}; diff --git a/C4/TmplTokenType.pm b/C4/TmplTokenType.pm index a08c718924..aaae86d70f 100644 --- a/C4/TmplTokenType.pm +++ b/C4/TmplTokenType.pm @@ -83,15 +83,15 @@ sub to_string { return $this->{'name'} } -sub TEXT { $_text } -sub TEXT_PARAMETRIZED { $_text_parametrized } -sub CDATA { $_cdata } -sub TAG { $_tag } -sub DECL { $_decl } -sub PI { $_pi } -sub DIRECTIVE { $_directive } -sub COMMENT { $_comment } -sub UNKNOWN { $_unknown } +sub TEXT { $_text } +sub TEXT_PARAMETRIZED { $_text_parametrized } +sub CDATA { $_cdata } +sub TAG { $_tag } +sub DECL { $_decl } +sub PI { $_pi } +sub DIRECTIVE { $_directive } +sub COMMENT { $_comment } +sub UNKNOWN { $_unknown } ############################################################################### -- 2.39.5