From 3e96002677226c0cdaa8f355938a76cfb37a722a Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Thu, 14 Oct 2010 17:51:11 +0200
Subject: Imported Upstream version 8.3

---
 kernel/mod_subst.ml | 4 ++--
 kernel/names.ml     | 4 ++--
 kernel/reduction.ml | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'kernel')

diff --git a/kernel/mod_subst.ml b/kernel/mod_subst.ml
index 53d26ec6..146da92c 100644
--- a/kernel/mod_subst.ml
+++ b/kernel/mod_subst.ml
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(* $Id: mod_subst.ml 13323 2010-07-24 15:57:30Z herbelin $ *)
+(* $Id: mod_subst.ml 13414 2010-09-14 13:28:15Z glondu $ *)
 
 open Pp
 open Util
@@ -638,7 +638,7 @@ let update_delta_resolver resolver1 resolver2 =
 		   Change_equiv_to_inline c ->
 		     Deltamap.add key (Inline (Some c)) res)
 	  | _ -> Deltamap.add key hint res
-      with not_found -> 
+      with Not_found ->
 	Deltamap.add key hint res
     in
       Deltamap.fold apply_res resolver1 empty_delta_resolver
diff --git a/kernel/names.ml b/kernel/names.ml
index 550c70b4..9f1becf7 100644
--- a/kernel/names.ml
+++ b/kernel/names.ml
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(* $Id: names.ml 13323 2010-07-24 15:57:30Z herbelin $ *)
+(* $Id: names.ml 13486 2010-10-03 17:01:43Z herbelin $ *)
 
 open Pp
 open Util
@@ -108,7 +108,7 @@ let rec check_bound_mp = function
   | _ -> false
 
 let rec string_of_mp = function
-  | MPfile sl -> "MPfile (" ^ string_of_dirpath sl ^ ")"
+  | MPfile sl -> string_of_dirpath sl
   | MPbound uid -> string_of_uid uid
  (* | MPapp (mp1,mp2) -> 
       "("^string_of_mp mp ^ " " ^ 
diff --git a/kernel/reduction.ml b/kernel/reduction.ml
index 00e8014f..46a469df 100644
--- a/kernel/reduction.ml
+++ b/kernel/reduction.ml
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(* $Id: reduction.ml 13354 2010-07-29 16:44:45Z barras $ *)
+(* $Id: reduction.ml 13449 2010-09-22 19:31:50Z glondu $ *)
 
 open Util
 open Names
@@ -176,9 +176,11 @@ type conv_pb =
 
 let sort_cmp pb s0 s1 cuniv =
   match (s0,s1) with
-    | (Prop c1, Prop c2) ->
+    | (Prop c1, Prop c2) when pb = CUMUL ->
         if c1 = Null or c2 = Pos then cuniv   (* Prop <= Set *)
         else raise NotConvertible
+    | (Prop c1, Prop c2) ->
+        if c1 = c2 then cuniv else raise NotConvertible
     | (Prop c1, Type u) when pb = CUMUL -> assert (is_univ_variable u); cuniv
     | (Type u1, Type u2) ->
 	assert (is_univ_variable u2);
-- 
cgit v1.2.3