[m-rev.] diff: fix compilation of extras
Julien Fischer
juliensf at cs.mu.OZ.AU
Thu Mar 30 12:19:22 AEDT 2006
Estimated hours taken: 0.5
Branches: main
Fix compilation problems in the extras distribution caused by recent
changes.
extras/stream/stream.m:
Provide a definition for the type stream/1.
extras/*/*.m:
Conform to the recent changes to the standard library.
Julien.
Index: cgi/cgi.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/cgi/cgi.m,v
retrieving revision 1.4
diff -u -r1.4 cgi.m
--- cgi/cgi.m 9 Aug 2001 00:22:27 -0000 1.4
+++ cgi/cgi.m 30 Mar 2006 00:53:52 -0000
@@ -19,7 +19,11 @@
:- module cgi.
:- interface.
-:- import_module io, string, assoc_list, std_util.
+
+:- import_module assoc_list.
+:- import_module io.
+:- import_module maybe.
+:- import_module string.
% cgi__get_form(MaybeFormEntries):
% This procedure should be called form within a CGI program
@@ -45,7 +49,13 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module html, int, char, list.
+
+:- import_module html.
+
+:- import_module char.
+:- import_module int.
+:- import_module list.
+:- import_module pair.
%-----------------------------------------------------------------------------%
Index: cgi/html.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/cgi/html.m,v
retrieving revision 1.2
diff -u -r1.2 html.m
--- cgi/html.m 26 Apr 2000 05:24:37 -0000 1.2
+++ cgi/html.m 30 Mar 2006 00:52:22 -0000
@@ -19,7 +19,12 @@
:- module html.
:- interface.
-:- import_module bool, io, string, std_util, list.
+
+:- import_module bool.
+:- import_module io.
+:- import_module list.
+:- import_module pair.
+:- import_module string.
%-----------------------------------------------------------------------------%
Index: curses/user.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/curses/user.m,v
retrieving revision 1.7
diff -u -r1.7 user.m
--- curses/user.m 2 May 2005 02:29:37 -0000 1.7
+++ curses/user.m 30 Mar 2006 00:54:56 -0000
@@ -25,7 +25,7 @@
:- module mcurses__user.
:- interface.
-:- import_module char, io, list, std_util.
+:- import_module char, io, list, pair.
% The ADT used to represent a curses window.
:- type win.
Index: error/error.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/error/error.m,v
retrieving revision 1.1
diff -u -r1.1 error.m
--- error/error.m 12 Apr 2003 03:33:41 -0000 1.1
+++ error/error.m 30 Mar 2006 00:55:49 -0000
@@ -67,7 +67,7 @@
:- implementation.
-:- import_module bool, char, int, list, map, std_util, string.
+:- import_module bool, char, int, list, map, maybe, pair, string.
:- type errors == map(file, map(line, list(message))).
Index: lex/lex.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/lex/lex.m,v
retrieving revision 1.5
diff -u -r1.5 lex.m
--- lex/lex.m 3 Dec 2002 04:48:32 -0000 1.5
+++ lex/lex.m 30 Mar 2006 00:58:22 -0000
@@ -21,10 +21,14 @@
%-----------------------------------------------------------------------------%
:- module lex.
-
:- interface.
-:- import_module std_util, string, char, list, io.
+:- import_module char.
+:- import_module io.
+:- import_module list.
+:- import_module maybe.
+:- import_module pair.
+:- import_module string.
:- type token_creator(Token)
== (func(string) = Token).
Index: lex/regex.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/lex/regex.m,v
retrieving revision 1.1
diff -u -r1.1 regex.m
--- lex/regex.m 3 Dec 2002 04:48:32 -0000 1.1
+++ lex/regex.m 30 Mar 2006 00:59:07 -0000
@@ -180,7 +180,7 @@
:- implementation.
-:- import_module int, char, bool, require, std_util, io.
+:- import_module int, char, bool, require, std_util, pair, io.
Index: moose/grammar.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/moose/grammar.m,v
retrieving revision 1.8
diff -u -r1.8 grammar.m
--- moose/grammar.m 24 Jul 2003 05:38:07 -0000 1.8
+++ moose/grammar.m 30 Mar 2006 01:00:45 -0000
@@ -149,7 +149,7 @@
:- implementation.
:- import_module misc.
-:- import_module bool, int, require, std_util, string.
+:- import_module bool, int, require, pair, string, solutions.
%------------------------------------------------------------------------------%
Index: moose/lalr.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/moose/lalr.m,v
retrieving revision 1.4
diff -u -r1.4 lalr.m
--- moose/lalr.m 16 Jul 2003 07:16:02 -0000 1.4
+++ moose/lalr.m 30 Mar 2006 01:01:05 -0000
@@ -53,7 +53,7 @@
:- implementation.
-:- import_module array, bool, list, map, require, std_util, term.
+:- import_module array, bool, list, map, require, pair, term.
%------------------------------------------------------------------------------%
Index: moose/mercury_syntax.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/moose/mercury_syntax.m,v
retrieving revision 1.3
diff -u -r1.3 mercury_syntax.m
--- moose/mercury_syntax.m 24 Jul 2003 05:38:07 -0000 1.3
+++ moose/mercury_syntax.m 30 Mar 2006 01:01:19 -0000
@@ -78,7 +78,7 @@
:- implementation.
-:- import_module int, require, std_util, string, term_io.
+:- import_module int, require, pair, string, term_io.
%------------------------------------------------------------------------------%
Index: moose/misc.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/moose/misc.m,v
retrieving revision 1.2
diff -u -r1.2 misc.m
--- moose/misc.m 16 Jul 2003 07:16:03 -0000 1.2
+++ moose/misc.m 30 Mar 2006 01:00:14 -0000
@@ -5,10 +5,11 @@
%----------------------------------------------------------------------------%
:- module misc.
-
:- interface.
-:- import_module map, set, std_util.
+:- import_module map.
+:- import_module pair.
+:- import_module set.
:- type '' ---> ''.
Index: moose/moose.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/moose/moose.m,v
retrieving revision 1.9
diff -u -r1.9 moose.m
--- moose/moose.m 24 Feb 2004 00:39:58 -0000 1.9
+++ moose/moose.m 30 Mar 2006 01:01:33 -0000
@@ -23,7 +23,7 @@
:- import_module grammar, lalr, tables, check, mercury_syntax, misc, options.
:- import_module array, bool, getopt, int, list, map, require.
-:- import_module set, std_util, string, term, term_io, varset.
+:- import_module set, pair, string, term, term_io, varset.
main(!IO) :-
parse_options(MOptions, Args, !IO),
Index: odbc/odbc.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/odbc/odbc.m,v
retrieving revision 1.18
diff -u -r1.18 odbc.m
--- odbc/odbc.m 12 Feb 2005 13:53:49 -0000 1.18
+++ odbc/odbc.m 30 Mar 2006 01:03:27 -0000
@@ -55,14 +55,14 @@
% SQL strings.
%
%-----------------------------------------------------------------------------%
-%
-:- module odbc.
-%
-%-----------------------------------------------------------------------------%
+:- module odbc.
:- interface.
-:- import_module io, list, std_util.
+:- import_module list.
+:- import_module io.
+:- import_module string.
+:- import_module pair.
%-----------------------------------------------------------------------------%
@@ -277,9 +277,15 @@
%-----------------------------------------------------------------------------%
%-----------------------------------------------------------------------------%
+
:- implementation.
-:- import_module assoc_list, exception, int, require, std_util, string.
+:- import_module assoc_list.
+:- import_module exception.
+:- import_module int.
+:- import_module require.
+:- import_module unit.
+:- import_module univ.
%-----------------------------------------------------------------------------%
Index: odbc/odbc_test.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/odbc/odbc_test.m,v
retrieving revision 1.3
diff -u -r1.3 odbc_test.m
--- odbc/odbc_test.m 21 Mar 2000 05:39:29 -0000 1.3
+++ odbc/odbc_test.m 30 Mar 2006 01:04:38 -0000
@@ -15,10 +15,19 @@
:- pred main(io__state::di, io__state::uo) is cc_multi.
%-----------------------------------------------------------------------------%
+%-----------------------------------------------------------------------------%
+
:- implementation.
-:- import_module exception, list, string, std_util.
:- import_module odbc.
+
+:- import_module exception.
+:- import_module list.
+:- import_module pair.
+:- import_module string.
+:- import_module univ.
+
+%-----------------------------------------------------------------------------%
main -->
odbc__data_sources(SourceResult - SourceMessages),
Index: quickcheck/qcheck.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/quickcheck/qcheck.m,v
retrieving revision 1.5
diff -u -r1.5 qcheck.m
--- quickcheck/qcheck.m 24 Mar 2006 02:45:03 -0000 1.5
+++ quickcheck/qcheck.m 30 Mar 2006 00:51:21 -0000
@@ -23,9 +23,9 @@
:- import_module float.
:- import_module io.
:- import_module list.
-:- import_module std_util.
:- import_module string.
:- import_module type_desc.
+:- import_module univ.
%---------------------------------------------------------------------------%
Index: quickcheck/rnd.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/quickcheck/rnd.m,v
retrieving revision 1.1
diff -u -r1.1 rnd.m
--- quickcheck/rnd.m 31 May 2001 02:08:45 -0000 1.1
+++ quickcheck/rnd.m 30 Mar 2006 00:51:00 -0000
@@ -17,7 +17,7 @@
:- interface.
-:- import_module float, int, list, std_util.
+:- import_module float, int, list, pair.
:- type rnd.
Index: solver_types/library/any_assoc_list.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/solver_types/library/any_assoc_list.m,v
retrieving revision 1.3
diff -u -r1.3 any_assoc_list.m
--- solver_types/library/any_assoc_list.m 15 Nov 2005 03:37:57 -0000 1.3
+++ solver_types/library/any_assoc_list.m 30 Mar 2006 01:06:21 -0000
@@ -19,7 +19,7 @@
:- import_module any_list.
:- import_module list.
-:- import_module std_util.
+:- import_module pair.
%-----------------------------------------------------------------------------%
@@ -87,6 +87,7 @@
:- import_module any_util.
:- import_module require.
:- import_module string.
+:- import_module type_desc.
any_assoc_list__from_corresponding_lists(Ks, Vs, KVs) :-
promise_pure (
Index: stream/impure.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/stream/impure.m,v
retrieving revision 1.2
diff -u -r1.2 impure.m
--- stream/impure.m 22 Nov 2001 11:04:41 -0000 1.2
+++ stream/impure.m 30 Mar 2006 00:48:04 -0000
@@ -84,7 +84,7 @@
:- implementation.
:- import_module mvar.
-:- import_module exception, std_util.
+:- import_module exception, unit.
:- type impure(S)
---> impure(
Index: stream/lowlevel.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/stream/lowlevel.m,v
retrieving revision 1.2
diff -u -r1.2 lowlevel.m
--- stream/lowlevel.m 22 Nov 2001 11:04:41 -0000 1.2
+++ stream/lowlevel.m 30 Mar 2006 00:47:45 -0000
@@ -90,7 +90,7 @@
:- implementation.
:- import_module mvar.
-:- import_module exception, std_util.
+:- import_module exception, unit.
:- type lowlevel(S)
---> lowlevel(
Index: stream/stream.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/stream/stream.m,v
retrieving revision 1.2
diff -u -r1.2 stream.m
--- stream/stream.m 22 Nov 2001 11:04:41 -0000 1.2
+++ stream/stream.m 30 Mar 2006 00:50:09 -0000
@@ -203,6 +203,9 @@
:- import_module mvar.
:- import_module int, string.
+
+:- type stream(S) ---> stream.
+
:- type putback(S)
---> pb(
S,
Index: trailed_update/tr_array.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/tr_array.m,v
retrieving revision 1.10
diff -u -r1.10 tr_array.m
--- trailed_update/tr_array.m 1 Mar 2005 13:29:03 -0000 1.10
+++ trailed_update/tr_array.m 30 Mar 2006 01:06:58 -0000
@@ -15,7 +15,7 @@
:- module tr_array.
:- interface.
-:- import_module array, list, std_util.
+:- import_module array, list, maybe.
%-----------------------------------------------------------------------------%
%
Index: trailed_update/tr_store.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/tr_store.m,v
retrieving revision 1.14
diff -u -r1.14 tr_store.m
--- trailed_update/tr_store.m 1 Mar 2005 13:29:03 -0000 1.14
+++ trailed_update/tr_store.m 30 Mar 2006 01:08:41 -0000
@@ -163,7 +163,7 @@
%-----------------------------------------------------------------------------%
:- implementation.
-:- import_module std_util.
+:- import_module deconstruct.
:- pragma foreign_proc("C",
new_mutvar(Val::in, Mutvar::out, S0::mdi, S::muo),
@@ -226,7 +226,7 @@
ref_functor(Ref, Functor, Arity, !S) :-
unsafe_ref_value(Ref, Val, !S),
- functor(Val, Functor, Arity).
+ functor(Val, canonicalize, Functor, Arity).
:- pragma foreign_decl("C", "#include ""mercury_deconstruct.h""").
Index: trailed_update/var.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/trailed_update/var.m,v
retrieving revision 1.24
diff -u -r1.24 var.m
--- trailed_update/var.m 1 Mar 2005 13:29:03 -0000 1.24
+++ trailed_update/var.m 30 Mar 2006 01:09:19 -0000
@@ -28,7 +28,7 @@
:- module var.
:- interface.
-:- import_module io, std_util.
+:- import_module io, maybe.
% A `var(T)' is a Prolog-style variable that holds a value of type T.
%
@@ -146,6 +146,7 @@
:- import_module bool.
:- import_module unsafe, io.
:- import_module require.
+:- import_module type_desc.
:- pragma foreign_decl("C", "#include <stdio.h>").
@@ -233,7 +234,7 @@
% types; instead we just hack it by munging the type_infos manually
% using some unsafe casts
-:- type type_info_for_t2 == type_info.
+:- type type_info_for_t2 == type_desc.
:- type t2 == c_pointer.
:- type delayed_goal(T)
Index: windows_installer_generator/wix.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/wix.m,v
retrieving revision 1.2
diff -u -r1.2 wix.m
--- windows_installer_generator/wix.m 4 Jan 2006 07:48:40 -0000 1.2
+++ windows_installer_generator/wix.m 30 Mar 2006 01:10:44 -0000
@@ -543,8 +543,8 @@
:- import_module wix_language.
:- import_module exception.
-:- import_module std_util.
:- import_module term_to_xml.
+:- import_module univ.
generate_installer(Installer, GUIDFile, FileName, Result, !IO) :-
io.open_output(FileName, OpenOutputResult, !IO),
Index: windows_installer_generator/wix_gui.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/wix_gui.m,v
retrieving revision 1.2
diff -u -r1.2 wix_gui.m
--- windows_installer_generator/wix_gui.m 4 Jan 2006 07:48:41 -0000 1.2
+++ windows_installer_generator/wix_gui.m 30 Mar 2006 01:11:01 -0000
@@ -203,7 +203,7 @@
:- import_module int.
:- import_module require.
-:- import_module std_util.
+:- import_module pair.
:- import_module string.
:- import_module svmap.
Index: windows_installer_generator/wix_installer.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/wix_installer.m,v
retrieving revision 1.2
diff -u -r1.2 wix_installer.m
--- windows_installer_generator/wix_installer.m 4 Jan 2006 07:48:41 -0000 1.2
+++ windows_installer_generator/wix_installer.m 30 Mar 2006 01:10:07 -0000
@@ -44,7 +44,7 @@
:- import_module int.
:- import_module list.
:- import_module map.
-:- import_module std_util.
+:- import_module maybe.
:- import_module string.
:- import_module term_to_xml.
Index: windows_installer_generator/wix_util.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/windows_installer_generator/wix_util.m,v
retrieving revision 1.1
diff -u -r1.1 wix_util.m
--- windows_installer_generator/wix_util.m 26 Oct 2005 05:04:16 -0000 1.1
+++ windows_installer_generator/wix_util.m 30 Mar 2006 01:10:27 -0000
@@ -18,8 +18,8 @@
:- interface.
:- import_module list.
+:- import_module pair.
:- import_module term_to_xml.
-:- import_module std_util.
:- import_module wix.
:- import_module wix_gui.
Index: xml/parsing.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/parsing.m,v
retrieving revision 1.4
diff -u -r1.4 parsing.m
--- xml/parsing.m 13 Oct 2005 09:49:47 -0000 1.4
+++ xml/parsing.m 30 Mar 2006 01:12:48 -0000
@@ -37,7 +37,7 @@
:- interface.
:- import_module string, unicode.
-:- import_module io, list, map, std_util.
+:- import_module io, list, map, unit, univ.
:- mode pdi == in.
:- mode puo == out.
Index: xml/tryit.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/tryit.m,v
retrieving revision 1.6
diff -u -r1.6 tryit.m
--- xml/tryit.m 13 Oct 2005 09:49:47 -0000 1.6
+++ xml/tryit.m 30 Mar 2006 01:13:56 -0000
@@ -19,7 +19,7 @@
:- import_module parsing, xml, xml__cat, xml__encoding.
:- import_module xml__parse, xml__ns.
-:- import_module char, list, map, std_util, string.
+:- import_module char, list, map, maybe, pair, string.
main -->
io__command_line_arguments(Args),
Index: xml/xml.ns.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.ns.m,v
retrieving revision 1.4
diff -u -r1.4 xml.ns.m
--- xml/xml.ns.m 13 Oct 2005 09:49:47 -0000 1.4
+++ xml/xml.ns.m 30 Mar 2006 01:13:21 -0000
@@ -22,7 +22,7 @@
:- interface.
-:- import_module list, array, string, std_util.
+:- import_module list, array, string, pair.
:- import_module xml.doc.
:- type nsDocument
Index: xml/xml.parse.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.parse.m,v
retrieving revision 1.6
diff -u -r1.6 xml.parse.m
--- xml/xml.parse.m 13 Oct 2005 09:49:47 -0000 1.6
+++ xml/xml.parse.m 30 Mar 2006 01:14:25 -0000
@@ -324,7 +324,7 @@
:- import_module xml.encoding.
:- import_module unicode.
-:- import_module array, char, int, io, map, require, std_util, string.
+:- import_module array, char, int, io, map, pair, require, string, unit.
:- instance global(gCatalog, catalog) where [].
:- instance global(gDirs, parse.dirs) where [].
--------------------------------------------------------------------------
mercury-reviews mailing list
post: mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------
More information about the reviews
mailing list