madmaurice/Minilisp.pm
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Catch rogue returns in top-level

Browse source
This commit is contained in:
madmaurice 2021-04-08 21:47:57 +02:00
parent 8bdc8232f9
commit f50550f882
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/Minilisp.pm
View file

@ -428,7 +428,20 @@ sub parser_prog {
return sub { return sub {
my $ctx = shift; my $ctx = shift;
my $result; my $result;
$result = $_->($ctx) foreach (@steps); eval {
$result = $_->($ctx) foreach (@steps);
};
if ($@)
{
if(my $type = ref($@))
{
if($type =~ /^return::(.*)$/)
{
die "return from block $1 outside of any block named $1";
}
}
die "$@";
}
return $result; return $result;
} }
} }
@ -545,7 +558,7 @@ sub create_block {
if ($@) if ($@)
{ {
if (ref($@) eq "BLOCK::$blockname") if (ref($@) eq "return::$blockname")
{ {
return $@->{retval}; return $@->{retval};
} }
@ -563,7 +576,7 @@ sub return_from_block {
my $blockname = shift; my $blockname = shift;
my $retval = shift; my $retval = shift;
die bless({ retval => $retval }, "BLOCK::$blockname"); die bless({ retval => $retval }, "return::$blockname");
} }
sub gen_macro_let { sub gen_macro_let {