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

2.16

Browse Source 
- applied patch by Michael Gray <mjg17@eng.cam.ac.uk> which
	   fixes a bug in the Interpolate.pm submodule. A second variable,
	   when immediately following the first, did not get interpolated,
	   i.e. ${var1}${var2}.


git-svn-id: http://dev.catalyst.perl.org/repos/Config-General/trunk@42 be1acefe-a474-0410-9a34-9b3221f2030f
This commit is contained in:
Thomas von Dein
2009-10-10 16:26:58 +00:00
parent 5e99e1f8b2
commit 4575d2a052
4 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Changelog
View File

@@ -1,3 +1,9 @@
2.16
- applied patch by Michael Gray <mjg17@eng.cam.ac.uk> which
fixes a bug in the Interpolate.pm submodule. A second variable,
when immediately following the first, did not get interpolated,
i.e. ${var1}${var2}.
2.15 - fixed Bug in SaveConfig***, which didn't work.
- applied patch by Robb Canfield <robb@canfield.com>,
which fixes a bug in the variable interpolation

4
General.pm
View File

@@ -17,7 +17,7 @@ use strict;
use Carp;
use Exporter;
$Config::General::VERSION = "2.15";
$Config::General::VERSION = "2.16";
use vars qw(@ISA @EXPORT);
@ISA = qw(Exporter);
@@ -1800,7 +1800,7 @@ Thomas Linden <tom@daemon.de>
=head1 VERSION
2.15
2.16
=cut

23
General/Interpolated.pm
View File

@@ -1,5 +1,5 @@
package Config::General::Interpolated;
$Config::General::Interpolated::VERSION = "2.01";
$Config::General::Interpolated::VERSION = "2.02";
use strict;
use Carp;
@@ -33,16 +33,17 @@ sub _set_regex {
# <autrijus@autrijus.org>, and I made some modifications.
# thanx, autrijus. :)
my $regex = qr{
(^|[^\\]) # $1: can be the beginning of the line
# but can't begin with a '\'
\$ # dollar sign
(\{)? # $2: optional opening curly
([a-zA-Z_]\w*) # $3: capturing variable name
(
?(2) # $4: if there's the opening curly...
\} # ... match closing curly
)
}x;
(^|\G|[^\\]) # $1: can be the beginning of the line
# or the beginning of next match
# but can't begin with a '\'
\$ # dollar sign
(\{)? # $2: optional opening curly
([a-zA-Z_]\w*) # $3: capturing variable name
(
?(2) # $4: if there's the opening curly...
\} # ... match closing curly
)
}x;
return $regex;
}

6
README
View File

@@ -80,11 +80,11 @@ UPDATE
COPYRIGHT
Config::General
Config::General::Extended
Copyright (c) 2000-2002 by Thomas Linden <tom@daemon.de>
Copyright (c) 2000-2003 by Thomas Linden <tom@daemon.de>
Config::General::Interpolated
Copyright (c) 2001 by Wei-Hon Chen <plasmaball@pchome.com.tw>
Copyright (c) 2002 by Thomas Linden <tom@daemon.de>.
Copyright (c) 2002-2003 by Thomas Linden <tom@daemon.de>.
This library is free software; you can redistribute it
and/or modify it under the same terms as Perl itself.
@@ -104,4 +104,4 @@ AUTHOR
VERSION
2.14
2.16