The old code used string substitution for every line of the
input string, while perl can also iterate over all matches
via the /g re modifier, and can turn ^ and $ to act as
beginning/end of line via the /m modifier.
Effectively allowing a "match over all lines" via a simple
while ($data =~ /^.*$/gm);
The situation is a little different in SectionConfig because
there's a nested loop invovled which doesn't work with /g.
For this there are two options and I chose the safer one by
simply doing a split on newlines first.
The alternative would be to open the data as a
filehandle-to-string and use <$fh> to read lines, however
I'd have to throw in an eval{} to be sure to close the
handle afterwards.
- while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
+ while ($raw =~ /^\s*(.+?)\s*$/gm) {
-
- next if $line =~ m/^\#/; # skip comment lines
- next if $line =~ m/^\s*$/; # skip empty lines
- if ($line =~ m/^(\S+):\s*(\S+)\s*$/) {
+ next if $line =~ /^#/;
+
+ if ($line =~ m/^(\S+?):\s*(.*)$/) {
my $key = $1;
my $value = $2;
if ($schema->{properties}->{$key} &&
my $key = $1;
my $value = $2;
if ($schema->{properties}->{$key} &&
my $ids = {};
my $order = {};
my $ids = {};
my $order = {};
- my $digest = Digest::SHA::sha1_hex(defined($raw) ? $raw : '');
+ $raw = '' if !defined($raw);
+
+ my $digest = Digest::SHA::sha1_hex($raw);
my $pri = 1;
my $lineno = 0;
my $pri = 1;
my $lineno = 0;
+ my @lines = split(/\n/, $raw);
+ my $nextline = sub {
+ while (my $line = shift @lines) {
+ $lineno++;
+ return $line if $line !~ /^\s*(?:#|$)/;
+ }
+ };
- while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
- my $line = $1;
- $lineno++;
-
- next if $line =~ m/^\#/;
- next if $line =~ m/^\s*$/;
-
+ while (my $line = &$nextline()) {
my $errprefix = "file $filename line $lineno";
my ($type, $sectionId, $errmsg, $config) = $class->parse_section_header($line);
my $errprefix = "file $filename line $lineno";
my ($type, $sectionId, $errmsg, $config) = $class->parse_section_header($line);
- while ($raw && $raw =~ s/^(.*?)(\n|$)//) {
- $line = $1;
- $lineno++;
-
- next if $line =~ m/^\#/;
- last if $line =~ m/^\s*$/;
-
+ while ($line = &$nextline()) {
next if $ignore; # skip
$errprefix = "file $filename line $lineno";
next if $ignore; # skip
$errprefix = "file $filename line $lineno";