[m-rev.] trivial diff: fix compilation of extras/xml

Julien Fischer juliensf at cs.mu.OZ.AU
Wed May 18 23:41:46 AEST 2005


Estimated hours taken: 0.1
Branches: main, release

extras/xml/*.m:
	Remove some non-abstract instance declarations from module
	interfaces; the compiler no longer supports them.

	Replace uses of ':' as a module qualifier.

	Remove duplicate module imports.

Julien.

Index: xml.cat.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.cat.m,v
retrieving revision 1.2
diff -u -r1.2 xml.cat.m
--- xml.cat.m	22 Jan 2002 14:21:51 -0000	1.2
+++ xml.cat.m	18 May 2005 13:10:59 -0000
@@ -7,11 +7,11 @@
 % Main author: conway at cs.mu.oz.au.
 %
 %---------------------------------------------------------------------------%
-:- module xml:cat.
+:- module xml.cat.

 :- interface.

-:- import_module xml:dtd.
+:- import_module xml.dtd.
 :- import_module io.

 :- type catalog	 ---> catalog(publicId -> systemId).
Index: xml.doc.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.doc.m,v
retrieving revision 1.1
diff -u -r1.1 xml.doc.m
--- xml.doc.m	5 Sep 2000 22:33:58 -0000	1.1
+++ xml.doc.m	18 May 2005 13:10:59 -0000
@@ -7,7 +7,7 @@
 % Main author: conway at cs.mu.oz.au.
 %
 %---------------------------------------------------------------------------%
-:- module xml:doc.
+:- module xml.doc.

 :- interface.

Index: xml.dtd.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.dtd.m,v
retrieving revision 1.1
diff -u -r1.1 xml.dtd.m
--- xml.dtd.m	5 Sep 2000 22:33:59 -0000	1.1
+++ xml.dtd.m	18 May 2005 13:10:59 -0000
@@ -7,7 +7,7 @@
 % Main author: conway at cs.mu.oz.au.
 %
 %---------------------------------------------------------------------------%
-:- module xml:dtd.
+:- module xml.dtd.

 :- interface.

Index: xml.encoding.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.encoding.m,v
retrieving revision 1.2
diff -u -r1.2 xml.encoding.m
--- xml.encoding.m	25 Sep 2001 09:37:01 -0000	1.2
+++ xml.encoding.m	18 May 2005 13:10:59 -0000
@@ -7,7 +7,7 @@
 % Main author: conway at cs.mu.oz.au.
 %
 %---------------------------------------------------------------------------%
-:- module xml:encoding.
+:- module xml.encoding.

 :- interface.

Index: xml.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.m,v
retrieving revision 1.2
diff -u -r1.2 xml.m
--- xml.m	5 Jan 2001 04:15:44 -0000	1.2
+++ xml.m	18 May 2005 13:10:59 -0000
@@ -11,10 +11,10 @@

 :- interface.

-:- include_module xml:cat.
-:- include_module xml:doc.
-:- include_module xml:dtd.
-:- include_module xml:encoding.
-:- include_module xml:parse.
-:- include_module xml:ns.
+:- include_module xml.cat.
+:- include_module xml.doc.
+:- include_module xml.dtd.
+:- include_module xml.encoding.
+:- include_module xml.parse.
+:- include_module xml.ns.

Index: xml.ns.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.ns.m,v
retrieving revision 1.2
diff -u -r1.2 xml.ns.m
--- xml.ns.m	30 Jul 2004 07:04:45 -0000	1.2
+++ xml.ns.m	18 May 2005 13:10:59 -0000
@@ -18,12 +18,12 @@
 % <http://www.w3.org/TR-REC-xml-names>
 %
 %---------------------------------------------------------------------------%
-:- module xml:ns.
+:- module xml.ns.

 :- interface.

 :- import_module list, array, string, std_util.
-:- import_module xml:doc.
+:- import_module xml.doc.

 :- type nsDocument
 	--->  	nsDoc(
@@ -82,7 +82,7 @@
 %---------------------------------------------------------------------------%

 :- import_module assoc_list, int, map, require.
-:- import_module xml:parse.
+:- import_module xml.parse.

 :- type namespaces == map(string, nsURI).

Index: xml.parse.chars.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.parse.chars.m,v
retrieving revision 1.2
diff -u -r1.2 xml.parse.chars.m
--- xml.parse.chars.m	16 Jun 2001 05:46:26 -0000	1.2
+++ xml.parse.chars.m	18 May 2005 13:11:02 -0000
@@ -7,7 +7,7 @@
 % Main author: conway at cs.mu.oz.au.
 %
 %---------------------------------------------------------------------------%
-:- module xml:parse:chars.
+:- module xml.parse.chars.

 :- interface.

Index: xml.parse.m
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/xml/xml.parse.m,v
retrieving revision 1.2
diff -u -r1.2 xml.parse.m
--- xml.parse.m	22 Jan 2002 14:21:51 -0000	1.2
+++ xml.parse.m	18 May 2005 13:11:12 -0000
@@ -7,7 +7,6 @@
 % Main author: conway at cs.mu.oz.au.
 %
 %---------------------------------------------------------------------------%
-:- module xml:parse.
 %
 %                                                        W3C REC-xml-19980210
 %
@@ -292,37 +291,44 @@
 %   Document
 %   [1]  document ::= prolog element Misc*

+
+:- module xml.parse.
+
 :- interface.

-:- import_module parsing.
-:- import_module xml:cat.
-:- import_module xml:doc.
-:- import_module xml:dtd.
 :- import_module list.
+:- import_module parsing.
+:- import_module xml.cat.
+:- import_module xml.doc.
+:- import_module xml.dtd.

     %
     % The following three globals should be set in the globals included
     % in the initial parsing state.
     %
 :- type gCatalog	---> gCatalog.
-:- instance global(gCatalog, catalog) where [].
+:- instance global(gCatalog, catalog).

 :- type gDirs		---> gDirs.
 :- type dirs		---> dirs(cat:dirs).
-:- instance global(gDirs, parse:dirs) where [].
+:- instance global(gDirs, parse.dirs).

 :- type gEncodings	---> gEncodings.
 :- type encodings	---> encodings(string -> encoding).
-:- instance global(gEncodings, encodings) where [].
+:- instance global(gEncodings, encodings).

 :- pred document(pstate(_), pstate((dtd, document))).
 :- mode document(in, out) is det.

 :- implementation.

-:- import_module xml:cat, xml:encoding.
+:- import_module xml.encoding.
 :- import_module unicode.
-:- import_module array, char, int, io, list, map, require, std_util, string.
+:- import_module array, char, int, io, map, require, std_util, string.
+
+:- instance global(gCatalog, catalog) where [].
+:- instance global(gDirs, parse.dirs) where [].
+:- instance global(gEncodings, encodings) where [].

 :- type gContent	---> gContent.
 :- instance global(gContent, contentStore) 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