Merge branch 'master' of ssh://yap.git.sourceforge.net/gitroot/yap/yap-6.3

C/errors.c

@@ -1431,9 +1431,11 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
   case SYNTAX_ERROR:
     {
       int i;
+      Term ti[1];
 
       i = strlen(tmpbuf);
-      nt[0] = where;
+      ti[0] = MkAtomTerm(AtomSyntaxError);
+      nt[0] = Yap_MkApplTerm(FunctorShortSyntaxError, 1, ti);
       psize -= i;
       fun = FunctorError;
       serious = TRUE;
@@ -1807,6 +1809,9 @@ E);
 	LOCAL_Error_Size = 0L;
       }
       nt[1] = MkPairTerm(MkAtomTerm(Yap_LookupAtom(tmpbuf)), stack_dump);
+      if (type == SYNTAX_ERROR) {
+	nt[1] = MkPairTerm(where, nt[1]);
+      }
     }
   }
   if (serious) {

C/init.c

@@ -654,7 +654,7 @@ Yap_InitAsmPred(char *Name,  unsigned long int Arity, int code, CPredicate def,
       p_code->opc = Yap_opcode(_allocate);
       p_code = NEXTOP(p_code,e);
     }
-    p_code->opc = pe->OpcodeOfPred = Yap_opcode(_call_cpred);
+    p_code->opc = Yap_opcode(_call_cpred);
     p_code->u.Osbpp.bmap = NULL;
     p_code->u.Osbpp.s = -Signed(RealEnvSize);
     p_code->u.Osbpp.p = p_code->u.Osbpp.p0 = pe;
@@ -669,6 +669,7 @@ Yap_InitAsmPred(char *Name,  unsigned long int Arity, int code, CPredicate def,
     p_code = NEXTOP(p_code,p);
     p_code->opc = Yap_opcode(_Ystop);
     p_code->u.l.l = cl->ClCode;
+    pe->OpcodeOfPred = pe->CodeOfPred->opc;
   } else {
     pe->OpcodeOfPred = Yap_opcode(_undef_p);
     pe->CodeOfPred =  (yamop *)(&(pe->OpcodeOfPred)); 

C/iopreds.c

@@ -383,8 +383,9 @@ GenerateSyntaxError(Term *tp, TokEntry *tokstart, IOSTREAM *sno USES_REGS)
   if (tp) {
     Term et[2];
     Term t = MkVarTerm();
-    et[0] = syntax_error(tokstart, sno, &t);
+    et[1] = MkPairTerm(syntax_error(tokstart, sno, &t), TermNil);
-    et[1] = MkAtomTerm(Yap_LookupAtom("Syntax error"));
+    t = MkAtomTerm(AtomSyntaxError);
+    et[0] = Yap_MkApplTerm(FunctorShortSyntaxError,1,&t);
     *tp = Yap_MkApplTerm(FunctorError, 2, et);
   }
 }

library/dialect/swi/fli/swi.c

@@ -2833,9 +2833,14 @@ Yap_read_term(term_t t, IOSTREAM *st, term_t *excep, term_t vs)
 {
   CACHE_REGS
   Term varnames, out, tpos;
-  Term error;
+  Term error, *vp;
 
-  if (!Yap_readTerm(st, &out, &varnames, &error, &tpos)) {
+  if (vs) {
+    vp = & varnames;
+  } else {
+    vp = NULL;
+  }
+  if (!Yap_readTerm(st, &out, vp, &error, &tpos)) {
     if (excep) {
       *excep = Yap_InitSlot(error PASS_REGS);
     }
@@ -2850,7 +2855,8 @@ Yap_read_term(term_t t, IOSTREAM *st, term_t *excep, term_t vs)
   if (!Yap_unify(out, Yap_GetFromSlot(t PASS_REGS))) {
     return FALSE;
   }
-  if (!Yap_unify(varnames, Yap_GetFromSlot(vs PASS_REGS))) {
+  if (vp &&
+      !Yap_unify(varnames, Yap_GetFromSlot(vs PASS_REGS))) {
     return FALSE;
   }
   return TRUE;

pl/errors.yap

@@ -255,8 +255,6 @@ print_message(Severity, Term) :-
 	   '$print_system_message'(Term, Severity, Lines)
 	), !.
 print_message(silent, _) :-  !.
-print_message(_, error(syntax_error(syntax_error(_,between(_,L,_),_,_,_,_,StreamName)),_)) :-  !,
-	format(user_error,'SYNTAX ERROR at ~a, close to ~d~n',[StreamName,L]).
 print_message(_, loading(A, F)) :- !,
 	format(user_error,'  % ~a ~a~n',[A,F]).
 print_message(_, loaded(A, F, _, Time, Space)) :- !,
@@ -284,13 +282,6 @@ print_message(_, Term) :-
 	current_prolog_flag(verbose, silent), !.
 '$print_system_message'(_, banner, _) :-
 	current_prolog_flag(verbose, silent), !.
-'$print_system_message'(Term, Level, Lines) :-
-	Term = error(syntax_error(syntax_error(_,_,_,_,_,_,_)),_), !,
-	flush_output(user_output),
-	flush_output(user_error),
-	'$messages':prefix(Level, LinePrefix, Stream, _, Lines), !,
-	% make sure we don't give a PC.
-	print_message_lines(Stream, LinePrefix, Lines).
 '$print_system_message'(Term, Level, Lines) :-
 	'$messages':prefix(Level, LinePrefix, Stream, Prefix),
 	'$messages':file_location(Prefix, LinesF, Lines), !,

pl/messages.yap

@@ -283,14 +283,14 @@ system_message(error(resource_error(trail), Where)) -->
 	[ 'RESOURCE ERROR- not enough trail space' - [Where] ].
 system_message(error(signal(SIG,_), _)) -->
 	[ 'UNEXPECTED SIGNAL: ~a' - [SIG] ].
-system_message(error(syntax_error(G,_,Msg,[],_,0,File), _)) -->
+system_message(error(syntax_error(_), [syntax_error(G,_,Msg,[],_,0,File)|_])) -->
 	[ 'SYNTAX ERROR at "~a", goal ~q: ~a' - [File,G,Msg] ].
 % SWI like I/O error message.
-system_message(error(syntax_error(end_of_clause), stream(Stream, Line, _, _))) -->
+system_message(error(syntax_error(end_of_clause), [stream(Stream, Line, _, _)|_])) -->
 	[ 'SYNTAX ERROR ~a, stream ~w, near line ~d.' - ['Unexpected end of clause',Stream,Line] ].
-system_message(error(syntax_error(read(_),_,_,Term,Pos,Start,File), Where)) -->
+system_message(error(syntax_error(_), [syntax_error(read(_),_,_,Term,Pos,Start,File)|_])) -->
 	{ Term = [_|_] },
-	['~w' - [Where]],
+	['SYNTAX ERROR' - []],
 	syntax_error_line(File, Start, Pos),
 	syntax_error_term(10, Pos, Term),
 	[ '.' ].