scip/Config-General
1
0
Fork 0
mirror of https://codeberg.org/scip/Config-General.git synced 2025-12-17 04:31:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

2.03 - fixed bug in the _parse() routine (better: design flaw).

Browse Source 
after the last patch for allowing whitespaces in
	   option names, it had a problem with here-docs which
	   contained equal signs. option/value splitting resulted
	   in weird output.

	 - as a side effect of the bug fix below it is now
	   possible to use equal signs inside quoted values, which
	   will then be ignored, thus not used for splitting
	   the line into an option/value assignment.

	 - added a new test, which tests for all possible notations
	   of option/value lines.


git-svn-id: http://dev.catalyst.perl.org/repos/Config-General/trunk@29 be1acefe-a474-0410-9a34-9b3221f2030f
This commit is contained in:
Thomas von Dein
2009-10-10 16:22:10 +00:00
parent 8a7ed54c44
commit f5ac2b6b75
6 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
General.pm
View File

@@ -17,7 +17,7 @@ use strict;
use Carp;
use Exporter;
$Config::General::VERSION = "2.02";
$Config::General::VERSION = "2.03";
use vars qw(@ISA @EXPORT);
@ISA = qw(Exporter);
@@ -344,24 +344,30 @@ sub _parse {
my($this, $config, $content) = @_;
my(@newcontent, $block, $blockname, $grab, $chunk,$block_level);
local $_;
my $indichar = chr(182); # <20>, inserted by _open, our here-doc indicator
foreach (@{$content}) { # loop over content stack
chomp;
$chunk++;
$_ =~ s/^\s*//; # strip spaces @ end and begin
$_ =~ s/\s*$//;
# my ($option,$value) = split /\s*=\s*|\s+/, $_, 2; # option/value assignment, = is optional
#
# build option value assignment, split current input
# using whitespace, equal sign or optionally here-doc
# separator (ascii 182).
my ($option,$value);
if (/$indichar/) {
($option,$value) = split /\s*$indichar\s*/, $_, 2; # separated by heredoc-finding in _open()
}
elsif (/^[^\"]+?=/) {
($option,$value) = split /\s*=\s*/, $_, 2; # using equal if not inside quotes
}
else {
($option,$value) = split /\s+/, $_, 2; # option/value assignment, = is optional
}
my ($option,$value);
if (/=/) {
($option,$value) = split /\s*=\s*/, $_, 2; # option/value assignment, = is optional
}
else {
($option,$value) = split /\s+/, $_, 2; # option/value assignment, = is optional
}
my $indichar = chr(182); # <20>, inserted by _open, our here-doc indicator
$value =~ s/^$indichar// if($value); # a here-doc begin, remove indicator
if ($value && $value =~ /^"/ && $value =~ /"$/) {
$value =~ s/^"//; # remove leading and trailing "
$value =~ s/"$//;
@@ -1575,7 +1581,7 @@ Thomas Linden <tom@daemon.de>
=head1 VERSION
2.02
2.03
=cut