From 618c003d25f0cde34462b82617b82c698a534370 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Tue, 19 Sep 2023 09:47:01 -0700 Subject: [PATCH] Version Util.Tactics2.{Constr,Proj,DestProj} Mostly done with ``` src/Rewriter/Util/Tactics2$ for i in DestProj.v Proj.v Constr.v; do git mv $i $i.v818; for v in 5 6 7; do ln -s $i.v818 $i.v81$v; git add $i.v81$v; done; cp $i.v818 $i.v819; git add $i.v819; done ``` --- .gitignore | 4 + Makefile.local.common | 3 + src/Rewriter/Util/Tactics2/Constr.v.v815 | 1 + src/Rewriter/Util/Tactics2/Constr.v.v816 | 1 + src/Rewriter/Util/Tactics2/Constr.v.v817 | 1 + .../Util/Tactics2/{Constr.v => Constr.v.v818} | 0 src/Rewriter/Util/Tactics2/Constr.v.v819 | 100 ++++++++++++++++++ src/Rewriter/Util/Tactics2/DestProj.v.v815 | 1 + src/Rewriter/Util/Tactics2/DestProj.v.v816 | 1 + src/Rewriter/Util/Tactics2/DestProj.v.v817 | 1 + .../Tactics2/{DestProj.v => DestProj.v.v818} | 0 src/Rewriter/Util/Tactics2/DestProj.v.v819 | 11 ++ src/Rewriter/Util/Tactics2/Proj.v.v815 | 1 + src/Rewriter/Util/Tactics2/Proj.v.v816 | 1 + src/Rewriter/Util/Tactics2/Proj.v.v817 | 1 + .../Util/Tactics2/{Proj.v => Proj.v.v818} | 0 src/Rewriter/Util/Tactics2/Proj.v.v819 | 8 ++ 17 files changed, 135 insertions(+) create mode 120000 src/Rewriter/Util/Tactics2/Constr.v.v815 create mode 120000 src/Rewriter/Util/Tactics2/Constr.v.v816 create mode 120000 src/Rewriter/Util/Tactics2/Constr.v.v817 rename src/Rewriter/Util/Tactics2/{Constr.v => Constr.v.v818} (100%) create mode 100644 src/Rewriter/Util/Tactics2/Constr.v.v819 create mode 120000 src/Rewriter/Util/Tactics2/DestProj.v.v815 create mode 120000 src/Rewriter/Util/Tactics2/DestProj.v.v816 create mode 120000 src/Rewriter/Util/Tactics2/DestProj.v.v817 rename src/Rewriter/Util/Tactics2/{DestProj.v => DestProj.v.v818} (100%) create mode 100644 src/Rewriter/Util/Tactics2/DestProj.v.v819 create mode 120000 src/Rewriter/Util/Tactics2/Proj.v.v815 create mode 120000 src/Rewriter/Util/Tactics2/Proj.v.v816 create mode 120000 src/Rewriter/Util/Tactics2/Proj.v.v817 rename src/Rewriter/Util/Tactics2/{Proj.v => Proj.v.v818} (100%) create mode 100644 src/Rewriter/Util/Tactics2/Proj.v.v819 diff --git a/.gitignore b/.gitignore index b3d517729..82d83be89 100644 --- a/.gitignore +++ b/.gitignore @@ -121,6 +121,10 @@ src/Rewriter/Util/plugins/ltac2_extra.mli src/Rewriter/Util/plugins/ltac2_extra_plugin.mlg src/Rewriter/Util/plugins/ltac2_extra_plugin.mllib +src/Rewriter/Util/Tactics2/Constr.v +src/Rewriter/Util/Tactics2/DestProj.v +src/Rewriter/Util/Tactics2/Proj.v + /.coq-version /.coq-version-compilation-date /.coq-version-config diff --git a/Makefile.local.common b/Makefile.local.common index 4cf8a6b67..595444d45 100644 --- a/Makefile.local.common +++ b/Makefile.local.common @@ -63,4 +63,7 @@ COMPATIBILITY_FILES := \ src/Rewriter/Util/plugins/RewriterBuild.v \ src/Rewriter/Util/plugins/StrategyTactic.v \ src/Rewriter/Util/plugins/Ltac2Extra.v \ + src/Rewriter/Util/Tactics2/Constr.v \ + src/Rewriter/Util/Tactics2/DestProj.v \ + src/Rewriter/Util/Tactics2/Proj.v \ # diff --git a/src/Rewriter/Util/Tactics2/Constr.v.v815 b/src/Rewriter/Util/Tactics2/Constr.v.v815 new file mode 120000 index 000000000..5645e3175 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Constr.v.v815 @@ -0,0 +1 @@ +Constr.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/Constr.v.v816 b/src/Rewriter/Util/Tactics2/Constr.v.v816 new file mode 120000 index 000000000..5645e3175 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Constr.v.v816 @@ -0,0 +1 @@ +Constr.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/Constr.v.v817 b/src/Rewriter/Util/Tactics2/Constr.v.v817 new file mode 120000 index 000000000..5645e3175 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Constr.v.v817 @@ -0,0 +1 @@ +Constr.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/Constr.v b/src/Rewriter/Util/Tactics2/Constr.v.v818 similarity index 100% rename from src/Rewriter/Util/Tactics2/Constr.v rename to src/Rewriter/Util/Tactics2/Constr.v.v818 diff --git a/src/Rewriter/Util/Tactics2/Constr.v.v819 b/src/Rewriter/Util/Tactics2/Constr.v.v819 new file mode 100644 index 000000000..80159e377 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Constr.v.v819 @@ -0,0 +1,100 @@ +Require Import Ltac2.Ltac2. +Require Export Rewriter.Util.FixCoqMistakes. +Require Rewriter.Util.Tactics2.Array. +Require Rewriter.Util.Tactics2.Proj. +Require Rewriter.Util.Tactics2.Option. +Require Import Rewriter.Util.Tactics2.Iterate. +Local Set Warnings Append "-masking-absolute-name". +Require Import Rewriter.Util.plugins.Ltac2Extra. +Import Ltac2.Constr. +Import Ltac2.Bool. + +Ltac2 is_sort(c: constr) := + match Unsafe.kind c with + | Unsafe.Sort _ => true + | _ => false + end. + +Module Unsafe. + Export Ltac2.Constr.Unsafe. + + Ltac2 rec kind_nocast_gen kind (x : constr) := + let k := kind x in + match k with + | Cast x _ _ => kind_nocast_gen kind x + | _ => k + end. + + Ltac2 kind_nocast (x : constr) : kind := kind_nocast_gen kind x. + + Module Case. + Ltac2 iter_invert (f : constr -> unit) (ci : case_invert) : unit := + match ci with + | NoInvert => () + | CaseInvert indices => Array.iter f indices + end. + End Case. + + (** [iter f c] iters [f] on the immediate subterms of [c]; it is + not recursive and the order with which subterms are processed is + not specified *) + Ltac2 iter (f : constr -> unit) (c : constr) : unit := + match kind c with + | Rel _ => () | Meta _ => () | Var _ => () | Sort _ => () | Constant _ _ => () | Ind _ _ => () + | Constructor _ _ => () | Uint63 _ => () | Float _ => () + | Cast c _ t => f c; f t + | Prod b c => f (Binder.type b); f c + | Lambda b c => f (Binder.type b); f c + | LetIn b t c => f (Binder.type b); f t; f c + | App c l => f c; Array.iter f l + | Evar _ l => () (* not possible to iter in Ltac2... *) + | Case _ x iv y bl + => Array.iter f bl; + Case.iter_invert f iv; + f x; + f y + | Proj _p c => f c + | Fix _ _ tl bl => + Array.iter (fun b => f (Binder.type b)) tl; + Array.iter f bl + | CoFix _ tl bl => + Array.iter (fun b => f (Binder.type b)) tl; + Array.iter f bl + | Array _u t def ty => + Array.iter f t; f def; f ty + end. + + (** [iter_with_binders g f n c] iters [f n] on the immediate + subterms of [c]; it carries an extra data [n] (typically a lift + index) which is processed by [g] (which typically add 1 to [n]) at + each binder traversal; it is not recursive and the order with which + subterms are processed is not specified *) + Ltac2 iter_with_binders (g : 'a -> 'a) (f : 'a -> constr -> unit) (n : 'a) (c : constr) : unit := + match kind c with + | Rel _ => () | Meta _ => () | Var _ => () | Sort _ => () | Constant _ _ => () | Ind _ _ => () + | Constructor _ _ => () | Uint63 _ => () | Float _ => () + | Cast c _ t => f n c; f n t + | Prod b c => f n (Binder.type b); f (g n) c + | Lambda b c => f n (Binder.type b); f (g n) c + | LetIn b t c => f n (Binder.type b); f n t; f (g n) c + | App c l => f n c; Array.iter (f n) l + | Evar _ l => () (* not possible to iter in Ltac2... *) + | Case _ x iv y bl + => Array.iter (f n) bl; + Case.iter_invert (f n) iv; + f n x; + f n y + | Proj _p c => f n c + | Fix _ _ tl bl => + Array.iter (fun b => f n (Binder.type b)) tl; + Array.iter (f (iterate g (Array.length tl) n)) bl + | CoFix _ tl bl => + Array.iter (fun b => f n (Binder.type b)) tl; + Array.iter (f (iterate g (Array.length tl) n)) bl + | Array _u t def ty => + Array.iter (f n) t; f n def; f n ty + end. +End Unsafe. +Import Unsafe. + +Ltac2 equal_nounivs : constr -> constr -> bool := Ltac2.Constr.equal_nounivs. diff --git a/src/Rewriter/Util/Tactics2/DestProj.v.v815 b/src/Rewriter/Util/Tactics2/DestProj.v.v815 new file mode 120000 index 000000000..e4fb9b9c8 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/DestProj.v.v815 @@ -0,0 +1 @@ +DestProj.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/DestProj.v.v816 b/src/Rewriter/Util/Tactics2/DestProj.v.v816 new file mode 120000 index 000000000..e4fb9b9c8 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/DestProj.v.v816 @@ -0,0 +1 @@ +DestProj.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/DestProj.v.v817 b/src/Rewriter/Util/Tactics2/DestProj.v.v817 new file mode 120000 index 000000000..e4fb9b9c8 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/DestProj.v.v817 @@ -0,0 +1 @@ +DestProj.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/DestProj.v b/src/Rewriter/Util/Tactics2/DestProj.v.v818 similarity index 100% rename from src/Rewriter/Util/Tactics2/DestProj.v rename to src/Rewriter/Util/Tactics2/DestProj.v.v818 diff --git a/src/Rewriter/Util/Tactics2/DestProj.v.v819 b/src/Rewriter/Util/Tactics2/DestProj.v.v819 new file mode 100644 index 000000000..552f88ca0 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/DestProj.v.v819 @@ -0,0 +1,11 @@ +Require Import Ltac2.Ltac2. +Require Export Rewriter.Util.FixCoqMistakes. +Import Ltac2.Constr.Unsafe. + +Ltac2 Type exn ::= [ Not_a_proj (kind) ]. +Ltac2 destProj (c : constr) := + let k := kind c in + match k with + | Proj p v => (p, v) + | _ => Control.throw (Not_a_proj k) + end. diff --git a/src/Rewriter/Util/Tactics2/Proj.v.v815 b/src/Rewriter/Util/Tactics2/Proj.v.v815 new file mode 120000 index 000000000..465195d00 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Proj.v.v815 @@ -0,0 +1 @@ +Proj.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/Proj.v.v816 b/src/Rewriter/Util/Tactics2/Proj.v.v816 new file mode 120000 index 000000000..465195d00 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Proj.v.v816 @@ -0,0 +1 @@ +Proj.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/Proj.v.v817 b/src/Rewriter/Util/Tactics2/Proj.v.v817 new file mode 120000 index 000000000..465195d00 --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Proj.v.v817 @@ -0,0 +1 @@ +Proj.v.v818 \ No newline at end of file diff --git a/src/Rewriter/Util/Tactics2/Proj.v b/src/Rewriter/Util/Tactics2/Proj.v.v818 similarity index 100% rename from src/Rewriter/Util/Tactics2/Proj.v rename to src/Rewriter/Util/Tactics2/Proj.v.v818 diff --git a/src/Rewriter/Util/Tactics2/Proj.v.v819 b/src/Rewriter/Util/Tactics2/Proj.v.v819 new file mode 100644 index 000000000..6c0e12e9c --- /dev/null +++ b/src/Rewriter/Util/Tactics2/Proj.v.v819 @@ -0,0 +1,8 @@ +Require Import Ltac2.Ltac2. +Require Export Rewriter.Util.FixCoqMistakes. +Import Ltac2.Constr. +Import Constr.Unsafe. + +Ltac2 equal (x : projection) (y : projection) : bool + := let dummy := make (Rel (-1)) in + Constr.equal (make (Proj x dummy)) (make (Proj y dummy)).