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

fix silly cut in autoload

Browse Source
This commit is contained in:
Vítor Santos Costa 2010-06-18 00:30:11 +01:00
parent 0021b66807
commit 735f318b77
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pl/init.yap
View File

@ -68,7 +68,6 @@ otherwise.
'modules.yap', 'modules.yap',
% must follow grammar % must follow grammar
'eval.yap', 'eval.yap',
'lists.yap',
'signals.yap', 'signals.yap',
'profile.yap', 'profile.yap',
'callcount.yap', 'callcount.yap',

2
pl/modules.yap
View File

@ -391,7 +391,7 @@ expand_goal(G, G).
call(Dialect:index(Name,Arity,ExportingModI,_)), !, call(Dialect:index(Name,Arity,ExportingModI,_)), !,
'$continue_imported'(ExportingMod, ExportingModI, G0, G), !. '$continue_imported'(ExportingMod, ExportingModI, G0, G), !.
'$get_undefined_pred'(G, _ImportingMod, G0, ExportingMod) :- '$get_undefined_pred'(G, _ImportingMod, G0, ExportingMod) :-
autoloader:autoload, !, autoloader:autoload,
autoloader:find_predicate(G,ExportingModI), !, autoloader:find_predicate(G,ExportingModI), !,
'$continue_imported'(ExportingMod, ExportingModI, G0, G), !. '$continue_imported'(ExportingMod, ExportingModI, G0, G), !.
'$get_undefined_pred'(G, ImportingMod, G0, ExportingMod) :- '$get_undefined_pred'(G, ImportingMod, G0, ExportingMod) :-

26
pl/utils.yap
View File

@ -353,13 +353,39 @@ atomic_list_concat(L,At) :-
atomic_concat(L, At). atomic_concat(L, At).
atomic_list_concat(L, El, At) :- atomic_list_concat(L, El, At) :-
var(El), !,
'$do_error'(instantiation_error,atom_list_concat(L,El,At)).
atomic_list_concat(L, El, At) :-
nonvar(L), !,
'$add_els'(L,El,LEl), '$add_els'(L,El,LEl),
atomic_concat(LEl, At). atomic_concat(LEl, At).
atomic_list_concat(L, El, At) :-
nonvar(At), !,
atom_codes(At, S),
atom_codes(El, [ElS]),
'$split_elements'(S, ElS, SubS),
'$atomify_list'(SubS, L).
'$add_els'([A,B|L],El,[A,El|NL]) :- !, '$add_els'([A,B|L],El,[A,El|NL]) :- !,
'$add_els'([B|L],El,NL). '$add_els'([B|L],El,NL).
'$add_els'(L,_,L). '$add_els'(L,_,L).
'$split_elements'(E.S, E, SubS) :- !,
'$split_elements'(S, E, SubS).
'$split_elements'(E1.S, E, [E1|L].SubS) :- !,
'$split_elements'(S, E, L, SubS).
'$split_elements'([], _, []).
'$split_elements'([], _, [], []).
'$split_elements'(E.S, E, [], SubS) :- !,
'$split_elements'(S, E, SubS).
'$split_elements'(E1.S, E, E1.L, SubS) :-
'$split_elements'(S, E, L, SubS).
'$atomify_list'([], []).
'$atomify_list'(S.SubS, A.L) :-
atom_codes(A, S),
'$atomify_list'(SubS, L).
atomic_concat(X,Y,At) :- atomic_concat(X,Y,At) :-
( (