- fixed rt.cpan.org#31529 variable inheritance failed
	  with multiple named blocks.

	- fixed rt.cpan.org#33447, regex to catch variable
	  names were too strict, now - . + or : are allowed too.

	- fixed rt.cpan.org#33385 and #32978 - using arrayrefs
	  as param to -String didn't work anymore (sic)

	- fixed rt.cpan.org#33216 - variable stack were not properly
	  re-constructed for pre-existing variables if 
	  -MergeDuplicateOptions is turned on.


git-svn-id: http://dev.catalyst.perl.org/repos/Config-General/trunk@64 be1acefe-a474-0410-9a34-9b3221f2030f
This commit is contained in:
Thomas von Dein
2009-10-10 16:43:18 +00:00
parent f85e18462c
commit 61397677d3
5 changed files with 54 additions and 13 deletions

View File

@@ -8,7 +8,7 @@
#
package Config::General::Interpolated;
$Config::General::Interpolated::VERSION = "2.09";
$Config::General::Interpolated::VERSION = "2.10";
use strict;
use Carp;
@@ -47,7 +47,7 @@ sub _set_regex {
# but can't begin with a '\'
\$ # dollar sign
(\{)? # $2: optional opening curly
([a-zA-Z_]\w*) # $3: capturing variable name
([a-zA-Z0-9_\-\.:\+,]+) # $3: capturing variable name (fix of #33447)
(
?(2) # $4: if there's the opening curly...
\} # ... match closing curly