Skip to content

Commit e7f21a9

Browse files
whitespace
1 parent 0e2cfab commit e7f21a9

30 files changed

+163
-165
lines changed

Cubical/Data/Rationals/Fast/Order.agda

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -992,14 +992,14 @@ module EqElims where
992992
lrhsDom [ℚ₊] = ℚ₊
993993

994994

995-
lrhsDomFst : ℚTypes Type
995+
lrhsDomFst : ℚTypes Type
996996
lrhsDomFst [ℚ] =
997997
lrhsDomFst [ℚ₊] =
998-
998+
999999
lrhsCtr : b lrhsDomFst b (lrhsDom b)
10001000
lrhsCtr [ℚ] k m = [ k , 1+ m ]
10011001
lrhsCtr [ℚ₊] n m = [ ℤ.pos (suc n) , (1+ m) ] , _
1002-
1002+
10031003
LRhs : ℚSignature Type
10041004
LRhs [] = ℚ × ℚ
10051005
LRhs (x ∷ xs) = lrhsDom x LRhs xs
@@ -1011,20 +1011,20 @@ module EqElims where
10111011

10121012
EqType : s LRhs s Type
10131013
EqType [] (lhs , rhs) = lhs ≡ rhs
1014-
EqType (x ∷ xs) lrhs = (q : lrhsDom x) EqType xs (lrhs q)
1014+
EqType (x ∷ xs) lrhs = (q : lrhsDom x) EqType xs (lrhs q)
10151015

10161016
isPropEqType : s (lrhs : LRhs s) isProp (EqType s lrhs)
10171017
isPropEqType [] lrhs = isSetℚ _ _
10181018
isPropEqType (_ ∷ s) lrhs = isPropΠ $ isPropEqType s ∘ lrhs
1019-
1019+
10201020
EllimEqₛ : s (lrhs : LRhs s) LemType s lrhs EqType s lrhs
10211021
EllimEqₛ [] lrhs e = e
10221022
EllimEqₛ ([ℚ] ∷ xs) lrhs e = ElimProp.go w
10231023
where
10241024
w : ElimProp _
10251025
w .ElimProp.isPropB = isPropEqType xs ∘ lrhs
10261026
w .ElimProp.f (k , 1+ m) = EllimEqₛ xs (lrhs _) (e k m)
1027-
1027+
10281028
EllimEqₛ ([ℚ₊] ∷ xs) lrhs e = uncurry (ElimProp.go w)
10291029
where
10301030
w : ElimProp (λ z p EqType xs (lrhs (z , p)))

Cubical/Data/Rationals/Fast/Order/Properties.agda

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ invℚ₊-invol x = ℚ!
726726

727727

728728
x·invℚ₊[x] : x fst x · fst (invℚ₊ x) ≡ 1
729-
x·invℚ₊[x] x = ℚ!
729+
x·invℚ₊[x] x = ℚ!
730730

731731
invℚ₊[x]·x : x fst (invℚ₊ x) · fst x ≡ 1
732732
invℚ₊[x]·x x = ℚ!
@@ -1608,7 +1608,7 @@ lowerBoundℕ⁻¹ q =
16081608
: n [ 1 / 4 ] < ([ pos (suc n) / 1 ])
16091609
<Δ n = 1/n<sucK 3 (1+ n)
16101610

1611-
1611+
16121612
clam∈ℚintervalℙ : a b (a ≤ b) x clamp a b x ∈ ℚintervalℙ a b
16131613
clam∈ℚintervalℙ a b a≤b x = ≤clamp _ _ _ a≤b , (clamp≤ a _ x)
16141614

Cubical/Data/Rationals/Fast/Properties.agda

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ x+x≡2x x = cong₂ _+_
695695
-- eqElim₂Ty : (lrhs : ℚ → ℚ → ℚ × ℚ) → Type
696696
-- eqElim₂Ty lrhs = (∀ {k m k' m'} → fst (lrhs [ (k , 1+ m) ] [ (k' , 1+ m') ])
697697
-- ≡ snd (lrhs [ (k , 1+ m) ] [ (k' , 1+ m') ]))
698-
698+
699699
-- eqElim₃Ty : (lrhs : ℚ → ℚ → ℚ → ℚ × ℚ) → Type
700700
-- eqElim₃Ty lrhs = (∀ {k m k' m' k'' m''} → fst (lrhs [ (k , 1+ m) ] [ (k' , 1+ m') ] [ (k'' , 1+ m'') ])
701701
-- ≡ snd (lrhs [ (k , 1+ m) ] [ (k' , 1+ m') ] [ (k'' , 1+ m'') ]))
@@ -754,7 +754,7 @@ x+x≡2x x = cong₂ _+_
754754
-- w .SetQuotient.ElimProp4.isPropB _ _ _ _ = isSetℚ _ _
755755
-- w .SetQuotient.ElimProp4.f (n , (1+ n₁)) (m , (1+ m₁)) (m' , (1+ m₁')) (m'' , (1+ m₁'')) =
756756
-- p {n} {n₁} {m} {m₁} {m'} {m₁'} {m''} {m₁''}
757-
757+
758758

759759
-- eqElim₅ : (lrhs : ℚ → ℚ → ℚ → ℚ → ℚ → ℚ × ℚ) → eqElim₅Ty lrhs
760760
-- → ∀ (x y z z' z'' : ℚ) → fst (lrhs x y z z' z'') ≡ (snd (lrhs x y z z' z''))
@@ -777,4 +777,4 @@ x+x≡2x x = cong₂ _+_
777777
-- w .SetQuotient.ElimProp6.f (n , (1+ n₁)) (m , (1+ m₁)) (m' , (1+ m₁')) (m'' , (1+ m₁''))
778778
-- (m''' , (1+ m₁''')) (m'''' , (1+ m₁'''')) =
779779
-- p {n} {n₁} {m} {m₁} {m'} {m₁'} {m''} {m₁''} {m'''} {m₁'''} {m''''} {m₁''''}
780-
780+

Cubical/HITs/CauchyReals/Continuous.agda

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ opaque
393393
unfolding maxᵣ
394394

395395
≤lim : r x y ( δ rat r ≤ᵣ x δ) rat r ≤ᵣ lim x y
396-
≤lim r x y p = ≡→≤ᵣ $
396+
≤lim r x y p = ≡→≤ᵣ $
397397
snd (NonExpanding₂.β-rat-lim' maxR r x y) ∙
398398
congLim _ _ _ _ (≤ᵣ→≡ ∘ p)
399399

@@ -521,7 +521,7 @@ opaque
521521
(ℚ.<Weaken≤ _ _ (ℚ.x/2<x (ε))) )
522522
in zz))
523523
, ≤ℚ→≤ᵣ _ _ (ℚ.≤+ℚ₊ r r (/2₊ ε) (ℚ.isRefl≤ r)) ∣₁
524-
w .Elimℝ-Prop.limA x y R ε =
524+
w .Elimℝ-Prop.limA x y R ε =
525525
let z = 𝕣-lim-dist x y (/4₊ ε)
526526
in PT.map (λ (q , z , z')
527527
let (_ , Xzz' , Xzz) = from-abs< _ _ _
@@ -534,7 +534,7 @@ opaque
534534
in q ℚ.+ fst (/2₊ ε) ℚ.+ fst (/2₊ (/4₊ ε)) ,
535535
let zzz = (≤ᵣ-+o _ _ (rat (fst (/2₊ ε) ℚ.+ fst (/2₊ (/4₊ ε))))
536536
(≤ᵣMonotone+ᵣ _ _ _ _ z zz))
537-
537+
538538
in subst2 _≤ᵣ_
539539
(cong (_+ᵣ rat (fst (/2₊ ε) ℚ.+ fst (/2₊ (/4₊ ε))))
540540
(sym (+ᵣAssoc (rat q) _ _)) ∙
@@ -543,7 +543,7 @@ opaque
543543
(+ᵣComm _ _ ∙ +ᵣ-rat _ _ ∙ cong rat ℚ!!)
544544
(cong₂ _+ᵣ_ refl (+ᵣComm _ _) ∙ +ᵣAssoc _ _ _ ∙
545545
cong₂ _+ᵣ_ (+ᵣComm _ _ ∙ +-ᵣ _) refl ∙ +IdL _))
546-
546+
547547
(_∙_ {x = rat (fst (/2₊ (/4₊ ε))) +ᵣ rat (fst (/4₊ ε)) +ᵣ
548548
rat (fst (/2₊ ε) ℚ.+ fst (/2₊ (/4₊ ε)))}
549549
{y = rat
@@ -560,7 +560,7 @@ opaque
560560
cong (_+ᵣ (lim x y)) (+-ᵣ _) ∙ +IdL _)
561561
(≤ᵣMonotone+ᵣ _ _ _ _ z' zz'))
562562
(isTrans≡≤ᵣ _ _ _ (+ᵣ-rat _ _) $ ≤ℚ→≤ᵣ _ _
563-
563+
564564
(subst (q ℚ.+ fst (/4₊ ε) ℚ.≤_)
565565
((ℚ.+Assoc q _ _))
566566
(ℚ.≤-o+ _ _ q distℚ≤!
@@ -693,7 +693,7 @@ opaque
693693
Δ = ℚ.<→ℚ₊ m n m<n
694694

695695
opaque
696-
unfolding _<ᵣ_
696+
unfolding _<ᵣ_
697697
<ᵣ-+o : m n o m <ᵣ n (m +ᵣ o) <ᵣ (n +ᵣ o)
698698
<ᵣ-+o m n o = PT.rec (isProp<ᵣ (m +ᵣ o) _)
699699
λ ((q , q') , x , x' , x'')
@@ -874,14 +874,14 @@ opaque
874874

875875
opaque
876876
unfolding _≤ᵣ_
877-
877+
878878
≤min-lem : x y y' x ≤ᵣ y x ≤ᵣ y' x ≤ᵣ minᵣ y y'
879879
≤min-lem x y y' p p' =
880880
minDistMaxᵣ x y y' ∙ cong₂ minᵣ p p'
881881

882882

883883
opaque
884-
unfolding _<ᵣ_
884+
unfolding _<ᵣ_
885885

886886

887887
<min-lem : x x' y y <ᵣ x y <ᵣ x' y <ᵣ minᵣ x x'
@@ -1140,7 +1140,7 @@ opaque
11401140
-- ≤ᵣ f₁ (rat u) (≤ℚ→≤ᵣ _ _ x₀<u) )
11411141
-- → ∀ x x₀≤x → f₀ x x₀≤x ≤ᵣ f₁ x x₀≤x
11421142
-- ≤ContPos'pred {x₀} {f₀} {f₁} f₀C f₁C X x 0≤x =
1143-
-- subst (λ (x , x₀≤x) → f₀ x ? ≤ᵣ f₁ x ?) -- ? x₀≤x
1143+
-- subst (λ (x , x₀≤x) → f₀ x ? ≤ᵣ f₁ x ?) -- ? x₀≤x
11441144
-- (Σ≡Prop (λ _ → isSetℝ _ _) ?) -- ?
11451145
-- (≤Cont
11461146
-- (IsContinuousWithPred∘IsContinuous _ _ _
@@ -1502,4 +1502,3 @@ sym-intervalℙ⊆ointervalℙ : ∀ a b → a <ᵣ b →
15021502
sym-intervalℙ⊆ointervalℙ a b a<b =
15031503
intervalℙ⊆ointervalℙ _ _ _ _ (-ᵣ<ᵣ _ _ a<b) a<b
15041504

1505-

Cubical/HITs/CauchyReals/LiftingExpr.agda

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ record _isLiftOf_ (fℝ : ℝ → ℝ) (fℚ : ℚ → ℚ) : Type where
3434
constructor inj
3535
field
3636
prf : q rat (fℚ q) ≡ fℝ (rat q)
37-
38-
record LiftedTo (fℝ : ℝ) : Type where
37+
38+
record LiftedTo (fℝ : ℝ) : Type where
3939
constructor inj
4040
field
4141
fℚ : _
4242
prf : fℝ isLiftOf fℚ
43-
43+
4444
open _isLiftOf_ prf
45-
46-
record LiftedFrom (fℚ : ℚ) : Type where
45+
46+
record LiftedFrom (fℚ : ℚ) : Type where
4747
constructor inj
4848
field
4949
fℝ : _
5050
prf : fℝ isLiftOf fℚ
51-
51+
5252
open _isLiftOf_ prf
5353

5454
record _isLiftOf₂_ (fℝ : ℝ) (fℚ : ℚ) : Type where
@@ -58,15 +58,15 @@ record _isLiftOf₂_ (fℝ : ℝ → ℝ → ℝ) (fℚ : ℚ → ℚ → ℚ) :
5858

5959

6060

61-
record LiftedTo₂ (fℝ : ℝ) : Type where
61+
record LiftedTo₂ (fℝ : ℝ) : Type where
6262
constructor inj
6363
field
6464
fℚ : _
6565
prf : fℝ isLiftOf₂ fℚ
6666

6767
open _isLiftOf₂_ prf
68-
69-
record LiftedFrom₂ (fℚ : ℚ) : Type where
68+
69+
record LiftedFrom₂ (fℚ : ℚ) : Type where
7070
constructor inj
7171
field
7272
fℝ : _
@@ -94,7 +94,7 @@ instance
9494

9595

9696
data ℚExpr : Type where
97-
𝕢[_] : ℚExpr
97+
𝕢[_] : ℚExpr
9898
_$𝕢[_] : ∀ fℚ → ⦃ lf : LiftedFrom fℚ ⦄ ℚExpr ℚExpr
9999
_$𝕢₂[_,_] : ∀ fℚ → ⦃ lf : LiftedFrom₂ fℚ ⦄ ℚExpr ℚExpr ℚExpr
100100

@@ -103,9 +103,9 @@ evalℚExpr (𝕢[ x ]) = x
103103
evalℚExpr (fℚ $𝕢[ x ]) = fℚ (evalℚExpr x)
104104
evalℚExpr (fℚ $𝕢₂[ x , x₁ ]) = fℚ (evalℚExpr x) (evalℚExpr x₁)
105105

106-
module ℝExpr (ratFlag : Type) where
106+
module ℝExpr (ratFlag : Type) where
107107
data ℝExpr : Type where
108-
ratE : {ratFlag} ℚExpr ℝExpr
108+
ratE : {ratFlag} ℚExpr ℝExpr
109109
𝕣[_] : ℝExpr
110110
_$𝕣[_] : ∀ fℝ → ⦃ lt : LiftedTo fℝ ⦄ ℝExpr ℝExpr
111111
_$𝕣₂[_,_] : ∀ fℝ → ⦃ lt : LiftedTo₂ fℝ ⦄ ℝExpr ℝExpr ℝExpr
@@ -127,7 +127,7 @@ open ℝExpr hiding (ℝExpr) public
127127
ℚExpr→ℝExpr : ℚExpr ℝExpr
128128
ℚExpr→ℝExpr 𝕢[ x ] = 𝕣[ rat x ]
129129
ℚExpr→ℝExpr (_$𝕢[_] fℚ ⦃ inj fℝ prf ⦄ x) = _$𝕣[_] fℝ ⦃ inj _ prf ⦄ (ℚExpr→ℝExpr x)
130-
ℚExpr→ℝExpr (_$𝕢₂[_,_] fℚ ⦃ inj fℝ prf ⦄ x x₁) =
130+
ℚExpr→ℝExpr (_$𝕢₂[_,_] fℚ ⦃ inj fℝ prf ⦄ x x₁) =
131131
_$𝕣₂[_,_] fℝ ⦃ inj _ prf ⦄ (ℚExpr→ℝExpr x) (ℚExpr→ℝExpr x₁)
132132

133133
ℚℝExpr→ℝExpr : ℚℝExpr ℝExpr
@@ -154,7 +154,7 @@ evalℚℝExpr 𝕣[ x ] = x
154154
evalℚℝExpr (fℝ $𝕣[ x ]) = fℝ (evalℚℝExpr x)
155155
evalℚℝExpr (fℝ $𝕣₂[ x , x₁ ]) = fℝ (evalℚℝExpr x) (evalℚℝExpr x₁)
156156
evalℚℝExpr (rat-path q i) = rat q
157-
evalℚℝExpr (lift-path ⦃ lo = lo ⦄ {q} i) = _isLiftOf_.prf lo (evalℚExpr q) i
157+
evalℚℝExpr (lift-path ⦃ lo = lo ⦄ {q} i) = _isLiftOf_.prf lo (evalℚExpr q) i
158158
evalℚℝExpr (lift-path₂ ⦃ lo = lo ⦄ {q} {q'} i) =
159159
_isLiftOf₂_.prf lo (evalℚExpr q) (evalℚExpr q') i
160160
evalℚℝExpr (isSetℝExpr x x₁ x₂ y i i₁) =
@@ -163,11 +163,11 @@ evalℚℝExpr (isSetℝExpr x x₁ x₂ y i i₁) =
163163

164164
evalCohRat : e rat (evalℚExpr e) ≡ evalℚℝExpr (ℚExpr→ℝExpr e)
165165
evalCohRat 𝕢[ x ] = refl
166-
evalCohRat (_$𝕢[_] fℚ ⦃ inj fℝ (inj prf) ⦄ e) =
167-
prf (evalℚExpr e)
166+
evalCohRat (_$𝕢[_] fℚ ⦃ inj fℝ (inj prf) ⦄ e) =
167+
prf (evalℚExpr e)
168168
∙ cong fℝ (evalCohRat e)
169169
evalCohRat (_$𝕢₂[_,_] fℚ ⦃ inj fℝ (inj prf) ⦄ e e₁) =
170-
prf (evalℚExpr e) (evalℚExpr e₁)
170+
prf (evalℚExpr e) (evalℚExpr e₁)
171171
∙ cong₂ fℝ (evalCohRat e) (evalCohRat e₁)
172172

173173
evalCoh : e evalℚℝExpr e ≡ evalℚℝExpr (ℚℝExpr→ℝExpr e)
@@ -182,7 +182,7 @@ evalCoh (lift-path {fℝ} {fℚ} ⦃ lo = inj prf ⦄ {q} i) j =
182182
(λ j fℝ (evalCohRat q j))
183183
(prf (evalℚExpr q))
184184
refl
185-
i j
185+
i j
186186

187187
evalCoh (lift-path₂ {fℝ} {fℚ} ⦃ lo = inj prf ⦄ {q} {q'} i) j =
188188
isSet→isSet' isSetℝ
@@ -191,7 +191,7 @@ evalCoh (lift-path₂ {fℝ} {fℚ} ⦃ lo = inj prf ⦄ {q} {q'} i) j =
191191
(λ j fℝ (evalCohRat q j) (evalCohRat q' j))
192192
(prf (evalℚExpr q) (evalℚExpr q'))
193193
refl
194-
i j
194+
i j
195195

196196
evalCoh (isSetℝExpr e e₁ x y i i₁) j =
197197
isGroupoid→isGroupoid' (isSet→isGroupoid isSetℝ)
@@ -216,13 +216,13 @@ private
216216
ifHasInstanceℚ₂ nm = runSpeculative $ (_, false) <$> (do
217217
(meta m _) checkType
218218
unknown (def (quote _isLiftOf₂_) (unknown v∷ v[ (def nm []) ]))
219-
where _ typeError [ "imposible in liftingExpr macro!" ]ₑ
219+
where _ typeError [ "imposible in liftingExpr macro!" ]ₑ
220220
[] getInstances m
221221
where (x ∷ _) pure true
222222
-- ((solveInstanceConstraints >> pure true) <|> pure false)
223-
223+
224224
pure false)
225-
225+
226226
toExprℚ : Term TC Term
227227
toExprℚ (def nm v[ q ]) = do
228228
e toExprℚ q
@@ -235,7 +235,7 @@ private
235235
then (pure (con (quote _$𝕢₂[_,_]) ((def nm []) v∷ e v∷ v[ e' ])))
236236
else (pure (con (quote 𝕢[_]) (v[ tm ])))
237237
toExprℚ tm = pure (con (quote 𝕢[_]) (v[ tm ]))
238-
238+
239239
-- _$𝕣[_] fℝ ⦃ inj fℚ (inj prf) ⦄ (ℚExpr→ℝExpr q)
240240
toExprℝ : Term TC Term
241241
toExprℝ (def nm v[ r ]) = do
@@ -250,7 +250,7 @@ private
250250
e toExprℚ q
251251
pure (con (quote ratE) (v[ e ]))
252252
toExprℝ tm = pure (con (quote 𝕣[_]) (v[ tm ]))
253-
253+
254254
quoteℚℝ : Term TC Term
255255
quoteℚℝ tm' = do
256256
tm checkType tm' (def (quote ℝ) [])
@@ -266,7 +266,7 @@ private
266266
ℚℝ!-macro hole = wrdℚ $
267267
do
268268
goal inferType hole >>= normalise
269-
269+
270270

271271
wait-for-type goal
272272
just (lhs , rhs) get-boundary goal
@@ -280,14 +280,14 @@ private
280280
let solution =
281281
def (quote _∙_)
282282
(def (quote evalCoh) v[ lhsE ] v∷ v[
283-
def (quote evalCoh') v[ rhsE ] ])
283+
def (quote evalCoh') v[ rhsE ] ])
284284
unify hole solution
285285

286286
ℚℝ!↘-macro : Term TC Unit
287287
ℚℝ!↘-macro hole = wrdℚ $
288288
do
289289
goal inferType hole >>= normalise
290-
290+
291291

292292
wait-for-type goal
293293
just lhs get-boundaryLHS goal
@@ -296,7 +296,7 @@ private
296296
typeError(strErr "The ℚℝ↘ failed to parse the goal "
297297
∷ termErr goal ∷ [])
298298
lhsE quoteℚℝ lhs
299-
let solution = def (quote evalCoh) v[ lhsE ]
299+
let solution = def (quote evalCoh) v[ lhsE ]
300300
unify hole solution
301301

302302

0 commit comments

Comments
 (0)