From 0459e9411d1dd54e4faa0098659ae2b15938e4cd Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 12 Jul 2024 16:13:00 +0200 Subject: [PATCH] Adapt to https://github.com/coq/coq/pull/19310 --- tests/Morph_rw.dot.oracle | 16 ++++----- tests/Morph_rw.dpd.oracle | 68 ++++++++++++++++++------------------- tests/graph2.dot.oracle | 22 ++++++------ tests/graph2.dpd.oracle | 70 +++++++++++++++++++-------------------- tests/search.oracle | 4 +-- 5 files changed, 90 insertions(+), 90 deletions(-) diff --git a/tests/Morph_rw.dot.oracle b/tests/Morph_rw.dot.oracle index 8bda340f5..05cd291cf 100644 --- a/tests/Morph_rw.dot.oracle +++ b/tests/Morph_rw.dot.oracle @@ -14,19 +14,19 @@ Morph_Fequiv_refl [label="Fequiv_refl", URL=, fillcolor= Morph_Fequiv_sym [label="Fequiv_sym", URL=, fillcolor="#FFB57F"] ; RelationClasses_Equivalence [label="Equivalence", URL=, fillcolor="#E2CDFA"] ; RelationClasses_Build_Equivalence [label="Build_Equivalence", URL=, fillcolor="#7FAAFF"] ; -RelationClasses_Symmetric [label="Symmetric", URL=, fillcolor="#F070D1"] ; RelationClasses_Reflexive [label="Reflexive", URL=, fillcolor="#F070D1"] ; Relation_Definitions_relation [label="relation", URL=, fillcolor="#F070D1"] ; RelationClasses_Transitive [label="Transitive", URL=, fillcolor="#F070D1"] ; +RelationClasses_Symmetric [label="Symmetric", URL=, fillcolor="#F070D1"] ; RelationClasses_Equivalence_Transitive [label="Equivalence_Transitive", URL=, fillcolor="#7FFFD4"] ; RelationClasses_Equivalence_Symmetric [label="Equivalence_Symmetric", URL=, fillcolor="#7FFFD4"] ; RelationClasses_PER [label="PER", URL=, fillcolor="#E2CDFA"] ; RelationClasses_Build_PER [label="Build_PER", URL=, fillcolor="#7FAAFF"] ; Morphisms_Proper [label="Proper", URL=, fillcolor="#F070D1"] ; Morphisms_respectful [label="respectful", URL=, fillcolor="#F070D1"] ; +Morphisms_trans_sym_co_inv_impl_morphism_obligation_1 [label="trans_sym_co_inv_impl_morphism_obligation_1", URL=, fillcolor="#7FFFD4"] ; Basics_flip [label="flip", URL=, fillcolor="#F070D1"] ; Basics_impl [label="impl", URL=, fillcolor="#F070D1"] ; -Morphisms_trans_sym_co_inv_impl_morphism_obligation_1 [label="trans_sym_co_inv_impl_morphism_obligation_1", URL=, fillcolor="#7FFFD4"] ; RelationClasses_PER_Symmetric [label="PER_Symmetric", URL=, fillcolor="#7FFFD4"] ; RelationClasses_symmetry [label="symmetry", URL=, fillcolor="#7FFFD4"] ; RelationClasses_PER_Transitive [label="PER_Transitive", URL=, fillcolor="#7FFFD4"] ; @@ -55,21 +55,21 @@ RelationClasses_transitivity [label="transitivity", URL= Morph_Fequiv [] ; Morph_Fequiv_refl -> Morph_Fequiv [] ; Morph_Fequiv_sym -> Morph_Fequiv [] ; - RelationClasses_Equivalence -> RelationClasses_Symmetric [] ; RelationClasses_Equivalence -> RelationClasses_Reflexive [] ; RelationClasses_Equivalence -> RelationClasses_Transitive [] ; - RelationClasses_Build_Equivalence -> RelationClasses_Symmetric [] ; + RelationClasses_Equivalence -> RelationClasses_Symmetric [] ; RelationClasses_Build_Equivalence -> RelationClasses_Reflexive [] ; RelationClasses_Build_Equivalence -> RelationClasses_Transitive [] ; - RelationClasses_Symmetric -> Relation_Definitions_relation [] ; + RelationClasses_Build_Equivalence -> RelationClasses_Symmetric [] ; RelationClasses_Reflexive -> Relation_Definitions_relation [] ; RelationClasses_Transitive -> Relation_Definitions_relation [] ; + RelationClasses_Symmetric -> Relation_Definitions_relation [] ; RelationClasses_Equivalence_Transitive -> RelationClasses_Equivalence [] ; RelationClasses_Equivalence_Symmetric -> RelationClasses_Equivalence [] ; - RelationClasses_PER -> RelationClasses_Symmetric [] ; RelationClasses_PER -> RelationClasses_Transitive [] ; - RelationClasses_Build_PER -> RelationClasses_Symmetric [] ; + RelationClasses_PER -> RelationClasses_Symmetric [] ; RelationClasses_Build_PER -> RelationClasses_Transitive [] ; + RelationClasses_Build_PER -> RelationClasses_Symmetric [] ; Morphisms_Proper -> Relation_Definitions_relation [] ; Morphisms_respectful -> Relation_Definitions_relation [] ; Morphisms_trans_sym_co_inv_impl_morphism_obligation_1 -> Morphisms_respectful [] ; @@ -86,7 +86,7 @@ RelationClasses_transitivity [label="transitivity", URL=, peripheries=3, fillcolor="#7FFFD4"] ; Test_Permutation_sym [label="Permutation_sym", URL=, fillcolor="#7FFFD4"] ; Test_app_nil_end [label="app_nil_end", URL=, fillcolor="#7FFFD4"] ; +_eq_ind [label="eq_ind", URL=<.html#eq_ind>, fillcolor="#7FFFD4"] ; +_eq_ind_r [label="eq_ind_r", URL=<.html#eq_ind_r>, fillcolor="#7FFFD4"] ; Test_app_comm_cons [label="app_comm_cons", URL=, fillcolor="#7FFFD4"] ; Test_Permutation_refl [label="Permutation_refl", URL=, fillcolor="#7FFFD4"] ; Test_list_ind [label="list_ind", URL=, fillcolor="#7FFFD4"] ; -_eq_ind [label="eq_ind", URL=<.html#eq_ind>, fillcolor="#7FFFD4"] ; -_eq_ind_r [label="eq_ind_r", URL=<.html#eq_ind_r>, fillcolor="#7FFFD4"] ; Test_Permutation_trans [label="Permutation_trans", URL=, fillcolor="#7FFFD4"] ; Test_app [label="app", URL=, fillcolor="#F070D1"] ; Test_Permutation [label="Permutation", URL=, fillcolor="#E2CDFA"] ; @@ -18,26 +18,29 @@ Test_perm_swap [label="perm_swap", URL=, fillcolor="#7FAAFF Test_nil [label="nil", URL=, fillcolor="#7FAAFF"] ; Test_cons [label="cons", URL=, fillcolor="#7FAAFF"] ; Test_perm_trans [label="perm_trans", URL=, fillcolor="#7FAAFF"] ; -_eq_sym [label="eq_sym", URL=<.html#eq_sym>, fillcolor="#7FFFD4"] ; +Test_perm_nil [label="perm_nil", URL=, fillcolor="#7FAAFF"] ; _eq [label="eq", URL=<.html#eq>, fillcolor="#E2CDFA"] ; _eq_refl [label="eq_refl", URL=<.html#eq_refl>, fillcolor="#7FAAFF"] ; -Test_perm_nil [label="perm_nil", URL=, fillcolor="#7FAAFF"] ; +_eq_sym [label="eq_sym", URL=<.html#eq_sym>, fillcolor="#7FFFD4"] ; Test_Permutation_ind [label="Permutation_ind", URL=, fillcolor="#7FFFD4"] ; Test_Permutation_app_swap -> Test_Permutation_sym [] ; Test_Permutation_app_swap -> Test_app_nil_end [] ; + Test_Permutation_app_swap -> _eq_ind_r [] ; Test_Permutation_app_swap -> Test_app_comm_cons [] ; Test_Permutation_app_swap -> Test_Permutation_refl [] ; - Test_Permutation_app_swap -> _eq_ind_r [] ; Test_Permutation_app_swap -> Test_Permutation_trans [] ; Test_Permutation_sym -> Test_perm_skip [] ; Test_Permutation_sym -> Test_perm_swap [] ; Test_Permutation_sym -> Test_perm_trans [] ; Test_Permutation_sym -> Test_perm_nil [] ; Test_Permutation_sym -> Test_Permutation_ind [] ; - Test_app_nil_end -> Test_list_ind [] ; Test_app_nil_end -> _eq_ind [] ; + Test_app_nil_end -> Test_list_ind [] ; Test_app_nil_end -> Test_app [] ; Test_app_nil_end -> _eq_refl [] ; + _eq_ind -> _eq [] ; + _eq_ind_r -> _eq_ind [] ; + _eq_ind_r -> _eq_sym [] ; Test_app_comm_cons -> Test_app [] ; Test_app_comm_cons -> _eq [] ; Test_app_comm_cons -> _eq_refl [] ; @@ -48,9 +51,6 @@ Test_Permutation_ind [label="Permutation_ind", URL=, Test_list_ind -> Test_list [] ; Test_list_ind -> Test_nil [] ; Test_list_ind -> Test_cons [] ; - _eq_ind -> _eq [] ; - _eq_ind_r -> _eq_ind [] ; - _eq_ind_r -> _eq_sym [] ; Test_Permutation_trans -> Test_Permutation [] ; Test_Permutation_trans -> Test_perm_trans [] ; Test_app -> Test_list [] ; @@ -67,11 +67,11 @@ Test_Permutation_ind [label="Permutation_ind", URL=, Test_perm_trans -> Test_list [] ; Test_perm_trans -> Test_nil [] ; Test_perm_trans -> Test_cons [] ; - _eq_sym -> _eq [] ; - _eq_sym -> _eq_refl [] ; Test_perm_nil -> Test_list [] ; Test_perm_nil -> Test_nil [] ; Test_perm_nil -> Test_cons [] ; + _eq_sym -> _eq [] ; + _eq_sym -> _eq_refl [] ; Test_Permutation_ind -> Test_Permutation [] ; subgraph cluster_Test { label="Test"; fillcolor="#FFFFC3"; labeljust=l; style=filled Test_Permutation_ind; Test_perm_nil; Test_perm_trans; Test_cons; Test_nil; Test_perm_swap; Test_perm_skip; Test_list; Test_Permutation; Test_app; Test_Permutation_trans; Test_list_ind; Test_Permutation_refl; Test_app_comm_cons; Test_app_nil_end; Test_Permutation_sym; Test_Permutation_app_swap; }; diff --git a/tests/graph2.dpd.oracle b/tests/graph2.dpd.oracle index 9ed7afe72..1e875361d 100644 --- a/tests/graph2.dpd.oracle +++ b/tests/graph2.dpd.oracle @@ -1,19 +1,19 @@ N: 184 "Permutation_app_swap" [body=yes, kind=cnst, prop=yes, path="Test", ]; N: 205 "Permutation_ind" [body=yes, kind=cnst, prop=yes, path="Test", ]; -N: 188 "Permutation_refl" [body=yes, kind=cnst, prop=yes, path="Test", ]; +N: 190 "Permutation_refl" [body=yes, kind=cnst, prop=yes, path="Test", ]; N: 185 "Permutation_sym" [body=yes, kind=cnst, prop=yes, path="Test", ]; N: 192 "Permutation_trans" [body=yes, kind=cnst, prop=yes, path="Test", ]; N: 193 "app" [body=yes, kind=cnst, prop=no, path="Test", ]; -N: 187 "app_comm_cons" [body=yes, kind=cnst, prop=yes, path="Test", ]; +N: 189 "app_comm_cons" [body=yes, kind=cnst, prop=yes, path="Test", ]; N: 186 "app_nil_end" [body=yes, kind=cnst, prop=yes, path="Test", ]; -N: 190 "eq_ind" [body=yes, kind=cnst, prop=yes, ]; -N: 191 "eq_ind_r" [body=yes, kind=cnst, prop=yes, ]; -N: 201 "eq_sym" [body=yes, kind=cnst, prop=yes, ]; -N: 189 "list_ind" [body=yes, kind=cnst, prop=yes, path="Test", ]; +N: 187 "eq_ind" [body=yes, kind=cnst, prop=yes, ]; +N: 188 "eq_ind_r" [body=yes, kind=cnst, prop=yes, ]; +N: 204 "eq_sym" [body=yes, kind=cnst, prop=yes, ]; +N: 191 "list_ind" [body=yes, kind=cnst, prop=yes, path="Test", ]; N: 194 "Permutation" [kind=inductive, prop=no, path="Test", ]; N: 202 "eq" [kind=inductive, prop=no, ]; N: 195 "list" [kind=inductive, prop=no, path="Test", ]; -N: 204 "perm_nil" [kind=construct, prop=yes, path="Test", ]; +N: 201 "perm_nil" [kind=construct, prop=yes, path="Test", ]; N: 203 "eq_refl" [kind=construct, prop=yes, ]; N: 198 "nil" [kind=construct, prop=no, path="Test", ]; N: 196 "perm_skip" [kind=construct, prop=yes, path="Test", ]; @@ -22,11 +22,11 @@ N: 197 "perm_swap" [kind=construct, prop=yes, path="Test", ]; N: 200 "perm_trans" [kind=construct, prop=yes, path="Test", ]; E: 184 185 [weight=3, ]; E: 184 186 [weight=2, ]; -E: 184 187 [weight=1, ]; -E: 184 188 [weight=2, ]; -E: 184 189 [weight=2, ]; +E: 184 187 [weight=2, ]; +E: 184 188 [weight=1, ]; +E: 184 189 [weight=1, ]; E: 184 190 [weight=2, ]; -E: 184 191 [weight=1, ]; +E: 184 191 [weight=2, ]; E: 184 192 [weight=3, ]; E: 184 193 [weight=43, ]; E: 184 194 [weight=11, ]; @@ -40,33 +40,33 @@ E: 185 195 [weight=12, ]; E: 185 196 [weight=1, ]; E: 185 197 [weight=1, ]; E: 185 200 [weight=1, ]; -E: 185 204 [weight=1, ]; +E: 185 201 [weight=1, ]; E: 185 205 [weight=1, ]; -E: 186 189 [weight=1, ]; -E: 186 190 [weight=1, ]; +E: 186 187 [weight=1, ]; +E: 186 191 [weight=1, ]; E: 186 193 [weight=6, ]; E: 186 195 [weight=14, ]; E: 186 198 [weight=9, ]; E: 186 199 [weight=5, ]; E: 186 202 [weight=6, ]; E: 186 203 [weight=2, ]; -E: 187 193 [weight=3, ]; -E: 187 195 [weight=6, ]; -E: 187 199 [weight=3, ]; -E: 187 202 [weight=1, ]; -E: 187 203 [weight=1, ]; -E: 188 189 [weight=1, ]; -E: 188 194 [weight=3, ]; -E: 188 195 [weight=4, ]; -E: 188 196 [weight=1, ]; +E: 187 202 [weight=3, ]; +E: 188 187 [weight=1, ]; +E: 188 202 [weight=2, ]; E: 188 204 [weight=1, ]; -E: 189 195 [weight=8, ]; -E: 189 198 [weight=2, ]; -E: 189 199 [weight=2, ]; -E: 190 202 [weight=3, ]; -E: 191 190 [weight=1, ]; -E: 191 201 [weight=1, ]; -E: 191 202 [weight=2, ]; +E: 189 193 [weight=3, ]; +E: 189 195 [weight=6, ]; +E: 189 199 [weight=3, ]; +E: 189 202 [weight=1, ]; +E: 189 203 [weight=1, ]; +E: 190 191 [weight=1, ]; +E: 190 194 [weight=3, ]; +E: 190 195 [weight=4, ]; +E: 190 196 [weight=1, ]; +E: 190 201 [weight=1, ]; +E: 191 195 [weight=8, ]; +E: 191 198 [weight=2, ]; +E: 191 199 [weight=2, ]; E: 192 194 [weight=3, ]; E: 192 195 [weight=3, ]; E: 192 200 [weight=1, ]; @@ -84,11 +84,11 @@ E: 197 199 [weight=6, ]; E: 200 195 [weight=6, ]; E: 200 198 [weight=2, ]; E: 200 199 [weight=6, ]; -E: 201 202 [weight=5, ]; -E: 201 203 [weight=1, ]; -E: 204 195 [weight=6, ]; -E: 204 198 [weight=2, ]; -E: 204 199 [weight=6, ]; +E: 201 195 [weight=6, ]; +E: 201 198 [weight=2, ]; +E: 201 199 [weight=6, ]; +E: 204 202 [weight=5, ]; +E: 204 203 [weight=1, ]; E: 205 194 [weight=10, ]; E: 205 195 [weight=22, ]; E: 205 198 [weight=4, ]; diff --git a/tests/search.oracle b/tests/search.oracle index a2eb1686a..08a04a1db 100644 --- a/tests/search.oracle +++ b/tests/search.oracle @@ -3,5 +3,5 @@ Welcome to Coq [Loading ML file ring_plugin.cmxs (using legacy method) ... done] Fetching opaque proofs from disk for dpdgraph.tests.Test [cons(42) nil(6) perm_swap(1) perm_skip(3) list(18) Permutation(11) app(43) -Permutation_trans(3) eq_ind_r(1) eq_ind(2) list_ind(2) Permutation_refl(2) -app_comm_cons(1) app_nil_end(2) Permutation_sym(3) ] +Permutation_trans(3) list_ind(2) Permutation_refl(2) app_comm_cons(1) +eq_ind_r(1) eq_ind(2) app_nil_end(2) Permutation_sym(3) ]