check was too strict: comma before closing brace is not nice but legal

This commit is contained in:
zimoch
2013-04-15 15:20:42 +00:00
parent 218a93caa2
commit c5abaf0da8

View File

@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Header: /cvs/G/EPICS/App/scripts/dbLoadTemplate,v 1.7 2013/02/26 14:35:08 zimoch Exp $
# $Header: /cvs/G/EPICS/App/scripts/dbLoadTemplate,v 1.8 2013/04/15 15:20:42 zimoch Exp $
use strict;
@@ -140,7 +140,7 @@ sub parseSubst {
my $macro;
$macro = expect "$WORD|,|} macro name";
# one comma allowed
if ($_ eq ",") {$macro = expect "$WORD macro name";}
if ($_ eq ",") {$macro = expect "$WORD|} macro name";}
last if $_ eq '}';
expect "=", "$STRING|$SUBST value for $macro";
$subst{$macro} = $_;
@@ -155,7 +155,7 @@ sub parseSubst {
while (1) {
expect "$WORD|,|} macro name";
# one comma allowed
if ($_ eq ",") {expect "$WORD macro name";}
if ($_ eq ",") {expect "$WORD|} macro name";}
last if $_ eq '}';
push @macros, $_;
};