diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add foldl4

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-10-02 08:47:27 +01:00
parent 793907f710
commit c8468f6391
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
library/maplist.yap
View File

@ -33,6 +33,7 @@
foldl2/6, % :Pred, +List, ?V0, ?V, ?W0, ?W foldl2/6, % :Pred, +List, ?V0, ?V, ?W0, ?W
foldl2/7, % :Pred, +List1, ?List2, ?V0, ?V, ?W0, ?W foldl2/7, % :Pred, +List1, ?List2, ?V0, ?V, ?W0, ?W
foldl3/8, % :Pred, +List, ?V0, ?V, ?W0, ?W foldl3/8, % :Pred, +List, ?V0, ?V, ?W0, ?W
foldl4/10, % :Pred, +List, ?V0, ?V, ?W0, ?W, ...
foldl/5, % :Pred, +List1, +List2, ?V0, ?V foldl/5, % :Pred, +List1, +List2, ?V0, ?V
foldl/6, % :Pred, +List1, +List2, +List3, ?V0, ?V foldl/6, % :Pred, +List1, +List2, +List3, ?V0, ?V
foldl/7, % :Pred, +List1, +List2, +List3, +List4, foldl/7, % :Pred, +List1, +List2, +List3, +List4,
@ -71,6 +72,7 @@
foldl2(5, +, +, -, +, -), foldl2(5, +, +, -, +, -),
foldl2(6, +, ?, +, -, +, -), foldl2(6, +, ?, +, -, +, -),
foldl3(5, +, +, -, +, -, +, -), foldl3(5, +, +, -, +, -, +, -),
foldl4(7, +, +, -, +, -, +, -, +, -),
foldl(4, +, +, +, -), foldl(4, +, +, +, -),
foldl(5, +, +, +, +, -), foldl(5, +, +, +, +, -),
foldl(6, +, +, +, +, +, -), foldl(6, +, +, +, +, +, -),
@ -371,6 +373,14 @@ foldl3_([H|T], Goal, V0, V, W0, W, X0, X) :-
call(Goal, H, V0, V1, W0, W1, X0, X1), call(Goal, H, V0, V1, W0, W1, X0, X1),
fold3_(T, Goal, V1, V, W1, W, X1, X). fold3_(T, Goal, V1, V, W1, W, X1, X).
foldl4(Goal, List, V0, V, W0, W, X0, X, Y0, Y) :-
foldl4_(List, Goal, V0, V, W0, W, X0, X, Y0, Y).
foldl4_([], _, V, V, W, W, X, X, Y, Y).
foldl4_([H|T], Goal, V0, V, W0, W, X0, X, Y0, Y) :-
call(Goal, H, V0, V1, W0, W1, X0, X1, Y0, Y1),
foldl4_(T, Goal, V1, V, W1, W, X1, X, Y1, Y).
/******************************* /*******************************
@ -840,6 +850,27 @@ goal_expansion(foldl3(Meta, List, AccIn, AccOut, W0, W, X0, X), Mod:Goal) :-
(RecursionHead :- Apply, RecursiveCall) (RecursionHead :- Apply, RecursiveCall)
], Mod). ], Mod).
goal_expansion(foldl4(Meta, List, AccIn, AccOut, W0, W, X0, X, Y0, Y), Mod:Goal) :-
goal_expansion_allowed,
callable(Meta),
prolog_load_context(module, Mod),
aux_preds(Meta, MetaVars, Pred, PredVars, Proto),
!,
% the new goal
pred_name(foldl4, 8, Proto, GoalName),
append(MetaVars, [List, AccIn, AccOut, W0, W, X0, X, Y0, Y], GoalArgs),
Goal =.. [GoalName|GoalArgs],
% the new predicate declaration
HeadPrefix =.. [GoalName|PredVars],
append_args(HeadPrefix, [[], Acc, Acc, W, W, X, X, Y, Y], Base),
append_args(HeadPrefix, [[In|Ins], Acc1, Acc2, W1, W2, X1, X2, Y1, Y2], RecursionHead),
append_args(Pred, [In, Acc1, Acc3, W1, W3, X1, X3, Y1, Y3], Apply),
append_args(HeadPrefix, [Ins, Acc3, Acc2, W3, W2, X3, X2, Y3, Y2], RecursiveCall),
compile_aux([
Base,
(RecursionHead :- Apply, RecursiveCall)
], Mod).
goal_expansion(mapargs(Meta, In, Out), Mod:NewGoal) :- goal_expansion(mapargs(Meta, In, Out), Mod:NewGoal) :-
goal_expansion_allowed, goal_expansion_allowed,
prolog_load_context(module, Mod), prolog_load_context(module, Mod),