summaryrefslogtreecommitdiff
path: root/kernel/safe_typing.ml
diff options
context:
space:
mode:
authorGravatar Stephane Glondu <steph@glondu.net>2008-08-08 13:18:42 +0200
committerGravatar Stephane Glondu <steph@glondu.net>2008-08-08 13:18:42 +0200
commit870075f34dd9fa5792bfbf413afd3b96f17e76a0 (patch)
tree0c647056de1832cf1dba5ba58758b9121418e4be /kernel/safe_typing.ml
parenta0cfa4f118023d35b767a999d5a2ac4b082857b4 (diff)
Imported Upstream version 8.2~beta4+dfsgupstream/8.2.beta4+dfsg
Diffstat (limited to 'kernel/safe_typing.ml')
-rw-r--r--kernel/safe_typing.ml13
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml
index 6906fb29..3c7461b2 100644
--- a/kernel/safe_typing.ml
+++ b/kernel/safe_typing.ml
@@ -6,7 +6,7 @@
(* * GNU Lesser General Public License Version 2.1 *)
(************************************************************************)
-(* $Id: safe_typing.ml 11170 2008-06-25 08:31:04Z soubiran $ *)
+(* $Id: safe_typing.ml 11309 2008-08-06 10:30:35Z herbelin $ *)
open Util
open Names
@@ -163,7 +163,7 @@ let safe_push_named (id,_,_ as d) env =
let _ =
try
let _ = lookup_named id env in
- error ("identifier "^string_of_id id^" already defined")
+ error ("Identifier "^string_of_id id^" already defined.")
with Not_found -> () in
Environ.push_named d env
@@ -446,7 +446,7 @@ let end_module l restype senv =
let senv = add_constraints (struct_expr_constraints struct_expr) senv in
let msid,str = match (eval_struct senv.env struct_expr) with
| SEBstruct(msid,str_l) -> msid,str_l
- | _ -> error ("You cannot Include a higher-order Module or Module Type" )
+ | _ -> error ("You cannot Include a higher-order Module or Module Type.")
in
let mp_sup = senv.modinfo.modpath in
let str1 = subst_signature_msid msid mp_sup str in
@@ -660,7 +660,7 @@ let check_engagement env c =
| Some ImpredicativeSet, Some ImpredicativeSet -> ()
| _, None -> ()
| _, Some ImpredicativeSet ->
- error "Needs option -impredicative-set"
+ error "Needs option -impredicative-set."
let set_engagement c senv =
{senv with
@@ -739,9 +739,10 @@ let check_imports senv needed =
try
let actual_stamp = List.assoc id imports in
if stamp <> actual_stamp then
- error ("Inconsistent assumptions over module " ^(string_of_dirpath id))
+ error
+ ("Inconsistent assumptions over module "^(string_of_dirpath id)^".")
with Not_found ->
- error ("Reference to unknown module " ^ (string_of_dirpath id))
+ error ("Reference to unknown module "^(string_of_dirpath id)^".")
in
List.iter check needed