Clean up some perlcritic warnings

In Catalog.pm, mark eval of a string instead of a block as allowed.
Disallow perlcritic completely in Gen_dummy_probes.pl, as it's
generated code.
Protect a couple of lines in plperl code from  perltidy, so that the
annotation for perlcritic stays on the same line as the construct it
would otherwise object to.
This commit is contained in:
Andrew Dunstan 2018-05-07 15:21:00 -04:00
parent 17551f1a21
commit d2c1512ac4
4 changed files with 13 additions and 6 deletions

View File

@ -250,7 +250,10 @@ sub ParseData
if ($lcnt == $rcnt)
{
eval '$hash_ref = ' . $_;
# We're treating the input line as a piece of Perl, so we
# need to use string eval here. Tell perlcritic we know what
# we're doing.
eval '$hash_ref = ' . $_; ## no critic (ProhibitStringyEval)
if (!ref $hash_ref)
{
die "$input_file: error parsing line $.:\n$_\n";

View File

@ -14,6 +14,9 @@
#
#-------------------------------------------------------------------------
# turn off perlcritic for autogened code
## no critic
$0 =~ s/^.*?(\w+)[\.\w+]*$/$1/;
use strict;

View File

@ -51,9 +51,9 @@ sub ::encode_array_constructor
}
{
package PostgreSQL::InServer
; ## no critic (RequireFilenameMatchesPackage);
#<<< protect next line from perltidy so perlcritic annotation works
package PostgreSQL::InServer; ## no critic (RequireFilenameMatchesPackage)
#>>>
use strict;
use warnings;

View File

@ -1,7 +1,8 @@
# src/pl/plperl/plc_trusted.pl
package PostgreSQL::InServer::safe
; ## no critic (RequireFilenameMatchesPackage);
#<<< protect next line from perltidy so perlcritic annotation works
package PostgreSQL::InServer::safe; ## no critic (RequireFilenameMatchesPackage)
#>>>
# Load widely useful pragmas into plperl to make them available.
#