Skip to content
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

compiler: remove NomatchGuard from strict generators #9025

Merged
merged 1 commit into from
Nov 7, 2024
Merged

compiler: remove NomatchGuard from strict generators #9025

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 25 additions & 18 deletions lib/compiler/src/v3_core.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
-record(itry, {anno=#a{},args,vars,body,evars,handler}).
-record(ifilter, {anno=#a{},arg}).
-record(igen, {anno=#a{},acc_pat,acc_guard,
nomatch_pat,nomatch_guard,nomatch_mode,
nomatch_pat,nomatch_mode,
tail,tail_pat,arg,
refill={nomatch,ignore}}).
-record(isimple, {anno=#a{},term :: cerl:cerl()}).
Expand Down Expand Up @@ -1605,7 +1605,6 @@ fun_tq(Cs0, L, St0, NameInfo) ->
lc_tq(Line, E, [#igen{anno=#a{anno=GA}=GAnno,
acc_pat=AccPat,acc_guard=AccGuard,
nomatch_pat=NomatchPat,
nomatch_guard=NomatchGuard,
nomatch_mode=NomatchMode,
tail=Tail,tail_pat=TailPat,
refill={RefillPat,RefillAction},
Expand All @@ -1626,7 +1625,7 @@ lc_tq(Line, E, [#igen{anno=#a{anno=GA}=GAnno,
{[FcVar,Var],St2} = new_vars(2, St1),
Fc = bad_generator([FcVar], FcVar, Arg),
NomatchClause = make_clause([nomatch_clause,compiler_generated|LA],
NomatchPat, [], NomatchGuard, [Nc]),
NomatchPat, [], [], [Nc]),
TailClause = make_clause(LA, TailPat, [], [], [Mc]),
{Lc,Lps,St3} = lc_tq(Line, E, Qs, Sc, St2),
AccClause = make_clause(LA, AccPat, [], AccGuard, Lps ++ [Lc]),
Expand All @@ -1640,7 +1639,15 @@ lc_tq(Line, E, [#igen{anno=#a{anno=GA}=GAnno,
AccPat, [], [], [Sc])
end,
RefillClause = make_clause(LA, RefillPat, [], [], [RefillAction,Sc]),
Cs0 = [AccClause,AccClauseNoGuards,NomatchClause,TailClause,RefillClause],
Cs0 = [AccClause,AccClauseNoGuards|
case TailPat of
#ibinary{segments=[]} ->
%% Order clauses for strict binary generator.
[TailClause,NomatchClause,RefillClause];
_ ->
%% Order clauses for relaxed generator.
[NomatchClause,TailClause,RefillClause]
end],
Cs = [C || C <- Cs0, C =/= nomatch],
Fun = #ifun{anno=GAnno,id=[],vars=[Var],clauses=Cs,fc=Fc},
{#iletrec{anno=GAnno#a{anno=[list_comprehension|GA]},defs=[{{Name,1},Fun}],
Expand Down Expand Up @@ -1680,7 +1687,6 @@ bc_tq(Line, Exp, Qs0, St0) ->
bc_tq1(Line, E, [#igen{anno=#a{anno=GA}=GAnno,
acc_pat=AccPat,acc_guard=AccGuard,
nomatch_pat=NomatchPat,
nomatch_guard=NomatchGuard,
nomatch_mode=NomatchMode,
tail=Tail,tail_pat=TailPat,
refill={RefillPat,RefillAction},
Expand All @@ -1704,7 +1710,7 @@ bc_tq1(Line, E, [#igen{anno=#a{anno=GA}=GAnno,
end,
Fc = bad_generator(FcVars, hd(FcVars), Arg),
NomatchClause = make_clause([compiler_generated,nomatch_clause|LA],
NomatchPat, [IgnoreVar], NomatchGuard, [Nc]),
NomatchPat, [IgnoreVar], [], [Nc]),
TailClause = make_clause(LA, TailPat, [IgnoreVar], [], [AccVar]),
{Bc,Bps,St5} = bc_tq1(Line, E, Qs, AccVar, St4),
Body = Bps ++ [#iset{var=AccVar,arg=Bc},Sc],
Expand All @@ -1719,7 +1725,15 @@ bc_tq1(Line, E, [#igen{anno=#a{anno=GA}=GAnno,
AccPat, [IgnoreVar], [], [Sc])
end,
RefillClause = make_clause(LA, RefillPat, [AccVar], [], [RefillAction,Sc]),
Cs0 = [AccClause,AccClauseNoGuards,NomatchClause,TailClause,RefillClause],
Cs0 = [AccClause,AccClauseNoGuards|
case TailPat of
#ibinary{segments=[]} ->
%% Order clauses for strict binary generator.
[TailClause,NomatchClause,RefillClause];
_ ->
%% Order clauses for relaxed generator.
[NomatchClause,TailClause,RefillClause]
end],
Cs = [C || C <- Cs0, C =/= nomatch],
Fun = #ifun{anno=GAnno,id=[],vars=Vars,clauses=Cs,fc=Fc},

Expand Down Expand Up @@ -1873,7 +1887,6 @@ get_qual_anno(Abstract) -> element(2, Abstract).
%% generator in the qualifier list input.
%% - nomatch_pat is the no-match pattern, e.g. <<X,_:X,Tail/bitstring>>
%% for <<X,1:X>> <= Expr.
%% - nomatch_guard is the list of guards to add to the no-match clause.
%% - nomatch_mode is either skip (not matching elements of the relaxed
%% generator have to be silently skipped by the comprehension) or a
%% value X (to be used in the {badmatch, X} error a strict generator
Expand Down Expand Up @@ -1914,7 +1927,7 @@ generator(Line, {Generate,Lg,P0,E}, Gs, St0) when Generate =:= generate;
end,
{Ce,Pre,St4} = safe(E, St3),
Gen = #igen{anno=#a{anno=GA},acc_pat=AccPat,acc_guard=Cg,
nomatch_pat=NomatchPat,nomatch_guard=[],nomatch_mode=NomatchMode,
nomatch_pat=NomatchPat,nomatch_mode=NomatchMode,
tail=Tail,tail_pat=#c_literal{anno=LA,val=[]},arg={Pre,Ce}},
{Gen,St4};
generator(Line, {Generate,Lg,P,E}, Gs, St0) when Generate =:= b_generate;
Expand Down Expand Up @@ -1965,31 +1978,26 @@ generator(Line, {Generate,Lg,P,E}, Gs, St0) when Generate =:= b_generate;
NomatchPat = Cp#ibinary{segments=SkipSegs},
{Ce,Pre,St5} = safe(E, St4),
Gen = #igen{anno=GAnno,acc_pat=AccPat,acc_guard=Cg,
nomatch_pat=NomatchPat,nomatch_guard=[],nomatch_mode=skip,
nomatch_pat=NomatchPat,nomatch_mode=skip,
tail=Tail,tail_pat=#ibinary{anno=#a{anno=LA},segments=[TailSeg]},
arg={Pre,Ce}},
{Gen,St5};
{#ibinary{segments=Segs}=Cp,St1} when Generate =:= b_generate_strict ->
{AccSegs,Tail,TailSeg,St2} = append_tail_segment(Segs, St1),
AccPat = Cp#ibinary{segments=AccSegs},
{Cg,St3} = lc_guard_tests(Gs, St2),
Guard = #icall{anno=GAnno,
module=#c_literal{anno=GA,val=erlang},
name=#c_literal{anno=GA,val='=/='},
args=[Tail,#c_literal{anno=GA,val= <<>>}]},
{Ce,Pre,St4} = safe(E, St3),
Gen = #igen{anno=GAnno,acc_pat=AccPat,acc_guard=Cg,
nomatch_pat=#ibinary{anno=#a{anno=LA},segments=[TailSeg]},
nomatch_guard=[Guard],
nomatch_mode=Tail,
tail=Tail,tail_pat=#ibinary{anno=#a{anno=LA},segments=[TailSeg]},
tail=Tail,tail_pat=#ibinary{anno=#a{anno=LA},segments=[]},
arg={Pre,Ce}},
{Gen,St4}
catch
throw:nomatch ->
{Ce,Pre,St1} = safe(E, St0),
Gen = #igen{anno=#a{anno=GA},acc_pat=nomatch,acc_guard=[],
nomatch_pat=nomatch,nomatch_guard=[],nomatch_mode=skip,
nomatch_pat=nomatch,nomatch_mode=skip,
tail_pat=#c_var{name='_'},
arg={Pre,Ce}},
{Gen,St1}
Expand Down Expand Up @@ -2089,7 +2097,6 @@ generator(Line, {Generate,Lg,{map_field_exact,_,K0,V0},E}, Gs, St0) when
Gen = #igen{anno=#a{anno=GA},
acc_pat=AccPat,acc_guard=Cg,
nomatch_pat=NomatchPat,
nomatch_guard=[],
nomatch_mode=NomatchMode,
tail=IterVar,tail_pat=#c_literal{anno=LA,val=none},
refill=Refill,
Expand Down
Loading