Skip to content

Commit 6ab31b8

Browse files
committed
fix ifFlip breaking changes
1 parent d8b57bf commit 6ab31b8

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

lib/Haskell/Law/Ord/Int.agda

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,20 +108,28 @@ instance
108108

109109
iLawfulOrdInt .min2if a@(int64 x) b@(int64 y)
110110
with isNegativeInt a in h₁ | isNegativeInt b in h₂
111-
...| True | True rewrite lte2ngt x y
112-
| sym $ ifFlip (y < x) b a = eqReflexivity (if (y < x) then b else a)
111+
...| True | True
112+
rewrite lte2ngt x y
113+
| ifFlip (y < x) a b
114+
= eqReflexivity (if (y < x) then b else a)
113115
...| True | False = eqReflexivity x
114116
...| False | True rewrite eqSymmetry x y
115-
| sign2neq b a h₂ h₁ = eqReflexivity y
116-
...| False | False rewrite lte2ngt x y
117-
| sym $ ifFlip (y < x) b a = eqReflexivity (if (y < x) then b else a)
117+
| sign2neq b a h₂ h₁ = eqReflexivity y
118+
...| False | False
119+
rewrite lte2ngt x y
120+
| ifFlip (y < x) a b
121+
= eqReflexivity (if (y < x) then b else a)
118122

119123
iLawfulOrdInt .max2if a@(int64 x) b@(int64 y)
120124
with isNegativeInt a in h₁ | isNegativeInt b in h₂
121-
...| False | False rewrite gte2nlt x y | sym $ ifFlip (x < y) b a
125+
...| False | False
126+
rewrite gte2nlt x y
127+
| ifFlip (x < y) a b
122128
= eqReflexivity (if (x < y) then b else a)
123129
...| False | True = eqReflexivity x
124130
...| True | False rewrite sign2neq a b h₁ h₂
125131
= eqReflexivity y
126-
...| True | True rewrite gte2nlt x y | sym $ ifFlip (x < y) b a
132+
...| True | True
133+
rewrite gte2nlt x y
134+
| ifFlip (x < y) a b
127135
= eqReflexivity (if (x < y) then b else a)

lib/Haskell/Law/Ord/Integer.agda

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,22 @@ instance
8080

8181
iLawfulOrdInteger .min2if (pos n) (pos m)
8282
rewrite lte2ngt n m
83-
| sym $ ifFlip (m < n) (pos m) (pos n)
83+
| ifFlip (m < n) (pos n) (pos m)
8484
= eqReflexivity (min (pos n) (pos m))
8585
iLawfulOrdInteger .min2if (pos n) (negsuc m) = eqReflexivity m
8686
iLawfulOrdInteger .min2if (negsuc n) (pos m) = eqReflexivity n
8787
iLawfulOrdInteger .min2if (negsuc n) (negsuc m)
8888
rewrite gte2nlt n m
89-
| sym $ ifFlip (n < m) (negsuc m) (negsuc n)
89+
| ifFlip (n < m) (negsuc n) (negsuc m)
9090
= eqReflexivity (min (negsuc n) (negsuc m))
9191

9292
iLawfulOrdInteger .max2if (pos n) (pos m)
9393
rewrite gte2nlt n m
94-
| sym (ifFlip (n < m) (pos m) (pos n))
94+
| ifFlip (n < m) (pos n) (pos m)
9595
= eqReflexivity (max (pos n) (pos m))
9696
iLawfulOrdInteger .max2if (pos n) (negsuc m) = eqReflexivity n
9797
iLawfulOrdInteger .max2if (negsuc n) (pos m) = eqReflexivity m
9898
iLawfulOrdInteger .max2if (negsuc n) (negsuc m)
9999
rewrite lte2ngt n m
100-
| sym $ ifFlip (m < n) (negsuc m) (negsuc n)
100+
| ifFlip (m < n) (negsuc n) (negsuc m)
101101
= eqReflexivity (max (negsuc n) (negsuc m))

0 commit comments

Comments
 (0)