[m-rev.] diff: mark sv* predicates as obsolete

Julien Fischer juliensf at csse.unimelb.edu.au
Mon Jun 27 02:55:56 AEST 2011


Branches: main

Mark the predicates in the sv* modules in the standard library (except 
for the recently added ones) as obsolete.  They will be deleted after the 
11.07 release.

library/svarray.m:
library/svbag.m:
library/svbimap.m:
library/sveqvclass.m:
library/svmap.m:
library/svmulti_map.m:
library/svqueue.m:
library/svset.m:
library/svvarset.m:
 	Mark these modules as obsolete.

deep_profiler/dump.m:
deep_profiler/recursion_patterns.m:
profiler/snapshots.m:
 	Avoid using predicates from sv* modules.

Julien.

Index: deep_profiler/dump.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/deep_profiler/dump.m,v
retrieving revision 1.23
diff -u -r1.23 dump.m
--- deep_profiler/dump.m	13 Jan 2011 00:36:55 -0000	1.23
+++ deep_profiler/dump.m	26 Jun 2011 14:29:06 -0000
@@ -139,7 +139,6 @@
  :- import_module pair.
  :- import_module require.
  :- import_module string.
-:- import_module svset.

  %----------------------------------------------------------------------------%

@@ -277,10 +276,10 @@
  get_static_ptrs_from_dynamic_proc(ProcStatics, _, ProcDynamic, !PS_Ptrs,
          !CSS_Ptrs) :-
      ProcStaticPtr = ProcDynamic ^ pd_proc_static,
-    svset.insert(ProcStaticPtr, !PS_Ptrs),
+    set.insert(ProcStaticPtr, !PS_Ptrs),
      lookup_proc_statics(ProcStatics, ProcStaticPtr, ProcStatic),
      CSSs = array.to_list(ProcStatic ^ ps_sites),
-    svset.insert_list(CSSs, !CSS_Ptrs).
+    set.insert_list(CSSs, !CSS_Ptrs).

  %----------------------------------------------------------------------------%
  %
Index: deep_profiler/recursion_patterns.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/deep_profiler/recursion_patterns.m,v
retrieving revision 1.15
diff -u -r1.15 recursion_patterns.m
--- deep_profiler/recursion_patterns.m	3 May 2011 04:35:00 -0000	1.15
+++ deep_profiler/recursion_patterns.m	26 Jun 2011 14:29:48 -0000
@@ -67,7 +67,6 @@
  :- import_module set.
  :- import_module solutions.
  :- import_module string.
-:- import_module svset.
  :- import_module unit.

  %----------------------------------------------------------------------------%
@@ -767,7 +766,7 @@
      some [!Errors] (
          (
              !.RecursionData = recursion_data(_, _, !:Errors),
-            svset.insert(Error, !Errors),
+            set.insert(Error, !Errors),
              !RecursionData ^ rd_errors := !.Errors
          ;
              !.RecursionData = proc_dead_code
Index: library/svarray.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svarray.m,v
retrieving revision 1.8
diff -u -r1.8 svarray.m
--- library/svarray.m	6 May 2011 15:19:33 -0000	1.8
+++ library/svarray.m	26 Jun 2011 14:31:57 -0000
@@ -27,6 +27,7 @@
      % resulting array (good opportunity for destructive update ;-).
      % Throws an exception if the index is out of bounds.
      %
+:- pragma obsolete(svarray.set/4).
  :- pred svarray.set(int::in, T::in, array(T)::array_di, array(T)::array_uo)
      is det.

@@ -34,6 +35,7 @@
      % and returns the resulting array.
      % It fails if the index is out of bounds.
      %
+:- pragma obsolete(svarray.semidet_set/4).
  :- pred svarray.semidet_set(int::in, T::in,
      array(T)::array_di, array(T)::array_uo) is semidet.

@@ -43,6 +45,7 @@
      % destructive update.
      % It is an error if the index is out of bounds.
      %
+:- pragma obsolete(svarray.slow_set/4).
  :- pred svarray.slow_set(int, T, array(T), array(T)).
  %:- mode svarray.slow_set(in, in, array_ui, array_uo) is det.
  :- mode svarray.slow_set(in, in, in, array_uo) is det.
@@ -53,6 +56,7 @@
      % destructive update.
      % It fails if the index is out of bounds.
      %
+:- pragma obsolete(svarray.semidet_slow_set/4).
  :- pred svarray.semidet_slow_set(int, T, array(T), array(T)).
  %:- mode svarray.semidet_slow_set(in, in, array_ui, array_uo) is semidet.
  :- mode svarray.semidet_slow_set(in, in, in, array_uo) is semidet.
@@ -62,6 +66,7 @@
      % the new size `Size'.  Any new entries are filled
      % with `Init'.
      %
+:- pragma obsolete(svarray.resize/4).
  :- pred svarray.resize(int::in, T::in, array(T)::array_di, array(T)::array_uo)
      is det.

@@ -69,6 +74,7 @@
      % The array is shrunk to make it fit the new size `Size'.
      % Throws an exception if `Size' is larger than the size of `Array0'.
      %
+:- pragma obsolete(svarray.shrink/3).
  :- pred svarray.shrink(int::in, array(T)::array_di, array(T)::array_uo)
      is det.

Index: library/svbag.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svbag.m,v
retrieving revision 1.9
diff -u -r1.9 svbag.m
--- library/svbag.m	3 May 2011 14:22:14 -0000	1.9
+++ library/svbag.m	26 Jun 2011 14:49:00 -0000
@@ -27,24 +27,29 @@

      % Insert a particular value in a bag.
      %
+:- pragma obsolete(svbag.insert/3).
  :- pred svbag.insert(T::in, bag(T)::in, bag(T)::out) is det.

      % Insert a list of values into a bag.
      %
+:- pragma obsolete(svbag.insert_list/3).
  :- pred svbag.insert_list(list(T)::in, bag(T)::in, bag(T)::out) is det.

      % Insert a set of values into a bag.
      %
+:- pragma obsolete(svbag.insert_set/3).
  :- pred svbag.insert_set(set(T)::in, bag(T)::in, bag(T)::out) is det.

      % Remove one occurrence of a particular value from a bag.
      % Fail if the item does not exist in the bag.
      %
+:- pragma obsolete(svbag.remove/3).
  :- pred svbag.remove(T::in, bag(T)::in, bag(T)::out) is semidet.

      % Remove one occurrence of a particular value from a bag.
      % Abort if the item does not exist in the bag.
      %
+:- pragma obsolete(svbag.det_remove/3).
  :- pred svbag.det_remove(T::in, bag(T)::in, bag(T)::out) is det.

      % Remove a list of values from a bag.  Duplicates are removed
@@ -58,36 +63,43 @@
      %       bag.is_subbag(RemoveBag, Bag0),
      %       svbag.subtract(RemoveBag, Bag0, Bag).
      %
+:- pragma obsolete(svbag.remove_list/3).
  :- pred svbag.remove_list(list(T)::in, bag(T)::in, bag(T)::out) is semidet.

      % Remove a list of values from a bag.  Duplicates are removed
      % from the bag the appropriate number of times.  Abort if any
      % of the items in the list do not exist in the bag.
      %
+:- pragma obsolete(svbag.det_remove_list/3).
  :- pred svbag.det_remove_list(list(T)::in, bag(T)::in, bag(T)::out) is det.

      % Remove a set of values from a bag. Each value is removed once.
      % Fail if any of the items in the set do not exist in the bag.
      %
+:- pragma obsolete(svbag.remove_set/3).
  :- pred svbag.remove_set(set(T)::in, bag(T)::in, bag(T)::out) is semidet.

      % Remove a set of values from a bag. Each value is removed once.
      % Abort if any of the items in the set do not exist in the bag.
      %
+:- pragma obsolete(svbag.det_remove_set/3).
  :- pred svbag.det_remove_set(set(T)::in, bag(T)::in, bag(T)::out) is det.

      % Delete one occurrence of a particular value from a bag.
      % If the key is not present, leave the bag unchanged.
      %
+:- pragma obsolete(svbag.delete/3).
  :- pred svbag.delete(T::in, bag(T)::in, bag(T)::out) is det.

      % Remove all occurrences of a particular value from a bag.
      % Fail if the item does not exist in the bag.
      %
+:- pragma obsolete(svbag.remove_all/3).
  :- pred svbag.remove_all(T::in, bag(T)::in, bag(T)::out) is semidet.

      % Delete all occurrences of a particular value from a bag.
      %
+:- pragma obsolete(svbag.delete_all/3).
  :- pred svbag.delete_all(T::in, bag(T)::in, bag(T)::out) is det.

      % svbag.subtract(Bag0, SubBag, Bag):
@@ -98,10 +110,12 @@
      % element is not removed.
      % e.g. svbag.subtract({1, 1, 2, 2, 3 }, {1, 1, 2, 3, 3, 3}, {2}).
      %
+:- pragma obsolete(svbag.subtract/3).
  :- pred svbag.subtract(bag(T)::in, bag(T)::in, bag(T)::out) is det.

      % Fails if the bag is empty.
      %
+:- pragma obsolete(svbag.remove_smallest/3).
  :- pred svbag.remove_smallest(T::out, bag(T)::in, bag(T)::out) is semidet.

  %---------------------------------------------------------------------------%
Index: library/svbimap.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svbimap.m,v
retrieving revision 1.7
diff -u -r1.7 svbimap.m
--- library/svbimap.m	3 May 2011 04:35:01 -0000	1.7
+++ library/svbimap.m	26 Jun 2011 14:50:16 -0000
@@ -23,12 +23,15 @@

  %-----------------------------------------------------------------------------%

+:- pragma obsolete(svbimap.insert/4).
  :- pred svbimap.insert(K::in, V::in, bimap(K, V)::in, bimap(K, V)::out)
      is semidet.

+:- pragma obsolete(svbimap.det_insert/4).
  :- pred svbimap.det_insert(K::in, V::in, bimap(K, V)::in, bimap(K, V)::out)
      is det.

+:- pragma obsolete(svbimap.set/4).
  :- pred svbimap.set(K::in, V::in, bimap(K, V)::in, bimap(K, V)::out) is det.

  %-----------------------------------------------------------------------------%
Index: library/sveqvclass.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/sveqvclass.m,v
retrieving revision 1.8
diff -u -r1.8 sveqvclass.m
--- library/sveqvclass.m	3 May 2011 05:12:04 -0000	1.8
+++ library/sveqvclass.m	26 Jun 2011 14:52:32 -0000
@@ -29,6 +29,7 @@
      % The element may already be known to the class;
      % if it isn't, it is created without any equivalence relationships.
      %
+:- pragma obsolete(sveqvclass.ensure_element/3).
  :- pred sveqvclass.ensure_element(T::in, eqvclass(T)::in, eqvclass(T)::out)
      is det.

@@ -36,24 +37,28 @@
      % The element must not already be known to the class;
      % it is created without any equivalence relationships.
      %
+:- pragma obsolete(sveqvclass.new_element/3).
  :- pred sveqvclass.new_element(T::in, eqvclass(T)::in, eqvclass(T)::out)
      is det.

      % Make two elements of the equivalence class equivalent.
      % It is ok if they already are.
      %
+:- pragma obsolete(sveqvclass.ensure_equivalence/4).
  :- pred sveqvclass.ensure_equivalence(T::in, T::in,
      eqvclass(T)::in, eqvclass(T)::out) is det.

      % Make two elements of the equivalence class equivalent.
      % It is an error if they are already equivalent.
      %
+:- pragma obsolete(sveqvclass.new_equivalence/4).
  :- pred sveqvclass.new_equivalence(T::in, T::in,
      eqvclass(T)::in, eqvclass(T)::out) is det.

      % Remove the given element and all other elements equivalent to it
      % from the given equivalence class.
      %
+:- pragma obsolete(sveqvclass.remove_equivalent_elements/3).
  :- pred sveqvclass.remove_equivalent_elements(T::in,
      eqvclass(T)::in, eqvclass(T)::out) is det.

Index: library/svmap.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svmap.m,v
retrieving revision 1.9
diff -u -r1.9 svmap.m
--- library/svmap.m	3 May 2011 04:35:01 -0000	1.9
+++ library/svmap.m	26 Jun 2011 14:39:32 -0000
@@ -30,68 +30,82 @@
      % Insert a new key and corresponding value into a map.
      % Fail if the key already exists.
      %
+:- pragma obsolete(svmap.insert/4).
  :- pred svmap.insert(K::in, V::in, map(K, V)::in, map(K, V)::out) is semidet.

      % Insert a new key and corresponding value into a map.
      % Abort if the key already exists.
      %
+:- pragma obsolete(svmap.det_insert/4).
  :- pred svmap.det_insert(K::in, V::in, map(K, V)::in, map(K, V)::out) is det.

      % Apply map.det_insert to key - value pairs from corresponding lists.
      %
+:- pragma obsolete(svmap.det_insert_from_corresponding_lists/4).
  :- pred svmap.det_insert_from_corresponding_lists(list(K)::in, list(V)::in,
      map(K, V)::in, map(K, V)::out) is det.

      % Apply map.det_insert to key - value pairs from the assoc_lists.
      %
+:- pragma obsolete(svmap.det_insert_from_assoc_list/3).
  :- pred svmap.det_insert_from_assoc_list(assoc_list(K, V)::in,
      map(K, V)::in, map(K, V)::out) is det.

      % Apply map.set to key - value pairs from corresponding lists.
      %
+:- pragma obsolete(svmap.set_from_corresponding_lists/4).
  :- pred svmap.set_from_corresponding_lists(list(K)::in, list(V)::in,
      map(K, V)::in, map(K, V)::out) is det.

+:- pragma obsolete(svmap.set_from_assoc_list/3).
  :- pred svmap.set_from_assoc_list(assoc_list(K, V)::in,
      map(K, V)::in, map(K, V)::out) is det.

      % Update the value corresponding to a given key
      % Fail if the key doesn't already exist.
      %
+:- pragma obsolete(svmap.update/4).
  :- pred svmap.update(K::in, V::in, map(K, V)::in, map(K, V)::out) is semidet.

      % Update the value corresponding to a given key
      % Abort if the key doesn't already exist.
      %
+:- pragma obsolete(svmap.det_update/4).
  :- pred svmap.det_update(K::in, V::in, map(K, V)::in, map(K, V)::out) is det.

      % Update value if the key is already present, otherwise
      % insert new key and value.
      %
+:- pragma obsolete(svmap.set/4).
  :- pred svmap.set(K::in, V::in, map(K, V)::in, map(K, V)::out) is det.

      % Delete a key-value pair from a map.
      % If the key is not present, leave the map unchanged.
      %
+:- pragma obsolete(svmap.delete/3).
  :- pred svmap.delete(K::in, map(K, V)::in, map(K, V)::out) is det.

      % Apply map.delete/3 to a list of keys.
      %
+:- pragma obsolete(svmap.delete_list/3).
  :- pred svmap.delete_list(list(K)::in, map(K, V)::in, map(K, V)::out) is det.

      % Delete a key-value pair from a map and return the value.
      % Fail if the key is not present.
      %
+:- pragma obsolete(svmap.remove/4).
  :- pred svmap.remove(K::in, V::out, map(K, V)::in, map(K, V)::out) is semidet.

      % Delete a key-value pair from a map and return the value.
      % Abort if the key is not present.
      %
+:- pragma obsolete(svmap.det_remove/4).
  :- pred svmap.det_remove(K::in, V::out, map(K, V)::in, map(K, V)::out) is det.

      % Remove the smallest item from the map, fail if
      % the map is empty.
      %
+:- pragma obsolete(svmap.remove_smallest/4).
  :- pred svmap.remove_smallest(K::out, V::out, map(K, V)::in, map(K, V)::out)
      is semidet.

Index: library/svmulti_map.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svmulti_map.m,v
retrieving revision 1.6
diff -u -r1.6 svmulti_map.m
--- library/svmulti_map.m	3 May 2011 04:35:01 -0000	1.6
+++ library/svmulti_map.m	26 Jun 2011 14:55:00 -0000
@@ -29,69 +29,81 @@
      % Insert a new key and corresponding value into a multi_map.
      % Fail if the key already exists.
      %
+:- pragma obsolete(svmulti_map.insert/4).
  :- pred svmulti_map.insert(K::in, V::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is semidet.

      % Insert a new key and corresponding value into a multi_map.
      % Abort if the key already exists.
      %
+:- pragma obsolete(svmulti_map.det_insert/4).
  :- pred svmulti_map.det_insert(K::in, V::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is det.

      % Update (add) the value corresponding to a given key.
      % Fail if the key does not already exist.
      %
+:- pragma obsolete(svmulti_map.update/4).
  :- pred svmulti_map.update(K::in, V::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is semidet.

      % Update (add) the value corresponding to a given key.
      % Abort if the key doesn't already exist.
      %
+:- pragma obsolete(svmulti_map.det_update/4).
  :- pred svmulti_map.det_update(K::in, V::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is det.

      % Update (replace) the value corresponding to a given key.
      % Abort if the key does not already exist.
      %
+:- pragma obsolete(svmulti_map.det_replace/4).
  :- pred svmulti_map.det_replace(K::in, list(V)::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is det.

      % Update (add) value if the key is already present, otherwise
      % insert the new key and value.
      %
+:- pragma obsolete(svmulti_map.set/4).
  :- pred svmulti_map.set(K::in, V::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is det.

+:- pragma obsolete(svmulti_map.add/4).
  :- pred svmulti_map.add(K::in, V::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is det.

      % Delete a key and data from a multi_map
      % If the key is not present, leave the multi_map unchanged.
      %
+:- pragma obsolete(svmulti_map.delete/3).
  :- pred svmulti_map.delete(K::in, multi_map(K, V)::in, multi_map(K, V)::out)
      is det.

      % Delete a data value from a key in a multi_map
      % If the key is not present, leave the multi_map unchanged.
      %
+:- pragma obsolete(svmulti_map.delete/4).
  :- pred svmulti_map.delete(K::in, V::in,
      multi_map(K, V)::in, multi_map(K, V)::out) is det.

      % Delete a key-value pair from a multi_map and return the value.
      % Fail if the key is not present.
      %
+:- pragma obsolete(svmulti_map.remove/4).
  :- pred svmulti_map.remove(K::in, list(V)::out,
      multi_map(K, V)::in, multi_map(K, V)::out) is semidet.

      % Delete a key-value pair from a multi_map and return the value.
      % Abort if the key is not present.
      %
+:- pragma obsolete(svmulti_map.det_remove/4).
  :- pred svmulti_map.det_remove(K::in, list(V)::out,
      multi_map(K, V)::in, multi_map(K, V)::out) is det.

      % Remove the smallest item from the multi_map, fail if
      % the multi_map is empty.
      %
+:- pragma obsolete(svmulti_map.remove_smallest/4).
  :- pred svmulti_map.remove_smallest(K::out, list(V)::out,
      multi_map(K, V)::in, multi_map(K, V)::out) is semidet.

Index: library/svqueue.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svqueue.m,v
retrieving revision 1.8
diff -u -r1.8 svqueue.m
--- library/svqueue.m	3 May 2011 05:12:04 -0000	1.8
+++ library/svqueue.m	26 Jun 2011 14:57:16 -0000
@@ -30,12 +30,14 @@
      % the queue which results from appending `Elem' onto the end
      % of `Queue0'.
      %
+:- pragma obsolete(svqueue.put/3).
  :- pred svqueue.put(T::in, queue(T)::in, queue(T)::out) is det.

      % `svqueue.put_list(Elems, Queue0, Queue)' is true iff `Queue'
      % is the queue which results from inserting the items in the
      % list `Elems' into `Queue0'.
      %
+:- pragma obsolete(svqueue.put_list/3).
  :- pred svqueue.put_list(list(T)::in, queue(T)::in, queue(T)::out) is det.

      % `svqueue.get(Elem, Queue0, Queue)' is true iff `Queue0' is
@@ -43,29 +45,34 @@
      % the queue which results from removing that element from
      % the front of `Queue0'.
      %
+:- pragma obsolete(svqueue.get/3).
  :- pred svqueue.get(T::out, queue(T)::in, queue(T)::out) is semidet.

      % `svqueue.delete_all(Elem, Queue0, Queue)' is true iff `Queue' is
      % the same queue as `Queue0' with all occurences of `Elem' removed
      % from it.
      %
+:- pragma obsolete(svqueue.delete_all/3).
  :- pred svqueue.delete_all(T::in, queue(T)::in, queue(T)::out) is det.

      % `svqueue.put_on_front(Elem, Queue0, Queue)' pushes `Elem' on to
      % the front of `Queue0', giving `Queue'.
      %
+:- pragma obsolete(svqueue.put_on_front/3).
  :- pred svqueue.put_on_front(T::in, queue(T)::in, queue(T)::out) is det.

      % `svqueue.put_list_on_front(Queue0, Elems, Queue)' pushes `Elems'
      % on to the front of `Queue0', giving `Queue' (the Nth member
      % of `Elems' becomes the Nth member from the front of `Queue').
      %
+:- pragma obsolete(svqueue.put_list_on_front/3).
  :- pred svqueue.put_list_on_front(list(T)::in, queue(T)::in, queue(T)::out)
      is det.

      % `queue.get_from_back(Elem, Queue0, Queue)' removes `Elem' from
      % the back of `Queue0', giving `Queue'.
      %
+:- pragma obsolete(svqueue.get_from_back/3).
  :- pred svqueue.get_from_back(T::out, queue(T)::in, queue(T)::out) is semidet.

  %--------------------------------------------------------------------------%
Index: library/svset.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svset.m,v
retrieving revision 1.9
diff -u -r1.9 svset.m
--- library/svset.m	6 May 2011 05:03:28 -0000	1.9
+++ library/svset.m	26 Jun 2011 14:25:52 -0000
@@ -27,11 +27,13 @@
      % `svset.insert(X, Set0, Set)' is true iff `Set' is the union of
      % `Set0' and the set containing only `X'.
      %
+:- pragma obsolete(svset.insert/3).
  :- pred svset.insert(T::in, set(T)::in, set(T)::out) is det.

      % `svset.insert_list(Xs, Set0, Set)' is true iff `Set' is the union of
      % `Set0' and the set containing only the members of `Xs'.
      %
+:- pragma obsolete(svset.insert_list/3).
  :- pred svset.insert_list(list(T)::in, set(T)::in, set(T)::out) is det.

      % `svset.delete(X, Set0, Set)' is true iff `Set' is the relative
@@ -39,12 +41,14 @@
      % if `Set' is the set which contains all the elements of `Set0'
      % except `X'.
      %
+:- pragma obsolete(svset.delete/3).
  :- pred svset.delete(T::in, set(T)::in, set(T)::out) is det.

      % `svset.delete_list(Xs, Set0, Set)' is true iff `Set' is the relative
      % complement of `Set0' and the set containing only the members of
      % `Xs'.
      %
+:- pragma obsolete(svset.delete_list/3).
  :- pred svset.delete_list(list(T)::in, set(T)::in, set(T)::out) is det.

      % `svset.remove(X, Set0, Set)' is true iff `Set0' contains `X',
@@ -52,6 +56,7 @@
      % containing only `X', i.e.  if `Set' is the set which contains
      % all the elements of `Set0' except `X'.
      %
+:- pragma obsolete(svset.remove/3).
  :- pred svset.remove(T::in, set(T)::in, set(T)::out) is semidet.

      % `svset.remove_list(Xs, Set0, Set)' is true iff `Xs' does not
@@ -59,6 +64,7 @@
      % and `Set' is the relative complement of `Set0' and the set
      % containing only the members of `Xs'.
      %
+:- pragma obsolete(svset.remove_list/3).
  :- pred svset.remove_list(list(T)::in, set(T)::in, set(T)::out) is semidet.

      % `svset.remove_least(Elem, Set0, Set)' is true iff
@@ -67,6 +73,7 @@
      % by compare/3), and `Set' is the set containing all the
      % elements of `Set0' except `Elem'.
      %
+:- pragma obsolete(svset.remove_least/3).
  :- pred svset.remove_least(T::out, set(T)::in, set(T)::out) is semidet.

  %--------------------------------------------------------------------------%
Index: library/svvarset.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/svvarset.m,v
retrieving revision 1.10
diff -u -r1.10 svvarset.m
--- library/svvarset.m	5 May 2011 03:58:59 -0000	1.10
+++ library/svvarset.m	26 Jun 2011 15:00:23 -0000
@@ -31,57 +31,68 @@

      % Create a new variable.
      %
+:- pragma obsolete(svvarset.new_var/3).
  :- pred svvarset.new_var(var(T)::out, varset(T)::in, varset(T)::out) is det.

      % Create a new named variable.
      %
+:- pragma obsolete(svvarset.new_named_var/4).
  :- pred svvarset.new_named_var(string::in, var(T)::out,
      varset(T)::in, varset(T)::out) is det.

      % Create a new variable, and maybe give it a name.
      %
+:- pragma obsolete(svvarset.new_maybe_named_var/4).
  :- pred svvarset.new_maybe_named_var(maybe(string)::in, var(T)::out,
      varset(T)::in, varset(T)::out) is det.

      % Create a new named variable with a unique (w.r.t. the
      % varset) number appended to the name.
      %
+:- pragma obsolete(svvarset.new_uniquely_named_var/4).
  :- pred svvarset.new_uniquely_named_var(string::in, var(T)::out,
      varset(T)::in, varset(T)::out) is det.

      % Create multiple new variables.
      %
+:- pragma obsolete(svvarset.new_vars/4).
  :- pred svvarset.new_vars(int::in, list(var(T))::out, varset(T)::in,
      varset(T)::out) is det.

      % Delete the name and value for a variable.
      %
+:- pragma obsolete(svvarset.delete_var/3).
  :- pred svvarset.delete_var(var(T)::in, varset(T)::in, varset(T)::out) is det.

      % Delete the names and values for a list of variables.
      %
+:- pragma obsolete(svvarset.delete_vars/3).
  :- pred svvarset.delete_vars(list(var(T))::in, varset(T)::in, varset(T)::out)
      is det.

      % Set the name of a variable.
      %
+:- pragma obsolete(svvarset.name_var/4).
  :- pred svvarset.name_var(var(T)::in, string::in, varset(T)::in,
      varset(T)::out) is det.

      % Bind a value to a variable.
      % This will overwrite any existing binding.
      %
+:- pragma obsolete(svvarset.bind_var/4).
  :- pred svvarset.bind_var(var(T)::in, term(T)::in, varset(T)::in,
      varset(T)::out) is det.

      % Bind a set of terms to a set of variables.
      %
+:- pragma obsolete(svvarset.bind_vars/3).
  :- pred svvarset.bind_vars(substitution(T)::in, varset(T)::in, varset(T)::out)
      is det.

      % Given a varset and a set of variables, remove the names
      % and values of any other variables stored in the varset.
      %
+:- pragma obsolete(svvarset.select/3).
  :- pred svvarset.select(set(var(T))::in, varset(T)::in, varset(T)::out) is det.

  %-----------------------------------------------------------------------------%
Index: profiler/snapshots.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/profiler/snapshots.m,v
retrieving revision 1.1
diff -u -r1.1 snapshots.m
--- profiler/snapshots.m	20 May 2011 04:16:53 -0000	1.1
+++ profiler/snapshots.m	26 Jun 2011 15:01:12 -0000
@@ -37,7 +37,6 @@
  :- import_module map.
  :- import_module require.
  :- import_module string.
-:- import_module svmap.

  %-----------------------------------------------------------------------------%

@@ -207,7 +206,7 @@
      ->
          demangle(MangledProcName, ProcName),
          AllocSite = alloc_site(ProcName, Type, FileName, LineNum, NumWords),
-        svmap.det_insert(alloc_id(Id), AllocSite, !AllocSiteMap)
+        map.det_insert(alloc_id(Id), AllocSite, !AllocSiteMap)
      ;
          unexpected($module, $pred, "format error: bad alloc site declaration")
      ).

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list