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

fix numbervars

Browse Source
This commit is contained in:
Vitor Santos Costa 2018-11-05 01:24:08 +00:00
parent a1f8631844
commit 55ebeb7dd8
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
C/utilpreds.c
View File

@ -556,7 +556,7 @@ add_to_list( Term inp, Term v, Term t PASS_REGS)
ta[1] = t; ta[1] = t;
return MkPairTerm(Yap_MkApplTerm( FunctorEq, 2, ta ), inp); return MkPairTerm(Yap_MkApplTerm( FunctorEq, 2, ta ), inp);
} }
static int static int
break_rationals_complex_term(CELL *pt0, CELL *pt0_end, CELL *ptf, Term *vout, Term vin,CELL *HLow USES_REGS) break_rationals_complex_term(CELL *pt0, CELL *pt0_end, CELL *ptf, Term *vout, Term vin,CELL *HLow USES_REGS)
@ -784,7 +784,7 @@ Yap_BreakRational(Term inp, UInt arity, Term *to, Term ti USES_REGS) {
HR[0] = (CELL)f; HR[0] = (CELL)f;
arity = ArityOfFunctor(f); arity = ArityOfFunctor(f);
HR += 1+arity; HR += 1+arity;
{ {
Int res; Int res;
if ((res = break_rationals_complex_term(ap, ap+(arity), HB0+1, to, ti, HB0 PASS_REGS)) < 0) { if ((res = break_rationals_complex_term(ap, ap+(arity), HB0+1, to, ti, HB0 PASS_REGS)) < 0) {
@ -989,7 +989,7 @@ Yap_BreakTerm(Term inp, UInt arity, Term *to, Term ti USES_REGS) {
} }
} }
static Int static Int
p_break_rational( USES_REGS1 ) p_break_rational( USES_REGS1 )
{ {
@ -2013,7 +2013,7 @@ static Term attvars_in_complex_term(register CELL *pt0, register CELL *pt0_end,
goto aux_overflow; goto aux_overflow;
} }
#ifdef RATIONAL_TREES #ifdef RATIONAL_TREES
to_visit->beg = pt0; to_visit->beg = pt0;
to_visit->end = pt0_end; to_visit->end = pt0_end;
to_visit->oval = *pt0; to_visit->oval = *pt0;
@ -4874,19 +4874,11 @@ loop:
if (to_visit + 32 >= to_visit_max) { if (to_visit + 32 >= to_visit_max) {
goto aux_overflow; goto aux_overflow;
} }
#ifdef RATIONAL_TREES
to_visit->beg = pt0; to_visit->beg = pt0;
to_visit->end = pt0_end; to_visit->end = pt0_end;
to_visit->oval = *pt0; to_visit->oval = *pt0;
to_visit ++; to_visit ++;
*pt0 = TermNil; *pt0 = TermNil;
#else
if (pt0 < pt0_end) {
to_visit[0] = pt0;
to_visit[1] = pt0_end;
to_visit += 2;
}
#endif
pt0 = RepPair(d0) - 1; pt0 = RepPair(d0) - 1;
pt0_end = RepPair(d0) + 1; pt0_end = RepPair(d0) + 1;
} else if (IsApplTerm(d0)) { } else if (IsApplTerm(d0)) {
@ -4906,14 +4898,11 @@ loop:
if (to_visit + 32 >= to_visit_max) { if (to_visit + 32 >= to_visit_max) {
goto aux_overflow; goto aux_overflow;
} }
#ifdef RATIONAL_TREES
#else
to_visit->beg = pt0; to_visit->beg = pt0;
to_visit->end = pt0_end; to_visit->end = pt0_end;
to_visit->oval = *pt0; to_visit->oval = *pt0;
to_visit ++; to_visit ++;
*pt0 = TermNil; *pt0 = TermNil;
#endif
d0 = ArityOfFunctor(f); d0 = ArityOfFunctor(f);
pt0 = ap2; pt0 = ap2;
pt0_end = ap2 + d0; pt0_end = ap2 + d0;

1
pl/absf.yap
View File

@ -33,7 +33,6 @@
remove_from_path/1], ['$full_filename'/2, remove_from_path/1], ['$full_filename'/2,
'$system_library_directories'/2]). '$system_library_directories'/2]).
:- use_system_module( '$_boot', ['$system_catch'/4]). :- use_system_module( '$_boot', ['$system_catch'/4]).
:- use_system_module( '$_errors', ['$do_error'/2]). :- use_system_module( '$_errors', ['$do_error'/2]).