ugh

C/qlyr.c

@@ -863,6 +863,9 @@ static void read_clauses(FILE *stream, PredEntry *pp, UInt nclauses,
       } while (cl != NULL);
     }
     if (!nclauses) {
+    pp->CodeOfPred = pp->cs.p_code.TrueCodeOfPred = FAILCODE;
+    pp->OpcodeOfPred = FAIL_OPCODE;
+
       return;
     }
     while ((read_tag(stream) == QLY_START_LU_CLAUSE)) {
@@ -947,6 +950,10 @@ static void read_clauses(FILE *stream, PredEntry *pp, UInt nclauses,
         Yap_EraseStaticClause(cl, pp, CurrentModule);
         cl = ncl;
       } while (cl != NULL);
+    } else if (flags & MultiFileFlag) {
+    pp->CodeOfPred = pp->cs.p_code.TrueCodeOfPred = FAILCODE;
+    pp->OpcodeOfPred = FAIL_OPCODE;
+
     }
     for (i = 0; i < nclauses; i++) {
       char *base = (void *)read_UInt(stream);

C/write.c

@@ -77,8 +77,6 @@ typedef struct write_globs {
   int last_atom_minus;
   UInt MaxDepth, MaxArgs;
   wtype lw;
-  yhandle_t sl0, sl;
-  bool protectedEntry;
 } wglbs;
 
 #define lastw wglb->lw
@@ -102,10 +100,11 @@ static bool callPortray(Term t, int sno USES_REGS) {
   return false;
 }
 
-#define PROTECT(t, F)  \
+#define PROTECT(t, F)                                                          \
-  {  \
+  {                                                                            \
-    F;            \
+    yhandle_t yt = Yap_InitHandle(t);                                          \
-    t = Yap_GetFromSlot(wglb->sl); \
+    F;                                                                         \
+    t = Yap_PopHandle(yt);                                                     \
   }
 static void wrputn(Int, struct write_globs *);
 static void wrputf(Float, struct write_globs *);
@@ -117,11 +116,6 @@ static wtype AtomIsSymbols(unsigned char *);
 static void putAtom(Atom, int, struct write_globs *);
 static void writeTerm(Term, int, int, int, struct write_globs *,
                       struct rewind_term *);
-static void writeTerm__(Term t, yhandle_t sl, int p, int depth, int rinfixarg,
-                      struct write_globs *wglb, struct rewind_term *rwt);
-
-static void write_list(Term t, int direction, int depth,
-                       struct write_globs *wglb, struct rewind_term *rwt);
 
 #define wrputc(WF, X)                                                          \
   (X)->stream_wputc(X - GLOBAL_Stream, WF) /* writes a character */
@@ -273,7 +267,7 @@ static void writebig(Term t, int p, int depth, int rinfixarg,
     return;
   } else if (big_tag == BIG_RATIONAL) {
     Term trat = Yap_RatTermToApplTerm(t);
-    writeTerm__(trat,wglb->sl, p, depth, rinfixarg, wglb, rwt);
+    writeTerm(trat, p, depth, rinfixarg, wglb, rwt);
     return;
 #endif
   } else if (big_tag >= USER_BLOB_START && big_tag < USER_BLOB_END) {
@@ -387,7 +381,8 @@ int Yap_FormatFloat(Float f, char **s, size_t sz) {
   struct write_globs wglb;
   int sno;
 
-  sno = Yap_open_buf_write_stream(GLOBAL_Stream[LOCAL_c_output_stream].encoding, 0);
+  sno = Yap_open_buf_write_stream(GLOBAL_Stream[LOCAL_c_output_stream].encoding,
+                                  0);
   if (sno < 0)
     return false;
   wglb.lw = separator;
@@ -706,9 +701,7 @@ static void write_var(CELL *t, struct write_globs *wglb,
         wrputs("$AT(", wglb->stream);
         write_var(t, wglb, rwt);
         wrputc(',', wglb->stream);
-	CELL tt = (CELL)t;
+        PROTECT(*t, writeTerm(*l, 999, 1, FALSE, wglb, &nrwt));
-        PROTECT(tt, writeTerm(*l, 999, 1, FALSE, wglb, &nrwt));
-	t = (CELL *)tt;
         attv = RepAttVar(t);
         wrputc(',', wglb->stream);
         l++;
@@ -725,32 +718,13 @@ static void write_var(CELL *t, struct write_globs *wglb,
   }
 }
 
-static bool check_for_loops(Term t, struct write_globs *wglb)
+static void write_list(Term t, int direction, int depth,
-{
-  yhandle_t i, sl = wglb->sl;
-  if ((wglb->Write_Loops)) {
-    return false;
-  }
-  for (i=sl-1; i>wglb->sl0;i--) {	 
-    if (Yap_GetFromHandle(i) == t)  {
-      char buf[64];
-      snprintf(buf,63," @{ ^^%ld } " ,sl-i);
-      wrputs(buf, wglb->stream);
-      return true;
-    } 
-  }
-  return false;
-}
-
-
-static void write_list__(Term t, yhandle_t sl, int direction, int depth,
                        struct write_globs *wglb, struct rewind_term *rwt) {
   Term ti;
   struct rewind_term nrwt;
   nrwt.parent = rwt;
   nrwt.u_sd.s.ptr = 0;
 
-
   while (1) {
     int ndirection;
     int do_jump;
@@ -761,18 +735,16 @@ static void write_list__(Term t, yhandle_t sl, int direction, int depth,
       break;
     if (!IsPairTerm(ti))
       break;
-  if (check_for_loops(ti,wglb)) return;
-    wglb->sl = Yap_InitHandle(ti);
     ndirection = RepPair(ti) - RepPair(t);
     /* make sure we're not trapped in loops */
     if (ndirection > 0) {
       do_jump = (direction <= 0);
-    } /*else if (ndirection == 0) {
+    } else if (ndirection == 0) {
       wrputc(',', wglb->stream);
       putAtom(AtomFoundVar, wglb->Quote_illegal, wglb);
       lastw = separator;
       return;
-      } */ else {
+    } else {
       do_jump = (direction >= 0);
     }
     if (wglb->MaxDepth != 0 && depth > wglb->MaxDepth) {
@@ -806,24 +778,16 @@ static void write_list__(Term t, yhandle_t sl, int direction, int depth,
   }
 }
 
-static void write_list(Term t, int direction, int depth,
+static void writeTerm(Term t, int p, int depth, int rinfixarg,
-                       struct write_globs *wglb, struct rewind_term *rwt) {
-  if (check_for_loops(t,wglb)) return;
-  yhandle_t sl = wglb->sl = Yap_InitHandle(t);
-    write_list__(t, sl,  direction, depth,
-	       wglb, rwt);
-     Yap_PopHandle(sl);	
-    wglb->sl = sl-1;
-}
-
-
-static void writeTerm__(Term t, yhandle_t sl, int p, int depth, int rinfixarg,
                       struct write_globs *wglb, struct rewind_term *rwt)
 /* term to write			 */
 /* context priority			 */
 {
   CACHE_REGS
-    struct rewind_term nrwt;
+  struct rewind_term nrwt;
+  nrwt.parent = rwt;
+  nrwt.u_sd.s.ptr = 0;
+
   if (wglb->MaxDepth != 0 && depth > wglb->MaxDepth) {
     putAtom(Atom3Dots, wglb->Quote_illegal, wglb);
     return;
@@ -857,7 +821,7 @@ static void writeTerm__(Term t, yhandle_t sl, int p, int depth, int rinfixarg,
       wrputc('[', wglb->stream);
       lastw = separator;
       /* we assume t was already saved in the stack */
-      write_list__(t, wglb->sl, 0, depth, wglb, rwt);
+      write_list(t, 0, depth, wglb, rwt);
       wrputc(']', wglb->stream);
       lastw = separator;
     }
@@ -909,7 +873,7 @@ static void writeTerm__(Term t, yhandle_t sl, int p, int depth, int rinfixarg,
         *p++;
         lastw = separator;
         /* cannot use the term directly with the SBA */
-        writeTerm(*p, 999, depth + 1, FALSE, wglb, &nrwt);
+        PROTECT(t, writeTerm(*p, 999, depth + 1, FALSE, wglb, &nrwt));
         if (*p)
           wrputc(',', wglb->stream);
         argno++;
@@ -1126,17 +1090,6 @@ static void writeTerm__(Term t, yhandle_t sl, int p, int depth, int rinfixarg,
   }
 }
 
-static void writeTerm(Term t, int p, int depth, int rinfixarg,
-                      struct write_globs *wglb, struct rewind_term *rwt)
-{
-  if (check_for_loops(t,wglb)) return;
-   yhandle_t sl = wglb->sl = Yap_InitHandle(t);
-    writeTerm__(t, sl,  p, depth, rinfixarg,
-	       wglb, rwt);
-    Yap_PopHandle(sl);				
-    wglb->sl = sl-1;
-}
-
 void Yap_plwrite(Term t, StreamDesc *mywrite, int max_depth, int flags,
                  int priority)
 /* term to be written			 */
@@ -1171,7 +1124,6 @@ void Yap_plwrite(Term t, StreamDesc *mywrite, int max_depth, int flags,
   rwt.parent = NULL;
   wglb.Ignore_ops = flags & Ignore_ops_f;
   wglb.Write_strings = flags & BackQuote_String_f;
-  wglb.Write_Loops = flags & YAP_WRITE_HANDLE_CYCLES;
   if (!(flags & Ignore_cyclics_f) && false) {
     Term ts[2];
     ts[0] = Yap_BreakRational(t, 0, ts + 1, TermNil PASS_REGS);
@@ -1183,8 +1135,7 @@ void Yap_plwrite(Term t, StreamDesc *mywrite, int max_depth, int flags,
     }
   }
   /* protect slots for portray */
-  wglb.sl0  = (wglb.sl = Yap_InitHandle(t))-1;
+  writeTerm(t, priority, 1, FALSE, &wglb, &rwt);
-  writeTerm__(t,wglb.sl, priority, 1, FALSE, &wglb, &rwt);
   if (flags & New_Line_f) {
     if (flags & Fullstop_f) {
       wrputc('.', wglb.stream);

pl/messages.yap

@@ -108,7 +108,8 @@ In YAP, the info field describes:
 :- use_system_module( user, [message_hook/3]).
 
 %:- start_low_level_trace.
-:- multifile prolog:message/3.
+:- dynamic  prolog:message//1.
+:- multifile prolog:message//1.
 %:- stop_low_level_trace.
 :- multifile user:message_hook/3.
 
@@ -374,7 +375,8 @@ display_consulting( F, Level, Info, LC) -->
        '$error_descriptor'(Info, Desc),
        query_exception(prologParserFile, Desc, F0),
        query_exception(prologParserLine, Desc, L),
-       F \= F0
+       integer(L)
+,       F \= F0
     }, !,
     [ '~a:~d:0: ~a raised at:'-[F0,L,Level], nl ].
 display_consulting( F, Level, _, LC) -->

pl/undefined.yap

@@ -97,7 +97,7 @@ undefined_query(G0, M0, Cut) :-
 '$undefp'([M0|G0],MG) :-
     % make sure we do not loop on undefined predicates
     '$undef_setup'(M0:G0, Action,Debug,Current, MGI),
-    ('$get_undefined_predicates'(Current, MGI, MG )                                                  , MG) 
+    ('$get_undefined_predicates'( MGI, MG )                                                  , MG) 
     ->
         true
     ;
@@ -119,10 +119,11 @@ undefined_query(G0, M0, Cut) :-
 '$handle_error'(fail,_Goal,_Mod) :-
     fail.
 
-'$undef_setup'(Action,Debug,Current) :-
+'$undef_setup'(G0,Action,Debug,Current,GI) :-
     yap_flag( unknown, Action, fail),
     yap_flag( debug, Debug, false),
-    '$stop_creeping'(Current).
+    '$stop_creeping'(Current),
+    '$g2i'(G0,GI).
 
 '$g2i'(user:G, Na/Ar ) :-
         !,