From eef4b3cad243feaaa8f0f3ae56dbadc032a82702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Fri, 24 Apr 2009 22:48:24 +0100 Subject: [PATCH] fix apply_macros calling maplist (not that it is very much used, most of always will go through expand_macros). --- library/apply_macros.yap | 2 +- library/maplist.yap | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/library/apply_macros.yap b/library/apply_macros.yap index cad996e57..5e6215863 100644 --- a/library/apply_macros.yap +++ b/library/apply_macros.yap @@ -4,7 +4,7 @@ % Purpose: Macros to apply a predicate to all elements % of a list or to all sub-terms of a term. -:- reexport(apply_macros, [selectlist/3, +:- reexport(library(maplist), [selectlist/3, checklist/2, maplist/2, maplist/3, diff --git a/library/maplist.yap b/library/maplist.yap index 994c2574a..33518ffa7 100644 --- a/library/maplist.yap +++ b/library/maplist.yap @@ -12,13 +12,25 @@ % of a list or to all sub-terms of a term. -:- module(maplist, - [ maplist/2, % :Goal, +List - maplist/3, % :Goal, ?List1, ?List2 - maplist/4, % :Goal, ?List1, ?List2, ?List3 - maplist/5, % :Goal, ?List1, ?List2, ?List3, List4 - forall/2 % :Goal, :Goal - ]). +:- module(maplist, [selectlist/3, + checklist/2, + maplist/2, % :Goal, +List + maplist/3, % :Goal, ?List1, ?List2 + maplist/4, % :Goal, ?List1, ?List2, ?List + maplist/5, % :Goal, ?List1, ?List2, ?List3, List4 + convlist/3, + mapargs/3, + sumargs/4, + mapnodes/3, + checknodes/2, + sumlist/4, + sumnodes/4, + include/3, + exclude/3, + partition/4, + partition/5 + ]). + :- meta_predicate selectlist(:,+,-),