~ubuntu-branches/ubuntu/wily/coq-doc/wily

« back to all changes in this revision

Viewing changes to kernel/mod_subst.ml

  • Committer: Package Import Robot
  • Author(s): Stéphane Glondu
  • Date: 2012-01-03 23:42:48 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20120103234248-p9r8h1579n67v55a
Tags: 8.3pl3-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
(************************************************************************)
2
2
(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
3
 
(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2010     *)
 
3
(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2011     *)
4
4
(*   \VV/  **************************************************************)
5
5
(*    //   *      This file is distributed under the terms of the       *)
6
6
(*         *       GNU Lesser General Public License Version 2.1        *)
7
7
(************************************************************************)
8
8
 
9
 
(* $Id: mod_subst.ml 13414 2010-09-14 13:28:15Z glondu $ *)
 
9
(* $Id: mod_subst.ml 14641 2011-11-06 11:59:10Z herbelin $ *)
10
10
 
11
11
open Pp
12
12
open Util
396
396
                  let con = constant_of_delta2 resolve con' in
397
397
                con,mkConst con
398
398
            end
399
 
          | Some t -> con',t
 
399
          | Some t ->
 
400
            (* In case of inlining, discard the canonical part (cf #2608) *)
 
401
            constant_of_kn (user_con con'), t
400
402
    with No_subst -> con , mkConst con 
401
403
 
402
404
 
730
732
    | LSlazy(s',a) ->
731
733
          ref (LSlazy(s::s',a))
732
734
 
 
735
(* debug *)
 
736
let repr_substituted r =
 
737
  match !r with
 
738
    | LSval a -> None, a
 
739
    | LSlazy(s,a) -> Some s, a