Skip to content

ELSE statement for FOREACHes that have no elements #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pplu wants to merge 4 commits into
base: master
Choose a base branch
from
Open

ELSE statement for FOREACHes that have no elements #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
193a38f
ELSE statement for FOREACHes that have no elements
pplu Oct 28, 2015
f0c141c
Fix lists with undef as first value
pplu Oct 28, 2015
5fb8c00
Merge branch 'master' of github.com:abw/Template2
pplu Oct 9, 2018
9b72734
Documentation for the ELSE of a FOREACH
pplu Oct 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/Template/Directive.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,11 @@ sub if {
#------------------------------------------------------------------------

sub foreach {
my ($self, $target, $list, $args, $block, $label) = @_;
my ($self, $target, $list, $args, $block, $else, $label) = @_;
Copy link
Collaborator

@atoomic atoomic Jan 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when I read this, I've the feeling that this going to break previous behaviors where foreach was called with a label, as the label is going to be shift in else statement.

One suggestion would be to move the else as last argument of this function and use an extra helper in the parser that would wrap this function

$args = shift @$args;
$args = @$args ? ', { ' . join(', ', @$args) . ' }' : '';
$label ||= 'LOOP';
$else ||= '';

my ($loop_save, $loop_set, $loop_restore, $setiter);
if ($target) {
Expand All @@ -449,6 +450,7 @@ sub foreach {
$loop_restore = '$stash = $context->delocalise()';
}
$block = pad($block, 3) if $PRETTY;
$else = pad($else, 3) if $PRETTY;

return <<EOF;

Expand All @@ -466,10 +468,14 @@ do {
$loop_save;
\$stash->set('loop', \$_tt_list);
eval {
unless (\$_tt_list->size()){
$else
} else {
$label: while (! \$_tt_error) {
$loop_set;
$block;
(\$_tt_value, \$_tt_error) = \$_tt_list->get_next();
}
}
};
$loop_restore;
Expand Down
Loading