[m-rev.] diff: final changes for 13.05.2 release

[Julien Fischer]

Final changes for the 13.05.2 release.

NEWS:
    Adjust some of the NEWS entries.

library/tree234.m:
library/version_hash_table.m:
     The private_builtin module is implicitly imported via a use_module
     directive, so we don't need to explicitly import it.

Julien.

diff --git a/NEWS b/NEWS
index e36c003..2f0026d 100644
--- a/NEWS
+++ b/NEWS
@@ -14,16 +14,17 @@ This is a bug-fix release.
    asm_fast grades working with GCC 4.8.  (Bug #293)
  * Fix inst for constant type_infos.  (Bug #297)
  * Fix compiler abort during liveness detection.  (Bug #51)
-* We have fixed a bug that could crash the compiler when enabling the last
-  call modulo constructor optimisation on the Java and (probably) C#
-  grades.  (Bug #300)
+* We have fixed a bug that caused a compiler abort in the last
+  call modulo constructor optimisation in the Java grade.  (Bug #300)
  * Respect memory alignment requirements for doubles.  (Bug #299)
  * Fix incorrect handling of deconstructions in pass for float registers
    support.  (Bug #301)

  Changes to the Mercury standard library:

-* Semantic equality predicates are now defined for 2-3-4 trees and maps.
+* We have added the predicates map.equal/2 and tree234.equal/2 which
+  test maps and 2-3-4 trees respectively for semantic equality.
+

  NEWS for Mercury 13.05.1
  ------------------------
diff --git a/library/tree234.m b/library/tree234.m
index 59c9810..7aa6efd 100644
--- a/library/tree234.m
+++ b/library/tree234.m
@@ -576,7 +576,6 @@
  :- import_module int.
  :- import_module io.
  :- import_module pair.
-:- import_module private_builtin.
  :- import_module require.
  :- import_module set.
  :- import_module string.
@@ -630,7 +629,7 @@ equal(TreeA, TreeB) :-
      % their structures. To do this, we use a stack to store the
      % as-yet-unexplored parts of TreeB in their original order while the
      % match_tree_against_stack predicate recurses on TreeA.
-    ( pointer_equal(TreeA, TreeB) ->
+    ( private_builtin.pointer_equal(TreeA, TreeB) ->
          true
      ;
          require_complete_switch [TreeB]
@@ -672,7 +671,7 @@ equal(TreeA, TreeB) :-
  match_tree_against_stack(SubtreeA, !StackB) :-
      (
          !.StackB = [LeftmostSubtreeB | !:StackB],
-        pointer_equal(SubtreeA, LeftmostSubtreeB)
+        private_builtin.pointer_equal(SubtreeA, LeftmostSubtreeB)
      ->
          true
      ;
diff --git a/library/version_hash_table.m b/library/version_hash_table.m
index 7376614..444ec01 100644
--- a/library/version_hash_table.m
+++ b/library/version_hash_table.m
@@ -234,7 +234,6 @@
  :- import_module int.
  :- import_module list.
  :- import_module pair.
-:- import_module private_builtin.
  :- import_module require.
  :- import_module string.
  :- import_module type_desc.
@@ -859,7 +858,7 @@ fold_p(P, List, !A) :-
  %-----------------------------------------------------------------------------%

  equal(A, B) :-
-    ( pointer_equal(A, B) ->
+    ( private_builtin.pointer_equal(A, B) ->
          true
      ;
          % We cannot deconstruct a non-cononical type in this all-solutions