fix initialization of non-backtrackable module.

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1698 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2006-09-28 17:24:40 +00:00
parent 53b412d1a8
commit 168bef9531
2 changed files with 7 additions and 7 deletions

View File

@ -875,7 +875,7 @@ InitCodes(void)
Yap_heap_regs->terms_module = MkAtomTerm(Yap_LookupAtom("terms")); Yap_heap_regs->terms_module = MkAtomTerm(Yap_LookupAtom("terms"));
Yap_heap_regs->system_module = MkAtomTerm(Yap_LookupAtom("system")); Yap_heap_regs->system_module = MkAtomTerm(Yap_LookupAtom("system"));
Yap_heap_regs->readutil_module = MkAtomTerm(Yap_LookupAtom("readutil")); Yap_heap_regs->readutil_module = MkAtomTerm(Yap_LookupAtom("readutil"));
Yap_heap_regs->readutil_module = MkAtomTerm(Yap_LookupAtom("nb")); Yap_heap_regs->globals_module = MkAtomTerm(Yap_LookupAtom("nb"));
Yap_InitModules(); Yap_InitModules();
#ifdef BEAM #ifdef BEAM
Yap_heap_regs->beam_retry_code.opc = Yap_opcode(_retry_eam); Yap_heap_regs->beam_retry_code.opc = Yap_opcode(_retry_eam);

View File

@ -43,13 +43,13 @@ findall(Template, Generator, Answers, SoFar) :-
% starts by calling the generator, % starts by calling the generator,
% and recording the answers % and recording the answers
'$findall'(Template, Generator, SoFar, Answers) :- '$findall'(Template, Generator, SoFar, Answers) :-
nb_queue(Ref), nb:nb_queue(Ref),
( (
'$execute'(Generator), '$execute'(Generator),
nb_queue_enqueue(Ref, Template), nb:nb_queue_enqueue(Ref, Template),
fail fail
; ;
nb_queue_close(Ref, Answers, SoFar) nb:nb_queue_close(Ref, Answers, SoFar)
). ).
@ -58,13 +58,13 @@ findall(Template, Generator, Answers, SoFar) :-
% algorithm to guarantee that variables will have the same names. % algorithm to guarantee that variables will have the same names.
% %
'$findall_with_common_vars'(Template, Generator, Answers) :- '$findall_with_common_vars'(Template, Generator, Answers) :-
nb_queue(Ref), nb:nb_queue(Ref),
( (
'$execute'(Generator), '$execute'(Generator),
nb_queue_enqueue(Ref, Template), nb:nb_queue_enqueue(Ref, Template),
fail fail
; ;
nb_queue_close(Ref, Answers, []), nb:nb_queue_close(Ref, Answers, []),
'$collect_with_common_vars'(Answers, _) '$collect_with_common_vars'(Answers, _)
). ).