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

make sublist from hprolog and sublist from yap be the same beast.

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-03-15 14:19:05 +00:00
parent 9cce7df45b
commit cfc0a23953
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
library/dialect/hprolog.yap
View File

@ -38,7 +38,7 @@
split_at/4, % +N, +List, -FirstElements, -LastElements split_at/4, % +N, +List, -FirstElements, -LastElements
max_go_list/2, % +List, -Max max_go_list/2, % +List, -Max
or_list/2, % +ListOfInts, -BitwiseOr or_list/2, % +ListOfInts, -BitwiseOr
chr_sublist/2, % ?Sublist, +List sublist/2, % ?Sublist, +List
bounded_sublist/3, % ?Sublist, +List, +Bound bounded_sublist/3, % ?Sublist, +List, +Bound
chr_delete/3, chr_delete/3,
init_store/2, init_store/2,
@ -54,7 +54,10 @@
put_ds/4 put_ds/4
% lookup_ht1/4 % lookup_ht1/4
]). ]).
:- use_module(library(lists)).
:- reexport('../lists',[sublist/2]).
%:- use_module(library(lists)).
:- use_module(library(assoc)). :- use_module(library(assoc)).
/** <module> hProlog compatibility library /** <module> hProlog compatibility library
@ -93,7 +96,7 @@ make_update_store_goal(Name,Value,Goal) :- Goal = b_setval(Name,Value).
*******************************/ *******************************/
%% substitute_eq(+OldVal, +OldList, +NewVal, -NewList) %% substitute_eq(+OldVal, +OldList, +NewVal, -NewList)
% %
% Substitute OldVal by NewVal in OldList and unify the result % Substitute OldVal by NewVal in OldList and unify the result
% with NewList. % with NewList.
@ -107,7 +110,7 @@ substitute_eq(X, [U|Us], Y, [V|Vs]) :-
). ).
%% memberchk_eq(+Val, +List) %% memberchk_eq(+Val, +List)
% %
% Deterministic check of membership using == rather than % Deterministic check of membership using == rather than
% unification. % unification.
@ -120,7 +123,7 @@ memberchk_eq(X, [Y|Ys]) :-
% :- load_foreign_library(chr_support). % :- load_foreign_library(chr_support).
%% list_difference_eq(+List, -Subtract, -Rest) %% list_difference_eq(+List, -Subtract, -Rest)
% %
% Delete all elements of Subtract from List and unify the result % Delete all elements of Subtract from List and unify the result
% with Rest. Element comparision is done using ==/2. % with Rest. Element comparision is done using ==/2.
@ -133,7 +136,7 @@ list_difference_eq([X|Xs],Ys,L) :-
). ).
%% intersect_eq(+List1, +List2, -Intersection) %% intersect_eq(+List1, +List2, -Intersection)
% %
% Determine the intersection of two lists without unifying values. % Determine the intersection of two lists without unifying values.
intersect_eq([], _, []). intersect_eq([], _, []).
@ -146,7 +149,7 @@ intersect_eq([X|Xs], Ys, L) :-
%% take(+N, +List, -FirstElements) %% take(+N, +List, -FirstElements)
% %
% Take the first N elements from List and unify this with % Take the first N elements from List and unify this with
% FirstElements. The definition is based on the GNU-Prolog lists % FirstElements. The definition is based on the GNU-Prolog lists
% library. Implementation by Jan Wielemaker. % library. Implementation by Jan Wielemaker.
@ -178,7 +181,7 @@ split_at(N,[H|T],[H|L1],L2) :-
split_at(M,T,L1,L2). split_at(M,T,L1,L2).
%% max_go_list(+List, -Max) %% max_go_list(+List, -Max)
% %
% Return the maximum of List in the standard order of terms. % Return the maximum of List in the standard order of terms.
max_go_list([H|T], Max) :- max_go_list([H|T], Max) :-
@ -192,7 +195,7 @@ max_go_list([H|T], X, Max) :-
). ).
%% or_list(+ListOfInts, -BitwiseOr) %% or_list(+ListOfInts, -BitwiseOr)
% %
% Do a bitwise disjuction over all integer members of ListOfInts. % Do a bitwise disjuction over all integer members of ListOfInts.
or_list(L, Or) :- or_list(L, Or) :-
@ -210,15 +213,15 @@ or_list([H|T], Or0, Or) :-
% %
% True if all elements of Sub appear in List in the same order. % True if all elements of Sub appear in List in the same order.
chr_sublist(L, L). %sublist(L, L).
chr_sublist(Sub, [H|T]) :- %sublist(Sub, [H|T]) :-
'$sublist1'(T, H, Sub). % '$sublist1'(T, H, Sub).
'$sublist1'(Sub, _, Sub). %'$sublist1'(Sub, _, Sub).
'$sublist1'([H|T], _, Sub) :- %'$sublist1'([H|T], _, Sub) :-
'$sublist1'(T, H, Sub). % '$sublist1'(T, H, Sub).
'$sublist1'([H|T], X, [X|Sub]) :- %'$sublist1'([H|T], X, [X|Sub]) :-
'$sublist1'(T, H, Sub). % '$sublist1'(T, H, Sub).
%% bounded_sublist(?Sub, +List, +Bound:integer) %% bounded_sublist(?Sub, +List, +Bound:integer)
% %

19
library/lists.yap
View File

@ -267,10 +267,21 @@ select(Element, [Head|Tail], [Head|Rest]) :-
% sublist(Sublist, List) % sublist(Sublist, List)
% is true when both append(_,Sublist,S) and append(S,_,List) hold. % is true when both append(_,Sublist,S) and append(S,_,List) hold.
sublist(Sublist, List) :- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
prefix(Sublist, List).
sublist(Sublist, [_|List]) :- %% sublist(?Sub, +List) is nondet.
sublist(Sublist, List). %
% True if all elements of Sub appear in List in the same order.
sublist(L, L).
sublist(Sub, [H|T]) :-
'$sublist1'(T, H, Sub).
'$sublist1'(Sub, _, Sub).
'$sublist1'([H|T], _, Sub) :-
'$sublist1'(T, H, Sub).
'$sublist1'([H|T], X, [X|Sub]) :-
'$sublist1'(T, H, Sub).
% substitute(X, XList, Y, YList) % substitute(X, XList, Y, YList)
% is true when XList and YList only differ in that the elements X in XList % is true when XList and YList only differ in that the elements X in XList