From 0e0453966bc055f5377b7425349707c52c8284a5 Mon Sep 17 00:00:00 2001 From: Will Budic Date: Mon, 4 Nov 2024 17:43:57 +1100 Subject: [PATCH] Synch from LifeLog --- system/modules/CNFParser.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/system/modules/CNFParser.pm b/system/modules/CNFParser.pm index 52d8a95..48f23d5 100644 --- a/system/modules/CNFParser.pm +++ b/system/modules/CNFParser.pm @@ -20,6 +20,7 @@ require CNFDateTime; ##no critic Perl::Critic::Policy::ControlStructures::ProhibitMutatingListFunctions use constant VERSION => '3.3.1'; +use constant APPSET => 'APP_SETTINGS'; our @files; our %lists; our %properties; @@ -330,7 +331,7 @@ sub property { my($self, $name) = @_; if($ref eq 'ARRAY'){ return @{$ret} }elsif($ref eq 'PropertyValueStyle'){ - return ${$ret->{plugin}} if $ret->{instructor} eq 'APP_SETTINGS'; + return ${$ret->{plugin}} if $ret->{instructor} eq APPSET; return $ret; } else{ @@ -573,8 +574,8 @@ sub doInstruction { my ($self,$e,$t,$v) = @_; elsif($t eq 'MACRO'){ $instructs{$e}=$v; } - elsif($t eq 'APP_SETTINGS'){ - $self->instructPlugin(InstructedDataItem -> new($e, 'APP_SETTINGS', $v)); + elsif($t eq APPSET){ + $self->instructPlugin(InstructedDataItem -> new($e, APPSET, $v)); } elsif(exists $instructors{$t}){ if(not $instructors{$t}->instruct($e, $v) && $self->{STRICT}){ @@ -1237,7 +1238,7 @@ sub doPlugin { my $pck = $plugin->{package}; my $prp = $plugin->{property}; my $sub = $plugin->{subroutine}; - if($instructor eq 'APP_SETTINGS'){ + if($instructor eq APPSET){ $pck = 'ClassicAppSettings' if ! $pck; ## no critic (RequireBarewordIncludes) require "$pck.pm"; -- 2.34.1