From 60bc3cbe72083f4fa1aa759914936e4fa3d6b42e Mon Sep 17 00:00:00 2001
From: msozeau
Date: Wed, 13 Apr 2011 14:29:02 +0000
Subject: Revert "Add [Polymorphic] flag for defs"

This reverts commit 33434695615806a85cec88452c93ea69ffc0e719.

Conflicts:

	kernel/term_typing.ml
	test-suite/success/polymorphism.v

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13998 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 proofs/pfedit.ml       |  2 +-
 proofs/proof_global.ml | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'proofs')

diff --git a/proofs/pfedit.ml b/proofs/pfedit.ml
index e953d2074c..fff1a121d6 100644
--- a/proofs/pfedit.ml
+++ b/proofs/pfedit.ml
@@ -151,7 +151,7 @@ open Decl_kinds
 let next = let n = ref 0 in fun () -> incr n; !n
 
 let build_constant_by_tactic id sign typ tac =
-  start_proof id (Global,false,Proof Theorem) sign typ (fun _ _ -> ());
+  start_proof id (Global,Proof Theorem) sign typ (fun _ _ -> ());
   try
     by tac;
     let _,(const,_,_,_) = cook_proof (fun _ -> ()) in
diff --git a/proofs/proof_global.ml b/proofs/proof_global.ml
index fa108f1eca..bcd9d6e0d3 100644
--- a/proofs/proof_global.ml
+++ b/proofs/proof_global.ml
@@ -265,18 +265,16 @@ let close_proof () =
     let id = get_current_proof_name () in
     let p = give_me_the_proof () in
     let proofs_and_types = Proof.return p in
-    let { compute_guard=cg ; strength=str ; hook=hook } =
-      Idmap.find id !proof_info
-    in
-    let (_, poly, _) = str in
     let entries = List.map
       (fun (c,t) -> { Entries.const_entry_body = c ;
                       const_entry_type  = Some t;
-		      const_entry_polymorphic = poly;
 		      const_entry_opaque = true })
       proofs_and_types
     in
-    (id,(entries,cg,str,hook))
+    let { compute_guard=cg ; strength=str ; hook=hook } =
+      Idmap.find id !proof_info
+    in
+    (id, (entries,cg,str,hook))
   with 
     |  Proof.UnfinishedProof ->
 	 Util.error "Attempt to save an incomplete proof"
-- 
cgit v1.2.3