epics/utilities
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only one comma between arguments allowed

Browse Source
This commit is contained in:
zimoch
2013-02-26 13:35:32 +00:00
parent 500f0c6cbd
commit c9195005cf
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dbLoadTemplate
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Header: /cvs/G/EPICS/App/scripts/dbLoadTemplate,v 1.5 2009/09/07 12:02:33 zimoch Exp $
# $Header: /cvs/G/EPICS/App/scripts/dbLoadTemplate,v 1.6 2013/02/26 13:35:32 zimoch Exp $
use strict;
@@ -120,9 +120,9 @@ sub parseSubst {
local %subst;
while (1) {
my $macro;
do {
$macro = expect "$WORD|,|} macro name";
} while $_ eq ","; # ignore commas
$macro = expect "$WORD|,|} macro name";
# one comma allowed
if ($_ eq ",") {$macro = expect "$WORD macro name";}
last if $_ eq '}';
expect "=", "$STRING|$SUBST value for $macro";
$subst{$macro} = $_;
@@ -135,9 +135,9 @@ sub parseSubst {
expect "{";
my @macros;
while (1) {
do {
expect "$WORD|,|} macro name";
} while $_ eq ","; # ignore commas
expect "$WORD|,|} macro name";
# one comma allowed
if ($_ eq ",") {expect "$WORD macro name";}
last if $_ eq '}';
push @macros, $_;
};
@@ -146,9 +146,8 @@ sub parseSubst {
expect "{|} '{' or '}'";
last if $_ eq "}";
foreach my $macro (@macros) {
do {
expect "$STRING|$SUBST|, value for $macro";
} while $_ eq ","; # ignore commas
expect "$STRING|$SUBST|, value for $macro";
if ($_ eq ",") {expect "$STRING|$SUBST value for $macro";}
$subst{$macro} = $_;
}
expect "}";