From c505d48f91b31fdbcbc58f029d13e32192e28296 Mon Sep 17 00:00:00 2001 From: Len Kranendonk Date: Fri, 23 Jul 2004 21:09:50 +0000 Subject: [PATCH] Fixed the macro 5.8.4 thing --- lib/WebGUI/Macro.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/WebGUI/Macro.pm b/lib/WebGUI/Macro.pm index da0f89ae5..4f12835b1 100644 --- a/lib/WebGUI/Macro.pm +++ b/lib/WebGUI/Macro.pm @@ -44,19 +44,19 @@ These functions are available from this package: =cut - -our $parenthesis = qr /\( # Start with '(', +my $parenthesis; +$parenthesis = qr /\( # Start with '(', (?: # Followed by (?>[^()]+) # Non-parenthesis - |(??{ $::parenthesis }) # Or a balanced parenthesis block + |(??{ $parenthesis }) # Or a balanced parenthesis block )* # zero or more times \)/x; # Ending with ')' - -our $nestedMacro = qr /(\^ # Start with carat +my $nestedMacro; +$nestedMacro = qr /(\^ # Start with carat ([^\^;()]+) # And one or more none-macro characters -tagged- ((?: # Followed by - (??{ $::parenthesis }) # a balanced parenthesis block + (??{ $parenthesis }) # a balanced parenthesis block |(?>[^\^;]) # Or not a carat or semicolon # |(??{ $nestedMacro }) # Or a balanced carat-semicolon block )*) # zero or more times -tagged-