From a3f3d62b1b3b43d7b6c967973d57e1097c716197 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Mon, 25 Feb 2008 10:15:31 +0000
Subject: [PATCH] more fixes to messages improve lineutils

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2117 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 library/lineutils.yap | 62 ++++++++++++++++++++++++++++++++++++++-----
 pl/messages.yap       |  8 +++---
 2 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/library/lineutils.yap b/library/lineutils.yap
index 837fbb897..44c6af6c3 100644
--- a/library/lineutils.yap
+++ b/library/lineutils.yap
@@ -2,11 +2,21 @@
 	  [search_for/3,
 	   scan_natural/3,
 	   scan_integer/3,
-	   split/3
+	   split/3,
+	   glue/3,
+	   filter/3,
+	   copy_line/2,
+	   file_filter/3
 	  ]).
 
+:- meta_predicate filter(+,+,:).
+
 :- use_module(library(lists),
-	      [member/2]).
+	      [member/2,
+	       append/3]).
+
+:- use_module(library(readutil),
+	      [read_line_to_codes/2]).
 
 
 search_for(C) --> [C], !.
@@ -27,15 +37,55 @@ scan_natural(N0,N) -->
 	get_natural(N1,N).
 scan_natural(N,N) --> [].
 
-split(String, SplitCodes, [S|Strings]) :-
-	split(SplitCodes, S, Strings, String, []).
+split(String, SplitCodes, Strings) :-
+	split_at_blank(SplitCodes, Strings, String, []).
 
-split(SplitCodes, [], [New|Set]) -->
+split_at_blank(SplitCodes, More) -->
 	[C],
 	{ member(C, SplitCodes) }, !,
-	split(SplitCodes, New, Set).
+	split_at_blank(SplitCodes, More).
+split_at_blank(SplitCodes, [[C|New]| More]) -->
+	[C], !,
+	split(SplitCodes, New, More).
+split_at_blank(_, []) --> [].
+
+split(SplitCodes, [], More) -->
+	[C],
+	{ member(C, SplitCodes) }, !,
+	split_at_blank(SplitCodes, More).
 split(SplitCodes, [C|New], Set) -->
 	[C], !,
 	split(SplitCodes, New, Set).
 split(_, [], []) --> [].
 
+glue([], _, []).
+glue([H|T], [B|_], Merged) :-
+	append(H, [B|Rest], Merged),
+	glue(T, [B], Rest).
+
+copy_line(StreamInp, StreamOut) :-
+	read_line_to_codes(StreamInp, Line),
+	format(StreamOut, '~s~n', [Line]).
+
+filter(StreamInp, StreamOut, Command) :-
+	repeat,
+	read_line_to_codes(StreamInp, Line),
+	(
+	 Line == end_of_file
+	->
+	 true
+	;
+	 call(Command, Line, NewLine),
+	 format(StreamOut, '~s~n', [NewLine]),
+	 fail
+	).
+
+
+file_filter(Inp, Out, Command) :-
+	open(Inp, read, StreamInp),
+	open(Out, write, StreamOut),
+	filter(StreamInp, StreamOut, Command),
+	close(StreamInp),
+	close(StreamOut).
+
+
diff --git a/pl/messages.yap b/pl/messages.yap
index e7860ac71..e01f429e3 100644
--- a/pl/messages.yap
+++ b/pl/messages.yap
@@ -11,7 +11,7 @@
 * File:		utilities for displaying messages in YAP.		 *
 * comments:	error messages for YAP					 *
 *									 *
-* Last rev:     $Date: 2008-02-23 01:32:31 $,$Author: vsc $						 *
+* Last rev:     $Date: 2008-02-25 10:15:31 $,$Author: vsc $						 *
 *									 *
 *									 *
 *************************************************************************/
@@ -58,7 +58,7 @@ generate_message(prompt(BreakLevel,TraceDebug)) --> !,
 	    )
 	;
 	    (
-	     var(TraceDebug) ->
+	     { var(TraceDebug) } ->
 	     [ '~d' - [BreakLevel] ]
 	    ;
 	     [ '~d ~a' - [BreakLevel, TraceDebug] ]
@@ -252,7 +252,7 @@ system_message(error(system_error(Message), Where)) -->
 system_message(error(type_error(T,_,Err,M), _Where)) -->
 	[ 'TYPE ERROR- ~w: expected ~w, got ~w' - [T,Err,M] ].
 system_message(error(type_error(TE,W), Where)) -->
-	{ type_error(TE, M) }, !,
+	{ object_name(TE, M) }, !,
 	[ 'TYPE ERROR- ~w: expected ~a, got ~w' - [Where,M,W] ].
 system_message(error(type_error(TE,W), Where)) -->
 	[ 'TYPE ERROR- ~w: expected ~q, got ~w' - [Where,TE,W] ].
@@ -302,7 +302,7 @@ domain_error(predicate_spec, Opt) --> !,
 	[ '~w invalid predicate specifier' - [Opt] ].
 domain_error(radix, Opt) --> !,
 	[ 'invalid radix ~w' - [Opt] ].
-domain_error(read_option, Opt) --> !,
+vdomain_error(read_option, Opt) --> !,
 	[ '~w invalid option to read_term' - [Opt] ].
 domain_error(semantics_indicatior, Opt) --> !,
 	[ '~w expected predicate indicator, got ~w' - [Opt] ].