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

get rid of portray_delays.

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-03-22 21:59:04 +00:00
parent e6b48be445
commit 857ff4b895
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
C/write.c
View File

@ -66,7 +66,7 @@ typedef struct rewind_term {
typedef struct write_globs { typedef struct write_globs {
void *stream; void *stream;
int Quote_illegal, Ignore_ops, Handle_vars, Use_portray; int Quote_illegal, Ignore_ops, Handle_vars, Use_portray, Portray_delays;
int Keep_terms; int Keep_terms;
int Write_Loops; int Write_Loops;
int Write_strings; int Write_strings;
@ -670,13 +670,13 @@ write_var(CELL *t, struct write_globs *wglb, struct rewind_term *rwt)
lastw = separator; lastw = separator;
if (IsAttVar(t)) { if (IsAttVar(t)) {
Int vcount = (t-H0); Int vcount = (t-H0);
if (Yap_Portray_delays) { if (wglb->Portray_delays) {
exts ext = ExtFromCell(t); exts ext = ExtFromCell(t);
struct rewind_term nrwt; struct rewind_term nrwt;
nrwt.parent = rwt; nrwt.parent = rwt;
nrwt.u.s.ptr = 0; nrwt.u.s.ptr = 0;
Yap_Portray_delays = FALSE; wglb->Portray_delays = FALSE;
if (ext == attvars_ext) { if (ext == attvars_ext) {
attvar_record *attv = RepAttVar(t); attvar_record *attv = RepAttVar(t);
CELL *l = &attv->Value; /* dirty low-level hack, check atts.h */ CELL *l = &attv->Value; /* dirty low-level hack, check atts.h */
@ -692,7 +692,7 @@ write_var(CELL *t, struct write_globs *wglb, struct rewind_term *rwt)
restore_from_write(&nrwt, wglb); restore_from_write(&nrwt, wglb);
wrputc(')', wglb->stream); wrputc(')', wglb->stream);
} }
Yap_Portray_delays = TRUE; wglb->Portray_delays = TRUE;
return; return;
} }
wrputc('D', wglb->stream); wrputc('D', wglb->stream);
@ -1136,6 +1136,7 @@ Yap_plwrite(Term t, void *mywrite, int max_depth, int flags, int priority)
wglb.Quote_illegal = flags & Quote_illegal_f; wglb.Quote_illegal = flags & Quote_illegal_f;
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.Portray_delays = flags & AttVar_Portray_f;
wglb.MaxDepth = max_depth; wglb.MaxDepth = max_depth;
wglb.MaxArgs = max_depth; wglb.MaxArgs = max_depth;
/* notice: we must have ASP well set when using portray, otherwise /* notice: we must have ASP well set when using portray, otherwise

6
H/yapio.h
View File

@ -323,12 +323,6 @@ int STD_PROTO(Yap_growtrail_in_parser, (tr_fr_ptr *, TokEntry **, VarEntry **)
extern int errno; extern int errno;
#endif #endif
#ifdef DEBUG
#if COROUTINING
extern int Yap_Portray_delays;
#endif
#endif
EXTERN inline UInt STD_PROTO(HashFunction, (unsigned char *)); EXTERN inline UInt STD_PROTO(HashFunction, (unsigned char *));
EXTERN inline UInt STD_PROTO(WideHashFunction, (wchar_t *)); EXTERN inline UInt STD_PROTO(WideHashFunction, (wchar_t *));