recurse nested braces in report variables

[barcat.git] / barcat

diff --git a/barcat b/barcat
index 189c8ff72b3688ce8fcd8984313d30503da199d4..e02ce4ed09e9c7f47f53e00a7eda3801cb8fdc47 100755 (executable)
--- a/barcat
+++ b/barcat
@@ -383,11 +383,21 @@ sub show_stat {
 
 sub varfmt {
        my ($fmt, $vars) = @_;
-       $fmt =~ s[\$\{ (\w+) (?<cmd>; (?: [^{}]+ | \{.*?\} )*)? \}]{
-               local $_ = $vars->{$1}; #TODO //
-               $_ = $opt{'value-format'}->($_) if $opt{reformat};
-               eval $+{cmd} if $+{cmd}; #TODO $@
-               $_;
+       $fmt =~ s[\$\{( (?: [^{}]++ | \{(?1)\} )+ )\}]{
+               my ($name, $cmd) = split /\s*;/, $1, 2;
+               local $_ = $vars->{$name};
+               if (defined) {
+                       $_ = $opt{'value-format'}->($_) if $opt{reformat};
+                       if ($cmd) {
+                               eval $cmd;
+                               warn "Error in \$$name report: $@" if $@;
+                       }
+                       $_;
+               }
+               else {
+                       warn "Unknown variable \$$name in report\n";
+                       "\$$name";
+               }
        }eg;
        return $fmt;
 }