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

fixes

Browse Source
This commit is contained in:
Vitor Santos Costa 2019-01-27 11:05:20 +00:00
parent 13d764067f
commit 36fedfa321
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/cdmgr.c
View File

@ -2429,7 +2429,7 @@ static Int
} }
/* @pred '$new_multifile'(+G,+Mod) /* @pred '$new_multifile'(+G,+Mod)
* declares rgi/////// the multi-file flag * declares the multi-file flag
* */ * */
static Int new_multifile(USES_REGS1) { static Int new_multifile(USES_REGS1) {
PredEntry *pe; PredEntry *pe;
@ -2734,7 +2734,7 @@ static Int p_is_dynamic(USES_REGS1) { /* '$is_dynamic'(+P) */
return (out); return (out);
} }
/* @pred '$new_multifile'(+G,+Mod) /* @pred '$new_meta'(+G,+Mod)
* sets the multi-file flag * sets the multi-file flag
* */ * */
static Int new_meta_pred(USES_REGS1) { static Int new_meta_pred(USES_REGS1) {

15
C/write.c
View File

@ -273,7 +273,7 @@ static void writebig(Term t, int p, int depth, int rinfixarg,
return; return;
} else if (big_tag == BIG_RATIONAL) { } else if (big_tag == BIG_RATIONAL) {
Term trat = Yap_RatTermToApplTerm(t); Term trat = Yap_RatTermToApplTerm(t);
writeTerm(trat, p, depth, rinfixarg, wglb, rwt); writeTerm__(trat,wglb->sl, p, depth, rinfixarg, wglb, rwt);
return; return;
#endif #endif
} else if (big_tag >= USER_BLOB_START && big_tag < USER_BLOB_END) { } else if (big_tag >= USER_BLOB_START && big_tag < USER_BLOB_END) {
@ -762,7 +762,7 @@ static void write_list__(Term t, yhandle_t sl, int direction, int depth,
if (!IsPairTerm(ti)) if (!IsPairTerm(ti))
break; break;
if (check_for_loops(ti,wglb)) return; if (check_for_loops(ti,wglb)) return;
sl = wglb->sl = Yap_InitHandle(ti); wglb->sl = Yap_InitHandle(ti);
ndirection = RepPair(ti) - RepPair(t); ndirection = RepPair(ti) - RepPair(t);
/* make sure we're not trapped in loops */ /* make sure we're not trapped in loops */
if (ndirection > 0) { if (ndirection > 0) {
@ -795,14 +795,14 @@ static void write_list__(Term t, yhandle_t sl, int direction, int depth,
/* we found an infinite loop */ /* we found an infinite loop */
/* keep going on the list */ /* keep going on the list */
wrputc(',', wglb->stream); wrputc(',', wglb->stream);
write_list__(ti, sl, direction, depth, wglb, &nrwt); write_list(ti, direction, depth, wglb, &nrwt);
} else if (ti != MkAtomTerm(AtomNil)) { } else if (ti != MkAtomTerm(AtomNil)) {
if (lastw == symbol || lastw == separator) { if (lastw == symbol || lastw == separator) {
wrputc(' ', wglb->stream); wrputc(' ', wglb->stream);
} }
wrputc('|', wglb->stream); wrputc('|', wglb->stream);
lastw = separator; lastw = separator;
writeTerm__(ti, sl, 999, depth, FALSE, wglb, &nrwt); writeTerm(ti, 999, depth, FALSE, wglb, &nrwt);
} }
} }
@ -1183,11 +1183,8 @@ void Yap_plwrite(Term t, StreamDesc *mywrite, int max_depth, int flags,
} }
} }
/* protect slots for portray */ /* protect slots for portray */
yhandle_t sl; wglb.sl0 = (wglb.sl = Yap_InitHandle(t))-1;
wglb.sl0 = (sl = wglb.sl = Yap_InitHandle(t)) -1; writeTerm__(t,wglb.sl, priority, 1, FALSE, &wglb, &rwt);
wglb.protectedEntry = false;
writeTerm(t, priority, 1, FALSE, &wglb, &rwt);
t = Yap_PopHandle(sl);
if (flags & New_Line_f) { if (flags & New_Line_f) {
if (flags & Fullstop_f) { if (flags & Fullstop_f) {
wrputc('.', wglb.stream); wrputc('.', wglb.stream);