From ac9be28857f638a1605d4d8e08fabaf386a2cc5d Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 20 Aug 2009 19:24:39 +0000
Subject: [PATCH] add a few additional macro tests

---
 lib/WebGUI/Macro.pm | 6 +++---
 t/Macro.t           | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/WebGUI/Macro.pm b/lib/WebGUI/Macro.pm
index 7b5045903..f08dd7678 100644
--- a/lib/WebGUI/Macro.pm
+++ b/lib/WebGUI/Macro.pm
@@ -162,7 +162,7 @@ sub _processMacro {
     $parameters =~ s/\)$//;
 
     my @params;
-    while ($parameters =~ /
+    while ($parameters =~ m{
         (?<!\z)                             # don't try to match if we are at the end of the string
         (?:                                 # either
             \s* "                               # white space followed by a double quote
@@ -188,9 +188,9 @@ sub _processMacro {
         |                                   # or
             ,                                   # a comma
         )
-    /xg) {
+    }xg) {
         # three matches, only one will exist per run
-        push @params, defined $1 ? $1 : defined $2 ? $2 : $3;
+        push @params, $+;
     }
 
     for my $param (@params) {
diff --git a/t/Macro.t b/t/Macro.t
index b0d57852c..0821dacf1 100644
--- a/t/Macro.t
+++ b/t/Macro.t
@@ -44,7 +44,7 @@ foreach my $macro (qw/
 }
 $session->config->addToHash('macros', "Ex'tras", "Extras");
 
-plan tests => 39;
+plan tests => 42;
 
 my $macroText = "CompanyName: ^c;";
 my $companyName = $session->setting->get('companyName');
@@ -236,6 +236,9 @@ tie my %quotingEdges, 'Tie::IxHash';
         => '@MacroCall[`@MacroCall[`something`.`something else`]:`.`more still`]:',
     q{^VisualMacro("^VisualMacro('something', 'something else');", "more still");}
         => '@MacroCall[`@MacroCall[`something`.`something else`]:`.`more still`]:',
+    '^VisualMacro(,,);'                             => '@MacroCall[``.``]:',
+    '^VisualMacro("","",);'                         => '@MacroCall[``.``]:',
+    '^VisualMacro(,,"");'                           => '@MacroCall[``.``.``]:',
 );
 while (my ($inText, $outText) = each %quotingEdges) {
     my $procText = $inText;