@@ -27,7 +27,7 @@ Add Zify UnOp Op_nat_inj.
2727(***************************************************************************** *)
2828
2929Instance Op_addb : BinOp addb :=
30- { TBOp x y := Bool.eqb x (negb y); TBOpInj := ltac:(by case=> [][]) }.
30+ { TBOp x y := Bool.eqb x (~~ y); TBOpInj := ltac:(by case=> [][]) }.
3131Add Zify BinOp Op_addb.
3232
3333Instance Op_eqb : BinOp eqb :=
@@ -338,13 +338,11 @@ Instance Op_modn : BinOp modn :=
338338Add Zify BinOp Op_modn.
339339
340340Instance Op_dvdn : BinOp dvdn :=
341- { TBOp x y := Z.eqb (modZ y x) 0%Z;
342- TBOpInj := ltac:(rewrite /dvdn; lia) }.
341+ { TBOp x y := (modZ y x =? 0)%Z; TBOpInj := ltac:(rewrite /dvdn; lia) }.
343342Add Zify BinOp Op_dvdn.
344343
345344Instance Op_odd : UnOp odd :=
346- { TUOp x := Z.eqb (modZ x 2) 1%Z;
347- TUOpInj n := ltac:(case: odd (modn2 n); lia) }.
345+ { TUOp x := (modZ x 2 =? 1)%Z; TUOpInj n := ltac:(case: odd (modn2 n); lia) }.
348346Add Zify UnOp Op_odd.
349347
350348Instance Op_half : UnOp half :=
@@ -384,7 +382,7 @@ Instance Op_lcmn : BinOp lcmn := { TBOp := Z.lcm; TBOpInj := Op_lcmn_subproof }.
384382Add Zify BinOp Op_lcmn.
385383
386384Instance Op_coprime : BinOp coprime :=
387- { TBOp x y := Z.eqb (Z.gcd x y) 1 %Z;
385+ { TBOp x y := (Z.gcd x y =? 1) %Z;
388386 TBOpInj := ltac:(rewrite /= /coprime; lia) }.
389387Add Zify BinOp Op_coprime.
390388
@@ -399,22 +397,22 @@ Instance Op_natdvd_le' : BinOp (>=^d%O : rel natdvd^d) := Op_dvdn.
399397Add Zify BinOp Op_natdvd_le'.
400398
401399Instance Op_natdvd_ge : BinOp ((>=%O : rel natdvd) : nat -> nat -> bool) :=
402- { TBOp x y := Z.eqb (modZ x y) 0 %Z; TBOpInj := ltac:(simpl; lia) }.
400+ { TBOp x y := (modZ x y =? 0) %Z; TBOpInj := ltac:(simpl; lia) }.
403401Add Zify BinOp Op_natdvd_ge.
404402
405403Instance Op_natdvd_ge' : BinOp (<=^d%O : rel natdvd^d) := Op_natdvd_ge.
406404Add Zify BinOp Op_natdvd_ge'.
407405
408406Instance Op_natdvd_lt : BinOp ((<%O : rel natdvd) : nat -> nat -> bool) :=
409- { TBOp x y := negb (Z.eqb y x) && Z.eqb (modZ y x) 0 %Z;
407+ { TBOp x y := ~~ (y =? x)%Z && (modZ y x =? 0) %Z;
410408 TBOpInj _ _ := ltac:(rewrite /= sdvdEnat; lia) }.
411409Add Zify BinOp Op_natdvd_lt.
412410
413411Instance Op_natdvd_lt' : BinOp (>^d%O : rel natdvd^d) := Op_natdvd_lt.
414412Add Zify BinOp Op_natdvd_lt'.
415413
416414Instance Op_natdvd_gt : BinOp ((>%O : rel natdvd) : nat -> nat -> bool) :=
417- { TBOp x y := negb (Z.eqb x y) && Z.eqb (modZ x y) 0 %Z;
415+ { TBOp x y := ~~ (x =? y)%Z && (modZ x y =? 0) %Z;
418416 TBOpInj _ _ := ltac:(rewrite /= sdvdEnat; lia) }.
419417Add Zify BinOp Op_natdvd_gt.
420418
0 commit comments