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

ignore specific limit for max write depth on lists. Use same limit everywhere.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-05-24 19:37:07 -05:00
parent a0750ff5b7
commit a6f0b8cc9f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
C/write.c
View File

@ -69,7 +69,7 @@ typedef struct write_globs {
int Quote_illegal, Ignore_ops, Handle_vars, Use_portray; int Quote_illegal, Ignore_ops, Handle_vars, Use_portray;
int keep_terms; int keep_terms;
int Write_Loops; int Write_Loops;
UInt MaxDepth, MaxList, MaxArgs; UInt MaxDepth, MaxArgs;
} wglbs; } wglbs;
STATIC_PROTO(void wrputn, (Int, wrf)); STATIC_PROTO(void wrputn, (Int, wrf));
@ -502,7 +502,6 @@ write_list(Term t, int direction, int depth, struct write_globs *wglb, struct re
nrwt.u.s.ptr = 0; nrwt.u.s.ptr = 0;
while (1) { while (1) {
int new_depth = depth + 1;
long sl= 0; long sl= 0;
int ndirection; int ndirection;
int do_jump; int do_jump;
@ -511,7 +510,7 @@ write_list(Term t, int direction, int depth, struct write_globs *wglb, struct re
/* garbage collection may be called */ /* garbage collection may be called */
sl = Yap_InitSlot(t); sl = Yap_InitSlot(t);
} }
writeTerm(from_pointer(RepPair(t), &nrwt, wglb), 999, new_depth, FALSE, wglb, &nrwt); writeTerm(from_pointer(RepPair(t), &nrwt, wglb), 999, depth+1, FALSE, wglb, &nrwt);
restore_from_write(&nrwt, wglb); restore_from_write(&nrwt, wglb);
if (wglb->keep_terms) { if (wglb->keep_terms) {
t = Yap_GetFromSlot(sl); t = Yap_GetFromSlot(sl);
@ -537,17 +536,18 @@ write_list(Term t, int direction, int depth, struct write_globs *wglb, struct re
wrputc(',', wglb->writewch); wrputc(',', wglb->writewch);
lastw = separator; lastw = separator;
direction = ndirection; direction = ndirection;
depth++;
if (do_jump) if (do_jump)
break; break;
t = ti; t = ti;
} }
if (IsPairTerm(ti)) { if (IsPairTerm(ti)) {
write_list(from_pointer(RepPair(t)+1, &nrwt, wglb), direction, depth+1, wglb, &nrwt); write_list(from_pointer(RepPair(t)+1, &nrwt, wglb), direction, depth, wglb, &nrwt);
restore_from_write(&nrwt, wglb); restore_from_write(&nrwt, wglb);
} else if (ti != MkAtomTerm(AtomNil)) { } else if (ti != MkAtomTerm(AtomNil)) {
wrputc('|', wglb->writewch); wrputc('|', wglb->writewch);
lastw = separator; lastw = separator;
writeTerm(from_pointer(RepPair(t)+1, &nrwt, wglb), 999, depth + 1, FALSE, wglb, &nrwt); writeTerm(from_pointer(RepPair(t)+1, &nrwt, wglb), 999, depth, FALSE, wglb, &nrwt);
restore_from_write(&nrwt, wglb); restore_from_write(&nrwt, wglb);
} }
} }
@ -598,7 +598,7 @@ writeTerm(Term t, int p, int depth, int rinfixarg, struct write_globs *wglb, str
Term ls = t; Term ls = t;
wrputc('[', wglb->writewch); wrputc('[', wglb->writewch);
lastw = separator; lastw = separator;
write_list(from_pointer(&ls, &nrwt, wglb), 0, depth+1, wglb, &nrwt); write_list(from_pointer(&ls, &nrwt, wglb), 0, depth, wglb, &nrwt);
restore_from_write(&nrwt, wglb); restore_from_write(&nrwt, wglb);
wrputc(']', wglb->writewch); wrputc(']', wglb->writewch);
lastw = separator; lastw = separator;
@ -1006,7 +1006,6 @@ Yap_plwrite(Term t, int (*mywrite) (int, wchar_t), int flags, int priority)
wglb.Handle_vars = flags & Handle_vars_f; wglb.Handle_vars = flags & Handle_vars_f;
wglb.Use_portray = flags & Use_portray_f; wglb.Use_portray = flags & Use_portray_f;
wglb.MaxDepth = max_depth; wglb.MaxDepth = max_depth;
wglb.MaxList = max_list;
wglb.MaxArgs = max_write_args; wglb.MaxArgs = max_write_args;
/* notice: we must have ASP well set when using portray, otherwise /* notice: we must have ASP well set when using portray, otherwise
we cannot make recursive Prolog calls */ we cannot make recursive Prolog calls */