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

$length1 was broken.

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-02-13 09:40:57 +00:00
parent db35eb4b3c
commit d5bfd78b64
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pl/utils.yap
View File

@ -437,6 +437,8 @@ atom_concat(X,Y,At) :-
atom_codes(X, Xs), atom_codes(X, Xs),
atom_codes(Y, Ys). atom_codes(Y, Ys).
callable(A) :-
( var(A) -> fail ; number(A) -> fail ; true ).
atomic_list_concat(L,At) :- atomic_list_concat(L,At) :-
atomic_concat(L, At). atomic_concat(L, At).
@ -547,16 +549,16 @@ sub_atom(At, Bef, Size, After, SubAt) :-
'$sub_atom_needs_int'(Size,ErrorTerm), '$sub_atom_needs_int'(Size,ErrorTerm),
'$sub_atom_needs_int'(After,ErrorTerm), '$sub_atom_needs_int'(After,ErrorTerm),
atom_codes(SubAt,Atls), atom_codes(SubAt,Atls),
'$$_length1'(Atls, 0, Size), length(Atls, 0, Size),
'$sub_atom_get_subchars_and_match'(Size, Atl, Atls, NAtl), '$sub_atom_get_subchars_and_match'(Size, Atl, Atls, NAtl),
'$$_length1'(NAtl,0,After). length(NAtl,0,After).
% SubAt is unbound, but Size is bound % SubAt is unbound, but Size is bound
'$sub_atom3'(Size, After, SubAt, Atl, ErrorTerm) :- '$sub_atom3'(Size, After, SubAt, Atl, ErrorTerm) :-
nonvar(Size), !, nonvar(Size), !,
'$sub_atom_needs_int'(Size,ErrorTerm), '$sub_atom_needs_int'(Size,ErrorTerm),
'$sub_atom_needs_int'(After,ErrorTerm), '$sub_atom_needs_int'(After,ErrorTerm),
'$sub_atom_get_subchars_and_match'(Size, Atl, SubAts, NAtl), '$sub_atom_get_subchars_and_match'(Size, Atl, SubAts, NAtl),
'$$_length1'(NAtl,0,After), length(NAtl,After),
atom_codes(SubAt,SubAts). atom_codes(SubAt,SubAts).
% SubAt and Size are unbound, but After is bound. % SubAt and Size are unbound, but After is bound.
'$sub_atom3'(Size, After, SubAt, Atl, ErrorTerm) :- '$sub_atom3'(Size, After, SubAt, Atl, ErrorTerm) :-
@ -567,7 +569,7 @@ sub_atom(At, Bef, Size, After, SubAt) :-
atom_codes(SubAt,SubAts). atom_codes(SubAt,SubAts).
% SubAt, Size, and After are unbound. % SubAt, Size, and After are unbound.
'$sub_atom3'(Size, After, SubAt, Atl, _) :- '$sub_atom3'(Size, After, SubAt, Atl, _) :-
'$$_length1'(Atl,0,Len), length(Atl,Len),
'$sub_atom_split'(Atl,Len,SubAts,Size,_,After), '$sub_atom_split'(Atl,Len,SubAts,Size,_,After),
atom_codes(SubAt,SubAts). atom_codes(SubAt,SubAts).
@ -578,8 +580,8 @@ sub_atom(At, Bef, Size, After, SubAt) :-
'$sub_atom_needs_atom'(SubAt, ErrorTerm), '$sub_atom_needs_atom'(SubAt, ErrorTerm),
atom_codes(SubAt,SubAts), atom_codes(SubAt,SubAts),
'$sub_atom_search'(SubAts, Atl, 0, Bef, AfterS), '$sub_atom_search'(SubAts, Atl, 0, Bef, AfterS),
'$$_length1'(SubAts, 0, Size), length(SubAts, Size),
'$$_length1'(AfterS, 0, After). length(AfterS, After).
% ok: in the second best case we just get rid of the tail % ok: in the second best case we just get rid of the tail
'$sub_atombv'(Bef, Size, After, SubAt, Atl, ErrorTerm) :- '$sub_atombv'(Bef, Size, After, SubAt, Atl, ErrorTerm) :-
nonvar(After), !, nonvar(After), !,
@ -590,7 +592,7 @@ sub_atom(At, Bef, Size, After, SubAt) :-
atom_codes(SubAt,SubAts). atom_codes(SubAt,SubAts).
% ok: just do everything % ok: just do everything
'$sub_atombv'(Bef, Size, After, SubAt, Atl, _) :- '$sub_atombv'(Bef, Size, After, SubAt, Atl, _) :-
'$$_length1'(Atl, 0, Len), length(Atl, Len),
'$sub_atom_split'(Atl,Len,_,Bef,Atls2,Len2), '$sub_atom_split'(Atl,Len,_,Bef,Atls2,Len2),
'$sub_atom_split'(Atls2,Len2,SubAts,Size,_,After), '$sub_atom_split'(Atls2,Len2,SubAts,Size,_,After),
atom_codes(SubAt,SubAts). atom_codes(SubAt,SubAts).