Skip to content
Snippets Groups Projects
Commit ecdeb969 authored by Karl-Hermann Wieners's avatar Karl-Hermann Wieners
Browse files

Global: fixes related to perl-5.26 compatibility (for ... qw syntax)

parent 5a34616d
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@ Global
use global variables in directories
* namelist2config: re-enable here-doc detection to remove spurious data,
use global variables in namelists and output
* Fixes related to python3 compatibility (make clean)
* Fixes related to python3 and perl-5.26 compatibility
* Added tools to find differences/similarities between config files
(compconfig.py, diffconfig.py)
......
......@@ -82,7 +82,7 @@ sub subst_value($) {
$value =~ s/$opts{o}_$opts{O}(\w)/\${$subst_map{o}}_\${$subst_map{O}}$1/;
$value =~ s/$opts{o}_$opts{O}/\${$subst_map{o}}_\$$subst_map{O}/;
}
for my $var qw(a A o O) {
for my $var (qw(a A o O)) {
if($opts{$var}) {
$value =~ s:([-_/])$opts{$var}(\w):$1\${$subst_map{$var}}$2:;
$value =~ s:([-_/])$opts{$var}:$1\$$subst_map{$var}:;
......
......@@ -74,14 +74,14 @@ sub subst_value($) {
$value =~ s/$opts{o}_$opts{O}(\w)/\${$subst_map{o}}_\${$subst_map{O}}$1/;
$value =~ s/$opts{o}_$opts{O}/\${$subst_map{o}}_\$$subst_map{O}/;
}
for my $var qw(a A o O) {
for my $var (qw(a A o O)) {
if($opts{$var}) {
$value =~ s:([-_/])$opts{$var}(\w):$1\${$subst_map{$var}}$2:;
$value =~ s:([-_/])$opts{$var}:$1\$$subst_map{$var}:;
}
}
### for my $var (keys %subst_map) {
for my $var qw(I F) {
for my $var (qw(I F)) {
if($opts{$var}) {
$value =~ s/$opts{$var}(\w)/\${$subst_map{$var}}$1/;
$value =~ s/$opts{$var}/\$$subst_map{$var}/;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment