Merge pull request #64 from coq-ext-lib/finite-map-remove-facts

Finite map facts about remove

theories/Data/Map/FMapAList.v

@@ -139,12 +139,39 @@ Section keyed.
       intros. eapply mapsto_remove_neq_alist in H. eapply H.
     Qed.
 
+    Theorem remove_eq_alist:
+      forall (m : alist) (k : K), alist_find k (alist_remove k m) = None.
+    Proof.
+      unfold mapsto_alist.
+      induction m; simpl; eauto; try congruence.
+      intros; consider (k ?[ R ] fst a); simpl; intros; eauto.
+      destruct a; simpl in *.
+      consider (k ?[ R ] k0); eauto. tauto.
+    Qed.
+
+    Theorem remove_neq_alist:
+      forall (m : alist) (k k' : K), ~R k' k -> alist_find k (alist_remove k' m) = alist_find k m.
+    Proof.
+      unfold mapsto_alist.
+      induction m; simpl; eauto; try congruence.
+      destruct a; simpl.
+      intros; consider (k' ?[ R ] k); simpl; intros; eauto.
+      { consider (k0 ?[ R ] k); intros; eauto.
+        exfalso. eapply H. etransitivity; eauto. }
+      { consider (k0 ?[ R ] k); eauto. }
+    Qed.
+
     Global Instance MapLaws_alist : MapOk R Map_alist.
     Proof.
       refine {| mapsto := fun k v m => mapsto_alist m k v |};
       eauto using mapsto_lookup_alist, mapsto_add_eq_alist, mapsto_add_neq_alist.
       { intros; intro. inversion H. }
-    Qed.
+      { unfold mapsto_alist; simpl. intros.
+        rewrite remove_eq_alist. congruence. }
+      { unfold mapsto_alist. simpl; intros.
+        erewrite (@remove_neq_alist m _ _ H).
+        reflexivity. }
+    Defined.
 
   End proofs.
 

theories/Data/Map/FMapPositive.v

@@ -31,53 +31,53 @@ Section pmap.
       | Branch _ _ r => r
     end.
 
-  Fixpoint pmap_lookup (p : positive) (m : pmap) : option T :=
+  Fixpoint pmap_lookup (p : positive) (m : pmap) {struct p} : option T :=
     match m with
-      | Empty => None
-      | Branch d l r =>
-        match p with
-          | xH => d
-          | xO p => pmap_lookup p l
-          | xI p => pmap_lookup p r
-        end
+    | Empty => None
+    | Branch d l r =>
+      match p with
+      | xH => d
+      | xO p => pmap_lookup p l
+      | xI p => pmap_lookup p r
+      end
     end.
 
-  Fixpoint pmap_insert (p : positive) (v : T) (m : pmap) : pmap :=
+  Fixpoint pmap_insert (p : positive) (v : T) (m : pmap) {struct p} : pmap :=
     match p with
-      | xH => Branch (Some v) (pmap_left m) (pmap_right m)
-      | xO p =>
-        Branch (pmap_here m) (pmap_insert p v (pmap_left m)) (pmap_right m)
-      | xI p =>
-        Branch (pmap_here m) (pmap_left m) (pmap_insert p v (pmap_right m))
+    | xH => Branch (Some v) (pmap_left m) (pmap_right m)
+    | xO p =>
+      Branch (pmap_here m) (pmap_insert p v (pmap_left m)) (pmap_right m)
+    | xI p =>
+      Branch (pmap_here m) (pmap_left m) (pmap_insert p v (pmap_right m))
     end.
 
   Definition branch (o : option T) (l r : pmap) : pmap :=
     match o , l , r with
-      | None , Empty , Empty => Empty
-      | _ , _ , _ => Branch o l r
+    | None , Empty , Empty => Empty
+    | _ , _ , _ => Branch o l r
     end.
 
-  Fixpoint pmap_remove (p : positive) (m : pmap) : pmap :=
+  Fixpoint pmap_remove (p : positive) (m : pmap) {struct p} : pmap :=
     match m with
-      | Empty => Empty
-      | Branch d l r =>
-        match p with
-          | xH => branch None l r
-          | xO p => branch d (pmap_remove p l) r
-          | xI p => branch d l (pmap_remove p r)
-        end
+    | Empty => Empty
+    | Branch d l r =>
+      match p with
+      | xH => branch None l r
+      | xO p => branch d (pmap_remove p l) r
+      | xI p => branch d l (pmap_remove p r)
+      end
     end.
 
   Definition pmap_empty : pmap := Empty.
 
   Fixpoint pmap_union (f m : pmap) : pmap :=
     match f with
-      | Empty => m
-      | Branch d l r =>
-        Branch (match d with
-                  | Some x => Some x
-                  | None => pmap_here m
-                end) (pmap_union l (pmap_left m)) (pmap_union r (pmap_right m))
+    | Empty => m
+    | Branch d l r =>
+      Branch (match d with
+              | Some x => Some x
+              | None => pmap_here m
+              end) (pmap_union l (pmap_left m)) (pmap_union r (pmap_right m))
     end.
 
   Global Instance Map_pmap : Map positive T pmap :=
@@ -153,7 +153,7 @@ Section pmap.
     { destruct k'; simpl; destruct m; simpl;
       autorewrite with pmap_rw; Cases.rewrite_all_goal; try reflexivity; try congruence. }
   Qed.
- 
+
   Lemma pmap_lookup_insert_None_neq
   : forall (m : pmap) (k : positive) (v : T) (k' : positive),
       k <> k' ->
@@ -185,13 +185,56 @@ Section pmap.
       apply pmap_lookup_insert_None_neq; intuition].
   Qed.
 
+  Lemma pmap_lookup_remove_eq
+  : forall (m : pmap) (k : positive) (v : T),
+      pmap_lookup k (pmap_remove k m) <> Some v.
+  Proof.
+    induction m; destruct k; simpl; intros; try congruence.
+    { destruct o; simpl; eauto.
+      destruct m1; simpl; eauto.
+      destruct (pmap_remove k m2) eqn:?; try congruence.
+      rewrite <- Heqp. eauto. }
+    { destruct o; simpl; eauto.
+      destruct (pmap_remove k m1) eqn:?; try congruence.
+      - destruct m2; try congruence; eauto.
+        destruct k; simpl; congruence.
+      - rewrite <- Heqp. eauto. }
+    { destruct m1; try congruence.
+      destruct m2; try congruence. }
+  Qed.
+
+  Lemma pmap_lookup_remove_neq
+  : forall (m : pmap) (k k' : positive),
+      k <> k' ->
+      forall v' : T, pmap_lookup k' m = Some v' <-> pmap_lookup k' (pmap_remove k m) = Some v'.
+  Proof.
+    induction m.
+    Local Ltac t :=
+      unfold branch;
+      repeat match goal with
+             | |- context [ match ?X with _ => _ end ] =>
+               lazymatch X with
+               | match _ with _ => _ end => fail
+               | _ => destruct X eqn:?; subst; try tauto
+               end
+             end.
+    { destruct k; simpl; split; try congruence. }
+    { destruct k', k; simpl; intros; try solve [ t; rewrite lookup_empty; tauto ].
+      { assert (k <> k') by congruence.
+        rewrite IHm2; eauto. simpl. t. rewrite lookup_empty. tauto. }
+      { assert (k <> k') by congruence.
+        rewrite IHm1; eauto. simpl. t. rewrite lookup_empty. tauto. } }
+  Qed.
+
   Global Instance MapOk_pmap : MapOk (@eq _) Map_pmap.
   Proof.
   refine {| mapsto := fun k v m => pmap_lookup k m = Some v |}.
     { abstract (induction k; simpl; congruence). }
     { abstract (induction k; simpl; intros; forward). }
     { eauto using pmap_lookup_insert_eq. }
     { eauto using pmap_lookup_insert_Some_neq. }
+    { eauto using pmap_lookup_remove_eq. }
+    { eauto using pmap_lookup_remove_neq. }
   Defined.
 
   Definition from_list : list T -> pmap :=

theories/Structures/Maps.v

@@ -29,6 +29,10 @@ Section Maps.
   ; mapsto_add_neq : forall m k v k',
                        ~R k k' ->
                        forall v', (mapsto k' v' m <-> mapsto k' v' (add k v m))
+  ; mapsto_remove_eq: forall m k v, ~ mapsto k v (remove k m)
+  ; mapsto_remove_neq : forall m k k',
+          ~ R k k' ->
+          forall v', (mapsto k' v' m <-> mapsto k' v' (remove k m))
   }.
 
   Variable M : Map.
@@ -61,8 +65,8 @@ Section Maps.
         else acc) empty m.
 
   Definition submap_with (le : V -> V -> bool) (m1 m2 : map) : bool :=
-    fold (fun k_v (acc : bool) => 
-      if acc then 
+    fold (fun k_v (acc : bool) =>
+      if acc then
         let '(k,v) := k_v in
         match lookup k m2 with
           | None => false