Commit5186538

authored and

committed

Make eval statement naturally proof against perltidy

This is a bit less verbose than adding an exception. Rewritethe other eval statement in Catalog.pm as well, just forthe sake of consistency.Idea from Andrew DunstanDiscussion:https://www.postgresql.org/message-id/CAD5tBc%2BzRhuWn_S4ayH2sWKe60FQu1guTTokDFS3YMOeSrsozA%40mail.gmail.com

1 parentb29e6af commit5186538Copy full SHA for 5186538

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -315,10 +315,7 @@ sub ParseData`
`315`	`315`	`# We're treating the input line as a piece of Perl, so we`
`316`	`316`	`# need to use string eval here. Tell perlcritic we know what`
`317`	`317`	`# we're doing.`
`318`		`-#<<< protect next line from perltidy`
`319`		`-# so perlcritic annotation works`
`320`		`-eval'$hash_ref =' .$_;## no critic (ProhibitStringyEval)`
`321`		`-#>>>`
	`318`	`+eval"\$hash_ref =$_";## no critic (ProhibitStringyEval)`
`322`	`319`	`if (!ref$hash_ref)`
`323`	`320`	`{`
`324`	`321`	`die"$input_file: error parsing line$.:\n$_\n";`
`@@ -364,7 +361,7 @@ sub ParseData`
`364`	`361`	`# the whole file at once.`
`365`	`362`	`local$/;`
`366`	`363`	`my$full_file = <$ifd>;`
`367`		`-eval'$data =' .$full_file## no critic (ProhibitStringyEval)`
	`364`	`+eval"\$data =$full_file"## no critic (ProhibitStringyEval)`
`368`	`365`	`ordie"error parsing$input_file\n";`
`369`	`366`	`foreachmy$hash_ref (@{$data})`
`370`	`367`	`{`

Comments

(0)