diff options
| author |  Stephane Glondu <steph@glondu.net> | 2011-12-25 13:19:42 +0100 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2011-12-25 13:19:42 +0100 |
| commit | 300293c119981054c95182a90c829058530a6b6f (patch) | |
| tree | d7303613741c5796b58ced7db24ec7203327dbb2 /kernel/mod_subst.ml | |
| parent | 9d27ae09786866b6e3d7b79d1fa7667e5e2aa309 (diff) | |
Imported Upstream version 8.3.pl3upstream/8.3.pl3
Diffstat (limited to 'kernel/mod_subst.ml')
| -rw-r--r-- | kernel/mod_subst.ml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kernel/mod_subst.ml b/kernel/mod_subst.ml index 146da92c..ab8b60be 100644 --- a/kernel/mod_subst.ml +++ b/kernel/mod_subst.ml @@ -1,12 +1,12 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: mod_subst.ml 13414 2010-09-14 13:28:15Z glondu $ *) +(* $Id: mod_subst.ml 14641 2011-11-06 11:59:10Z herbelin $ *) open Pp open Util @@ -396,7 +396,9 @@ let subst_con sub con = let con = constant_of_delta2 resolve con' in con,mkConst con end - | Some t -> con',t + | Some t -> + (* In case of inlining, discard the canonical part (cf #2608) *) + constant_of_kn (user_con con'), t with No_subst -> con , mkConst con @@ -730,3 +732,8 @@ let subst_substituted s r = | LSlazy(s',a) -> ref (LSlazy(s::s',a)) +(* debug *) +let repr_substituted r = + match !r with + | LSval a -> None, a + | LSlazy(s,a) -> Some s, a |