Skip to content

Commit e99db4f

Browse files
committed
Make the changes Davide Cervone suggested. I.e., use defined to avoid
the possibility of the negation empty strings or 0 from being true, remove unneeded derefencing, and don't bother with defining an empty hash as it will get defined on first use anyway.
1 parent 483fe3c commit e99db4f

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

macros/parserMultiAnswer.pl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -417,15 +417,14 @@ sub setMessage {
417417
#
418418
sub ANS_NAME {
419419
my $self = shift; my $i = shift;
420-
$self->{answerNames} = {} if !defined($self->{answerNames});
421-
return $self->{answerNames}->{$i} if defined($self->{answerNames}->{$i});
420+
return $self->{answerNames}{$i} if defined($self->{answerNames}{$i});
422421
if ($self->{singleResult}) {
423-
$self->{answerNames}->{0} = main::NEW_ANS_NAME() if (!$self->{answerNames}->{0});
424-
$self->{answerNames}->{$i} = $answerPrefix.$self->{answerNames}->{0}."_".$i unless $i == 0;
422+
$self->{answerNames}{0} = main::NEW_ANS_NAME() unless defined($self->{answerNames}{0});
423+
$self->{answerNames}{$i} = $answerPrefix.$self->{answerNames}{0}."_".$i unless $i == 0;
425424
} else {
426-
$self->{answerNames}->{$i} = main::NEW_ANS_NAME();
425+
$self->{answerNames}{$i} = main::NEW_ANS_NAME();
427426
}
428-
return $self->{answerNames}->{$i};
427+
return $self->{answerNames}{$i};
429428
}
430429

431430
#
@@ -452,7 +451,7 @@ sub ans_rule {
452451
if ($self->{singleResult} && $self->{part} > 1) {
453452
my $extension_ans_rule =
454453
$data->named_ans_rule_extension(
455-
$name,$size, answer_group_name => $self->{answerNames}->{0},
454+
$name,$size, answer_group_name => $self->{answerNames}{0},
456455
@_);
457456
# warn "extension rule created: $extension_ans_rule for ", ref($data);
458457
return $extension_ans_rule;
@@ -473,12 +472,12 @@ sub ans_array {
473472
if ($self->{singleResult} && $self->{part} == 1) {
474473
my $label = main::generate_aria_label($answerPrefix.$name."_0");
475474
return $data->named_ans_array($name,$size,
476-
answer_group_name => $self->{answerNames}->{0},
475+
answer_group_name => $self->{answerNames}{0},
477476
@_,aria_label=>$label);
478477
}
479478
if ($self->{singleResult} && $self->{part} > 1) {
480479
$HTML = $data->named_ans_array_extension($self->NEW_NAME($name),$size,
481-
answer_group_name => $self->{answerNames}->{0}, @_);
480+
answer_group_name => $self->{answerNames}{0}, @_);
482481
# warn "array extension rule created: $HTML for ", ref($data);
483482
} else {
484483
$HTML = $data->named_ans_array($name,$size,@_);

0 commit comments

Comments
 (0)