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

fix nb_current/2

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-03-01 21:48:39 +00:00
parent 46f0a0644c
commit 51982bee42
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
C/globals.c
View File

@ -2613,10 +2613,16 @@ init_current_nb(void)
{ /* current_atom(?Atom) */ { /* current_atom(?Atom) */
Term t1 = Deref(ARG1); Term t1 = Deref(ARG1);
if (!IsVarTerm(t1)) { if (!IsVarTerm(t1)) {
if (IsAtomTerm(t1)) if (IsAtomTerm(t1)) {
cut_succeed(); if (!FindGlobalEntry(AtomOfTerm(t1))) {
else cut_fail();
} else {
cut_succeed();
}
} else {
Yap_Error(TYPE_ERROR_ATOM,t1,"nb_current");
cut_fail(); cut_fail();
}
} }
READ_LOCK(HashChain[0].AERWLock); READ_LOCK(HashChain[0].AERWLock);
EXTRA_CBACK_ARG(1,1) = MkIntegerTerm((Int)GlobalVariables); EXTRA_CBACK_ARG(1,1) = MkIntegerTerm((Int)GlobalVariables);

3
pl/utils.yap
View File

@ -577,9 +577,6 @@ nth_instance(Key,Index,T,Ref) :-
instance(Ref,T). instance(Ref,T).
nb_current(GlobalVariable, Val) :- nb_current(GlobalVariable, Val) :-
var(GlobalVariable), !,
'$nb_current'(GlobalVariable), '$nb_current'(GlobalVariable),
nb_getval(GlobalVariable, Val). nb_getval(GlobalVariable, Val).
nb_current(GlobalVariable, Val) :-
nb_getval(GlobalVariable, Val).