epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

tools/DBD: Improve error reporting

Browse Source 
Better 'duplicate choice' message
Output messages to STDERR
This commit is contained in:
Andrew Johnson
2012-06-27 11:58:23 -05:00
parent 6595ff9518
commit 05f07d9ec8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/DBD/Base.pm
+2 -4
View File
@@ -42,14 +42,12 @@ sub popContext {
sub dieContext {
my ($msg) = join "\n\t", @_;
print "$msg\n" if $msg;
die "Context: ", join(' in ', @context), "\n";
die "$msg\nContext: ", join(' in ', @context), "\n";
}
sub warnContext {
my ($msg) = join "\n\t", @_;
print "$msg\n" if $msg;
print "Context: ", join(' in ', @context), "\n";
print STDERR "$msg\nContext: ", join(' in ', @context), "\n";
}
src/tools/DBD/Menu.pm
+4 -2
View File
@@ -15,8 +15,10 @@ sub add_choice {
$name = identifier($name, "Choice name");
unquote $value;
foreach $pair ($this->choices) {
dieContext("Duplicate choice name") if ($pair->[0] eq $name);
dieContext("Duplicate choice string") if ($pair->[1] eq $value);
dieContext("Duplicate menu choice name '$name'")
if ($pair->[0] eq $name);
dieContext("Duplicate menu choice string '$value'")
if ($pair->[1] eq $value);
}
push @{$this->{CHOICE_LIST}}, [$name, $value];
$this->{CHOICE_INDEX}->{$value} = $name;