From 168bef95315e730f25714eea673f2df3cc535f4d Mon Sep 17 00:00:00 2001 From: vsc Date: Thu, 28 Sep 2006 17:24:40 +0000 Subject: [PATCH] fix initialization of non-backtrackable module. git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1698 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- C/init.c | 2 +- pl/setof.yap | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/C/init.c b/C/init.c index 0af0e55ed..83ac68f5a 100644 --- a/C/init.c +++ b/C/init.c @@ -875,7 +875,7 @@ InitCodes(void) Yap_heap_regs->terms_module = MkAtomTerm(Yap_LookupAtom("terms")); 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("nb")); + Yap_heap_regs->globals_module = MkAtomTerm(Yap_LookupAtom("nb")); Yap_InitModules(); #ifdef BEAM Yap_heap_regs->beam_retry_code.opc = Yap_opcode(_retry_eam); diff --git a/pl/setof.yap b/pl/setof.yap index cf1d6fd7a..4d9ac2844 100644 --- a/pl/setof.yap +++ b/pl/setof.yap @@ -43,13 +43,13 @@ findall(Template, Generator, Answers, SoFar) :- % starts by calling the generator, % and recording the answers '$findall'(Template, Generator, SoFar, Answers) :- - nb_queue(Ref), + nb:nb_queue(Ref), ( '$execute'(Generator), - nb_queue_enqueue(Ref, Template), + nb:nb_queue_enqueue(Ref, Template), 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. % '$findall_with_common_vars'(Template, Generator, Answers) :- - nb_queue(Ref), + nb:nb_queue(Ref), ( '$execute'(Generator), - nb_queue_enqueue(Ref, Template), + nb:nb_queue_enqueue(Ref, Template), fail ; - nb_queue_close(Ref, Answers, []), + nb:nb_queue_close(Ref, Answers, []), '$collect_with_common_vars'(Answers, _) ).