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

text ARG2 first (obs from Ulrich Neumerkel)

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-10-03 09:22:27 +01:00
parent e60b485134
commit ce7adaa632
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
C/utilpreds.c
View File

@ -5156,11 +5156,10 @@ p_skip_list( USES_REGS1 ) {
static Int static Int
p_skip_list4( USES_REGS1 ) { p_skip_list4( USES_REGS1 ) {
Term *tail; Term *tail;
Int len = Yap_SkipList(XREGS+1, &tail); Int len, len1 = -1;
Term t2 = Deref(ARG2), t = *tail; Term t2 = Deref(ARG2), t;
if (!IsVarTerm(t2)) { if (!IsVarTerm(t2)) {
Int len1;
if (!IsIntegerTerm(t2)) { if (!IsIntegerTerm(t2)) {
Yap_Error(TYPE_ERROR_INTEGER, t2, "length/2"); Yap_Error(TYPE_ERROR_INTEGER, t2, "length/2");
return FALSE; return FALSE;
@ -5169,15 +5168,20 @@ p_skip_list4( USES_REGS1 ) {
Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "length/2"); Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "length/2");
return FALSE; return FALSE;
} }
if (t == TermNil)
return
len1 == len &&
Yap_unify(*tail, ARG4);
} }
/* we need len here */
len = Yap_SkipList(XREGS+1, &tail);
t = *tail;
/* don't set M0 if full list, just check M */ /* don't set M0 if full list, just check M */
if (t == TermNil) { if (t == TermNil) {
return Yap_unify_constant(ARG4, TermNil) && if (len1 >= 0) { /* ARG2 was bound */
Yap_unify_constant(ARG2, MkIntegerTerm(len)); return
len1 == len &&
Yap_unify(t, ARG4);
} else {
return Yap_unify_constant(ARG4, TermNil) &&
Yap_unify_constant(ARG2, MkIntegerTerm(len));
}
} }
return Yap_unify(MkIntegerTerm(len), ARG3) && return Yap_unify(MkIntegerTerm(len), ARG3) &&
Yap_unify(t, ARG4); Yap_unify(t, ARG4);