diff options
author | Maxime Dénès <mail@maximedenes.fr> | 2017-11-24 15:45:20 +0100 |
---|---|---|
committer | Maxime Dénès <mail@maximedenes.fr> | 2017-11-24 15:45:20 +0100 |
commit | b8673b96bd7bbc40e442d308e6a30db4e699b2b1 (patch) | |
tree | d08dcbf240f686f7d19725b90c16bdb5efea7c55 /plugins | |
parent | 15f22178b01113be7fcd603317ac7883afb6bee4 (diff) | |
parent | 9285bf164e0e9723b482d668f52ec6363623383c (diff) |
Merge PR #6205: Fixing a 8.7 regression of ring_simplify in ArithRing
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/setoid_ring/ArithRing.v | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/plugins/setoid_ring/ArithRing.v b/plugins/setoid_ring/ArithRing.v index 447acb905..8e4d8b0d3 100644 --- a/plugins/setoid_ring/ArithRing.v +++ b/plugins/setoid_ring/ArithRing.v @@ -41,9 +41,12 @@ Ltac Ss_to_add f acc := | _ => constr:((acc + f)%nat) end. +(* For internal use only *) +Local Definition protected_to_nat := N.to_nat. + Ltac natprering := match goal with - |- context C [S ?p] => + |- context C [S ?p] => match p with O => fail 1 (* avoid replacing 1 with 1+0 ! *) | p => match isnatcst p with @@ -52,9 +55,19 @@ Ltac natprering := fold v; natprering end end - | _ => idtac + | _ => change N.to_nat with protected_to_nat + end. + +Ltac natpostring := + match goal with + | |- context [N.to_nat ?x] => + let v := eval cbv in (N.to_nat x) in + change (N.to_nat x) with v; + natpostring + | _ => change protected_to_nat with N.to_nat end. Add Ring natr : natSRth - (morphism nat_morph_N, constants [natcst], preprocess [natprering]). + (morphism nat_morph_N, constants [natcst], + preprocess [natprering], postprocess [natpostring]). |