[m-rev.] diff: fix minor problems with the extras

Julien Fischer jfischer at opturion.com
Fri Aug 21 23:06:47 AEST 2015


Fix minor problems with the extras.

extras/cgi/mercury_www.m:
extras/fixed/mercury_fixed.m:
     Add missing interface declarations.

extras/fixed/Mercury.options:
     Do not warn about unused interface imports in the mercury_fixed
     module.

extras/fixed/fixed.m:
     Replace a call to an obsolete function.

extras/log4m/log4m.m:
     Fix spelling.

extras/mopenssl/mopenssl.m:
     Conform to changes in the structure of the net library.

Julien.

diff --git a/extras/cgi/mercury_www.m b/extras/cgi/mercury_www.m
index 8974673..5de1efb 100644
--- a/extras/cgi/mercury_www.m
+++ b/extras/cgi/mercury_www.m
@@ -9,6 +9,7 @@
  %

  :- module mercury_www.
+:- interface.

-:- import_module cgi, html.
-
+:- import_module cgi.
+:- import_module html.
diff --git a/extras/fixed/Mercury.options b/extras/fixed/Mercury.options
index 6f71a43..20ea467 100644
--- a/extras/fixed/Mercury.options
+++ b/extras/fixed/Mercury.options
@@ -1 +1 @@
-MCFLAGS-mercury_fixed = --no-warn-nothing-exported
+MCFLAGS-mercury_fixed = --no-warn-nothing-exported --no-warn-interface-imports
diff --git a/extras/fixed/fixed.m b/extras/fixed/fixed.m
index 6f1b104..cf8b58f 100644
--- a/extras/fixed/fixed.m
+++ b/extras/fixed/fixed.m
@@ -317,7 +317,7 @@ insert_decimal_point(N, [C|Cs], P+1, L) :-

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

-to_int(F) = int(I) :- fixed(_, I) = precision(0, F).
+to_int(F) = det_to_int(I) :- fixed(_, I) = precision(0, F).

  to_float(fixed(P, N)) = float(N) / pow(10.0, P).

diff --git a/extras/fixed/mercury_fixed.m b/extras/fixed/mercury_fixed.m
index 634a1d5..7b7b537 100644
--- a/extras/fixed/mercury_fixed.m
+++ b/extras/fixed/mercury_fixed.m
@@ -7,4 +7,5 @@
  %-----------------------------------------------------------------------------%

  :- module mercury_fixed.
+:- interface.
  :- import_module fixed.
diff --git a/extras/log4m/log4m.m b/extras/log4m/log4m.m
index 9415acd..f50da63 100644
--- a/extras/log4m/log4m.m
+++ b/extras/log4m/log4m.m
@@ -27,7 +27,7 @@
   * NAME
   *    Type: id
   * DESCRIPTION
- *    An id for identifying a logger.  The id's are hierachical.
+ *    An id for identifying a logger.  The id's are hierarchical.
   *    The root logger is [].
   *    A child of the root logger is ["Performance"]
   *    A child of the previous logger is ["Child", "Performance"]
@@ -259,7 +259,7 @@
   *    unsafe_log_f
   * SYNOPSIS
   *    Gets a fake io__state and calls log_f.
- *    Unsafe because the compiler might decide to elimiate this call on you.
+ *    Unsafe because the compiler might decide to eliminate this call on you.
   * SOURCE
   */
  :- pred unsafe_log_f(id::in, level::in, ((func) = string)::in) is det.
diff --git a/extras/mopenssl/mopenssl.m b/extras/mopenssl/mopenssl.m
index 8f339e8..e40c813 100644
--- a/extras/mopenssl/mopenssl.m
+++ b/extras/mopenssl/mopenssl.m
@@ -14,12 +14,16 @@
  %------------------------------------------------------------------------------%

  :- module mopenssl.
-
  :- interface.

  :- import_module stream.
-:- import_module tcp.
-:- import_module io, list.
+:- import_module net.
+:- import_module net.tcp.
+
+:- import_module io.
+:- import_module list.
+
+%------------------------------------------------------------------------------%

  :- typeclass password_cb(T) where [
      pred password_cb(T::in, string::out, io::di, io::uo) is det



More information about the reviews mailing list