diff --git a/CHANGELOG.md b/CHANGELOG.md index 0282b1e86d32da7f644c78c31e4a637482cc06af..e78f6549b71d9ac6d5ac7c316ec8e93ac3be8839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,6 +120,8 @@ API-breaking change is listed. Haskell and friends. + Add `Params` and `Proper` instances for `curry`/`uncurry`, `curry3`/`uncurry3`, and `curry4`/`uncurry4`. + + Add lemmas that say that `curry`/`curry3`/`curry4` and + `uncurry`/`uncurry3`/`uncurry4` are inverses. - Rename `map_union_subseteq_l_alt` → `map_union_subseteq_l'` and `map_union_subseteq_r_alt` → `map_union_subseteq_r'` to be consistent with `or_intro_{l,r}'`. diff --git a/theories/base.v b/theories/base.v index ebd343af3c13822b4c63ff4cb55d2d2f063dea03..ad373c01bc50804cd42e3ff8d973aaaed35964ea 100644 --- a/theories/base.v +++ b/theories/base.v @@ -705,6 +705,24 @@ Global Instance prod_inhabited {A B} (iA : Inhabited A) (iB : Inhabited B) : Inhabited (A * B) := match iA, iB with populate x, populate y => populate (x,y) end. +(** Note that we need eta for products for the [uncurry_curry] lemmas to hold +in non-applied form ([uncurry (curry f) = f]). *) +Lemma curry_uncurry {A B C} (f : A → B → C) : curry (uncurry f) = f. +Proof. reflexivity. Qed. +Lemma uncurry_curry {A B C} (f : A * B → C) p : uncurry (curry f) p = f p. +Proof. destruct p; reflexivity. Qed. +Lemma curry3_uncurry3 {A B C D} (f : A → B → C → D) : curry3 (uncurry3 f) = f. +Proof. reflexivity. Qed. +Lemma uncurry3_curry3 {A B C D} (f : A * B * C → D) p : + uncurry3 (curry3 f) p = f p. +Proof. destruct p as [[??] ?]; reflexivity. Qed. +Lemma curry4_uncurry4 {A B C D E} (f : A → B → C → D → E) : + curry4 (uncurry4 f) = f. +Proof. reflexivity. Qed. +Lemma uncurry4_curry4 {A B C D E} (f : A * B * C * D → E) p : + uncurry4 (curry4 f) p = f p. +Proof. destruct p as [[[??] ?] ?]; reflexivity. Qed. + Global Instance pair_inj {A B} : Inj2 (=) (=) (=) (@pair A B). Proof. injection 1; auto. Qed. Global Instance prod_map_inj {A A' B B'} (f : A → A') (g : B → B') :