[m-dev.] trivial diff in Morphine: /s/INSA/INSA de Rennes/

[Erwan Jahier]

I have already committed that on the main branch. (As Fergus pointed out) I
should also do that on the 0_9_x branch...

--
Estimated hours taken: 1

morphine/*:
morphine/*/*:
	Replace all occurrences of "INSA" by "INSA de Rennes" since Morphine is a "INSA de
	Rennes" software.

morphine/scripts/exec_mercury_program:
	Remove some useless I/O that were wrapping each Mercury program execution 
	within Morphine.

morphine/source/collect.op:
	Improve a little bit the documentation of collect/2.


Index: 2.4/source/util.pl
--- 2.4/source/util.pl Thu, 16 Dec 1999 19:19:45 +0100 jahier (opium/42_make.pl 1.22 640)
+++ 2.4(w)/source/util.pl Mon, 20 Dec 1999 20:03:20 +0100 jahier (opium/42_make.pl 1.22 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/morphine_kernel.op
--- 2.4/source/morphine_kernel.op Thu, 16 Dec 1999 19:19:45 +0100 jahier (opium/b/27_opium_M_ke 1.14 640)
+++ 2.4(w)/source/morphine_kernel.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/b/27_opium_M_ke 1.14 640)
@@ -1,5 +1,5 @@
 %--------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/forward_move.op
--- 2.4/source/forward_move.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/14_forward_mo 1.105 640)
+++ 2.4(w)/source/forward_move.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/14_forward_mo 1.105 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/current_arg.op
--- 2.4/source/current_arg.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/38_current_ar 1.47 640)
+++ 2.4(w)/source/current_arg.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/38_current_ar 1.47 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/current_slots.op
--- 2.4/source/current_slots.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/39_current_sl 1.49 640)
+++ 2.4(w)/source/current_slots.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/39_current_sl 1.49 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/event_attributes.op
--- 2.4/source/event_attributes.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/b/29_event_attr 1.15 640)
+++ 2.4(w)/source/event_attributes.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/b/29_event_attr 1.15 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/exec_control.op
--- 2.4/source/exec_control.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/b/31_exec_contr 1.30 640)
+++ 2.4(w)/source/exec_control.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/b/31_exec_contr 1.30 640)
@@ -1,5 +1,5 @@
 %--------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/coprocess.op
--- 2.4/source/coprocess.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/b/32_coprocess. 1.15 640)
+++ 2.4(w)/source/coprocess.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/b/32_coprocess. 1.15 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/interactive_queries.op
--- 2.4/source/interactive_queries.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/c/37_interactiv 1.5 640)
+++ 2.4(w)/source/interactive_queries.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/37_interactiv 1.5 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/browse.op
--- 2.4/source/browse.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/c/39_browse.op 1.3 640)
+++ 2.4(w)/source/browse.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/39_browse.op 1.3 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/step_by_step.op
--- 2.4/source/step_by_step.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/30_step_by_st 1.25 640)
+++ 2.4(w)/source/step_by_step.op Mon, 20 Dec 1999 20:03:20 +0100 jahier (opium/30_step_by_st 1.25 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
@@ -31,8 +31,8 @@
 	message		:
 "Command which moves forward to the next trace event according to the \
 ``traced_ports'' parameter. This is the same command as step/0 (``next'' is \
-the name used in the Prolog version of Opium, ``step'' is the name used in the \
-internal Mercury debugger)."
+the name used in Opium (The Prolog version of Morphine), ``step'' is the name \
+used in the internal Mercury debugger mdb)."
 	).
  
 
Index: 2.4/source/display.op
--- 2.4/source/display.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/23_display.pl 1.66 640)
+++ 2.4(w)/source/display.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/23_display.pl 1.66 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/source.op
--- 2.4/source/source.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/47_source.op 1.29 640)
+++ 2.4(w)/source/source.op Mon, 20 Dec 1999 20:03:20 +0100 jahier (opium/47_source.op 1.29 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/collect.op
--- 2.4/source/collect.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/d/7_collect.op 1.7 640)
+++ 2.4(w)/source/collect.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/d/7_collect.op 1.7 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
@@ -156,7 +156,10 @@
 "If File contains the implementation of the Mercury predicates initialize/1 \
 and filter/4, collect(File, Result) calls filter/4 with each event of the \
 execution and an accumulator initialized by initialize/1, and returns the \
-final value in Result.\n\
+final value in Result. The fourth argument of filter is a flag that is set \
+to `continue' or `stop' depending if you want to continue or stop the \
+monitoring process; this useful if one want to be able to stop the monitoring \
+process before the last event is reached.\n\
 \n\
 Here is an example of a simple monitor that counts calls.\n\
 If a file `count_call' contains the following statements:\n\
Index: 2.4/source/collect.in
--- 2.4/source/collect.in Fri, 12 Nov 1999 14:12:01 +0100 jahier (opium/d/18_collect.in 1.2 640)
+++ 2.4(w)/source/collect.in Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/d/18_collect.in 1.2 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 
 :- module collect.
 
Index: 2.4/source/control_flow.op
--- 2.4/source/control_flow.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/d/4_control_fl 1.7 640)
+++ 2.4(w)/source/control_flow.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/d/4_control_fl 1.7 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
@@ -242,7 +242,6 @@
 
 
 %------------------------------------------------------------------------------%
-% XXX I should write a tail recursive version of this predicate
 remove_dupl([], []).
 remove_dupl(L0, L) :-
 	L0 = [X|L1],
Index: 2.4/source/goal_path_at_all_ports.op
--- 2.4/source/goal_path_at_all_ports.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/c/34_goal_path_ 1.5 640)
+++ 2.4(w)/source/goal_path_at_all_ports.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/34_goal_path_ 1.5 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/coverage.op
--- 2.4/source/coverage.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/c/35_coverage.o 1.4 640)
+++ 2.4(w)/source/coverage.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/35_coverage.o 1.4 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/draft.op
--- 2.4/source/draft.op Wed, 15 Dec 1999 12:02:06 +0100 jahier (opium/c/36_draft.op 1.4 640)
+++ 2.4(w)/source/draft.op Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/36_draft.op 1.4 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 %
Index: 2.4/source/current.m
--- 2.4/source/current.m Tue, 14 Dec 1999 22:35:45 +0100 jahier (opium/c/33_current.m 1.3 640)
+++ 2.4(w)/source/current.m Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/33_current.m 1.3 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 %
 % Author : Erwan Jahier <jahier at irisa.fr>
 %
Index: 2.4/scripts/exec_mercury_program
--- 2.4/scripts/exec_mercury_program Thu, 04 Nov 1999 11:57:31 +0100 jahier (opium/25_exec_mercu 1.18 750)
+++ 2.4(w)/scripts/exec_mercury_program Mon, 20 Dec 1999 20:03:29 +0100 jahier (opium/25_exec_mercu 1.18 750)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 1999 INRIA/INSA.
+# Copyright (C) 1999 INRIA/INSA de Rennes.
 #
 # Author : Erwan Jahier <jahier at irisa.fr>
 #
@@ -10,11 +10,6 @@
 # the following arguments are the arguments of the program being called.
 
 
-echo "				       "	
-echo "---------------------------------"
-echo "[$4 ...]			       "
-echo "				       "
-
 SOCKETDOMAIN=$2
 REMOTEMACHINE=$3
 LOCALMACHINE=`uname -n`
@@ -52,8 +47,6 @@
 	        ;;
 esac
 
-echo ""
-echo "---------------------------------"
 
 
 
Index: 2.4/source/make_scenario.pl
--- 2.4/source/make_scenario.pl Thu, 16 Dec 1999 19:19:45 +0100 jahier (opium/37_make_scena 1.30 640)
+++ 2.4(w)/source/make_scenario.pl Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/37_make_scena 1.30 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/load_scenario.pl
--- 2.4/source/load_scenario.pl Thu, 16 Dec 1999 19:19:45 +0100 jahier (opium/c/31_load_scena 1.9 640)
+++ 2.4(w)/source/load_scenario.pl Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/31_load_scena 1.9 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/load_morphine.pl
--- 2.4/source/load_morphine.pl Thu, 16 Dec 1999 19:19:45 +0100 jahier (opium/b/18_Opium-M.pl 1.29 640)
+++ 2.4(w)/source/load_morphine.pl Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/b/18_Opium-M.pl 1.29 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 
Index: 2.4/source/load_morphine_without_banner.pl
--- 2.4/source/load_morphine_without_banner.pl Thu, 16 Dec 1999 19:19:45 +0100 jahier (opium/c/41_load_Opium 1.5 640)
+++ 2.4(w)/source/load_morphine_without_banner.pl Mon, 20 Dec 1999 20:03:19 +0100 jahier (opium/c/41_load_Opium 1.5 640)
@@ -1,5 +1,5 @@
 %------------------------------------------------------------------------------%
-% Copyright (C) 1999 INRIA/INSA.
+% Copyright (C) 1999 INRIA/INSA de Rennes.
 % This file may only be copied under the terms of the GNU Library General
 % Public License - see the file License in the Morphine distribution.
 % 


-- 
R1.


--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------