From 1cd1801ee86d6be178f5bce700633aee2416d236 Mon Sep 17 00:00:00 2001
From: msozeau
Date: Wed, 28 Oct 2009 22:51:46 +0000
Subject: Integrate a few improvements on typeclasses and Program from the
 equations branch and remove equations stuff which moves to a separate plugin.

Classes:
- Ability to define classes post-hoc from constants or inductive types.
- Correctly rebuild the hint database associated to local hypotheses when 
  they are changed by a [Hint Extern] in typeclass resolution.

Tactics and proofs:
- Change [revert] so that it keeps let-ins (but not [generalize]).
- Various improvements to the [generalize_eqs] tactic to make it more robust
  and produce the smallest proof terms possible.
  Move [specialize_hypothesis] in tactics.ml as it goes hand in hand with 
  [generalize_eqs].
- A few new general purpose tactics in Program.Tactics like [revert_until]
- Make transitive closure well-foundedness proofs transparent.
- More uniform testing for metas/evars in pretyping/unification.ml
  (might introduce a few changes in the contribs).

Program:
- Better sorting of dependencies in obligations.
- Ability to start a Program definition from just a type and no obligations, 
  automatically adding an obligation for this type.
- In compilation of Program's well-founded definitions, make the functional a
  separate definition for easier reasoning.
- Add a hint database for every Program populated by [Hint Unfold]s for 
  every defined obligation constant.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12440 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 plugins/funind/merge.ml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'plugins/funind')

diff --git a/plugins/funind/merge.ml b/plugins/funind/merge.ml
index 3538f63426..8aeff61e6a 100644
--- a/plugins/funind/merge.ml
+++ b/plugins/funind/merge.ml
@@ -151,11 +151,6 @@ let showind (id:identifier) =
 exception Found of int
 
 (* Array scanning *)
-let array_find (arr: 'a array) (pred: int -> 'a -> bool): int option =
-  try
-    for i=0 to Array.length arr - 1 do if pred i (arr.(i)) then raise (Found i) done;
-    None
-  with Found i -> Some i
 
 let array_prfx (arr: 'a array) (pred: int -> 'a -> bool): int =
   try
@@ -941,7 +936,7 @@ let merge (id1:identifier) (id2:identifier) (args1:identifier array)
                  as above: vars may be linked inside args2?? *)
     Array.mapi
       (fun i c ->
-        match array_find args1 (fun i x -> x=c) with
+        match array_find_i (fun i x -> x=c) args1 with
           | Some j -> Linked j
           | None -> Unlinked)
       args2 in
-- 
cgit v1.2.3