diff --git a/Changelog b/Changelog index b114fdc..a2f7b0c 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,9 @@ + 2.16 + - applied patch by Michael Gray 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 , which fixes a bug in the variable interpolation diff --git a/General.pm b/General.pm index 49f2ffa..86606be 100644 --- a/General.pm +++ b/General.pm @@ -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 =head1 VERSION -2.15 +2.16 =cut diff --git a/General/Interpolated.pm b/General/Interpolated.pm index daba9d6..01a799f 100644 --- a/General/Interpolated.pm +++ b/General/Interpolated.pm @@ -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 { # , 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; } diff --git a/README b/README index 87287b6..42e1b50 100644 --- a/README +++ b/README @@ -80,11 +80,11 @@ UPDATE COPYRIGHT Config::General Config::General::Extended - Copyright (c) 2000-2002 by Thomas Linden + Copyright (c) 2000-2003 by Thomas Linden Config::General::Interpolated Copyright (c) 2001 by Wei-Hon Chen - Copyright (c) 2002 by Thomas Linden . + Copyright (c) 2002-2003 by Thomas Linden . 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 \ No newline at end of file + 2.16 \ No newline at end of file