Clean up some perlcritic warnings

adunstan · adunstan · commit d2c1512ac48c · 2018-05-07T15:35:32.000-04:00
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.
diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
@@ -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";
diff --git a/src/backend/utils/Gen_dummy_probes.pl b/src/backend/utils/Gen_dummy_probes.pl
@@ -14,6 +14,9 @@
 #
 #-------------------------------------------------------------------------
 
+# turn off perlcritic for autogened code
+## no critic
+
 $0 =~ s/^.*?(\w+)[\.\w+]*$/$1/;
 
 use strict;
diff --git a/src/pl/plperl/plc_perlboot.pl b/src/pl/plperl/plc_perlboot.pl
@@ -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;
 
diff --git a/src/pl/plperl/plc_trusted.pl b/src/pl/plperl/plc_trusted.pl
@@ -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.
 #

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,10 @@ sub ParseData`
`250`	`250`
`251`	`251`	`if ($lcnt == $rcnt)`
`252`	`252`	`{`
`253`		`- eval '$hash_ref = ' . $_;`
	`253`	`+ # We're treating the input line as a piece of Perl, so we`
	`254`	`+ # need to use string eval here. Tell perlcritic we know what`
	`255`	`+ # we're doing.`
	`256`	`+ eval '$hash_ref = ' . $_; ## no critic (ProhibitStringyEval)`
`254`	`257`	`if (!ref $hash_ref)`
`255`	`258`	`{`
`256`	`259`	`die "$input_file: error parsing line $.:\n$_\n";`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`#`
`15`	`15`	`#-------------------------------------------------------------------------`
`16`	`16`
	`17`	`+# turn off perlcritic for autogened code`
	`18`	`+## no critic`
	`19`	`+`
`17`	`20`	`$0 =~ s/^.?(\w+)[\.\w+]$/$1/;`
`18`	`21`
`19`	`22`	`use strict;`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@ sub ::encode_array_constructor`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`{`
`54`		`-`
`55`		`- package PostgreSQL::InServer`
`56`		`- ; ## no critic (RequireFilenameMatchesPackage);`
	`54`	`+#<<< protect next line from perltidy so perlcritic annotation works`
	`55`	`+ package PostgreSQL::InServer; ## no critic (RequireFilenameMatchesPackage)`
	`56`	`+#>>>`
`57`	`57`	`use strict;`
`58`	`58`	`use warnings;`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`# src/pl/plperl/plc_trusted.pl`
`2`	`2`
`3`		`-package PostgreSQL::InServer::safe`
`4`		`- ; ## no critic (RequireFilenameMatchesPackage);`
	`3`	`+#<<< protect next line from perltidy so perlcritic annotation works`
	`4`	`+package PostgreSQL::InServer::safe; ## no critic (RequireFilenameMatchesPackage)`
	`5`	`+#>>>`
`5`	`6`
`6`	`7`	`# Load widely useful pragmas into plperl to make them available.`
`7`	`8`	`#`