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

Merge branch 'master' of ../yap-6.2

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-12-07 18:21:50 +00:00
commit b086d8b5cd
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
C/load_foreign.c
View File

@ -242,9 +242,10 @@ Yap_ReOpenLoadForeign(void)
{ {
ForeignObj *f_code = ForeignCodeLoaded; ForeignObj *f_code = ForeignCodeLoaded;
Term OldModule = CurrentModule; Term OldModule = CurrentModule;
YapInitProc InitProc = NULL;
while (f_code != NULL) { while (f_code != NULL) {
YapInitProc InitProc = NULL;
CurrentModule = f_code->module; CurrentModule = f_code->module;
if(Yap_ReLoadForeign(f_code->objs,f_code->libs,f_code->f,&InitProc)==LOAD_SUCCEEDED) { if(Yap_ReLoadForeign(f_code->objs,f_code->libs,f_code->f,&InitProc)==LOAD_SUCCEEDED) {
if (InitProc) if (InitProc)

9
docs/yap.tex
View File

@ -9578,10 +9578,9 @@ plus_if_pos(X,Y,Z) :- Y > 0, Z is X + Y.
vars(X, Y, [X|Y]) :- var(X), !. vars(X, Y, [X|Y]) :- var(X), !.
vars(_, Y, Y). vars(_, Y, Y).
trans(TermIn, TermOut) :- trans(TermIn, TermOut) :-
(compound(TermIn) ; atom(TermIn)), nonvar(TermIn),
TermIn =.. [p|Args], TermIn =.. [p|Args],
TermOut =..[q|Args], TermOut =..[q|Args], !.
!.
trans(X,X). trans(X,X).
%success %success
@ -9592,8 +9591,8 @@ selectlist(<(0), [-1,0,1], [1]).
convlist(plus_if_pos(1), [-1,0,1], [2]). convlist(plus_if_pos(1), [-1,0,1], [2]).
sumlist(plus, [1,2,3,4], 1, 11). sumlist(plus, [1,2,3,4], 1, 11).
mapargs(number_atom,s(1,2,3), s('1','2','3')). mapargs(number_atom,s(1,2,3), s('1','2','3')).
sumargs(vars, s(1,X,2,Y), [], [Y,X]). sumargs(vars, s(1,X,2,Y), [], [Y,X]).m
mapnodes(trans, p(a,p(b,a),c), q(a,q(b,a),c)). apnodes(trans, p(a,p(b,a),c), q(a,q(b,a),c)).
checknodes(\==(T), p(X,p(Y,X),Z)). checknodes(\==(T), p(X,p(Y,X),Z)).
sumnodes(vars, [c(X), p(X,Y), q(Y)], [], [Y,Y,X,X]). sumnodes(vars, [c(X), p(X,Y), q(Y)], [], [Y,Y,X,X]).
% another one % another one

2
library/maplist.yap
View File

@ -206,7 +206,7 @@ sumargs_args(Pred, Term, A1, A3, N) :-
sumargs_args(Pred, Term, A2, A3, N1). sumargs_args(Pred, Term, A2, A3, N1).
mapnodes(Pred, TermIn, TermOut) :- mapnodes(Pred, TermIn, TermOut) :-
(atomic(TermIn); var(TermOut)), !, (atomic(TermIn); var(TermIn)), !,
call(Pred, TermIn, TermOut). call(Pred, TermIn, TermOut).
mapnodes(Pred, TermIn, TermOut) :- mapnodes(Pred, TermIn, TermOut) :-
call(Pred, TermIn, Temp), call(Pred, TermIn, Temp),

2
packages/clib/memfile.pl
View File

@ -43,6 +43,8 @@
utf8_position_memory_file/3 % +Handle, -Here, -Size utf8_position_memory_file/3 % +Handle, -Here, -Size
]). ]).
:- expects_dialect(swi).
:- use_module(library(shlib)). :- use_module(library(shlib)).
:- use_foreign_library(foreign(memfile)). :- use_foreign_library(foreign(memfile)).