Skip to content

Commit cd1d0ce

Browse files
authored
[ fix ] re-export uncons and cleanup Data.String.Base (#1359)
1 parent ccaecd9 commit cd1d0ce

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

README/Foreign/Haskell.agda

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ eqNat = coerce primIntEq
8181

8282
open import IO
8383
open import Codata.Musical.Notation
84-
open import Data.String.Base
84+
open import Data.String.Base using (toList; fromList; unlines; _++_)
8585
open import Relation.Nullary.Negation
8686

8787
-- example program using uncons, catMaybes, and testChar

src/Data/String/Base.agda

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ module Data.String.Base where
1111
open import Level using (zero)
1212
open import Data.Bool.Base using (true; false)
1313
open import Data.Bool.Properties using (T?)
14-
open import Data.Nat.Base as ℕ using (ℕ; _∸_; ⌊_/2⌋; ⌈_/2⌉)
15-
import Data.Nat.Properties as ℕₚ
14+
open import Data.Nat.Base as ℕ using (ℕ; _∸_; ⌊_/2⌋; ⌈_/2⌉; _⊔_)
1615
open import Data.List.Base as List using (List; [_])
1716
open import Data.List.NonEmpty as NE using (List⁺)
18-
open import Data.List.Extrema ℕₚ.≤-totalOrder
1917
open import Data.List.Relation.Binary.Pointwise using (Pointwise)
2018
open import Data.List.Relation.Binary.Lex.Strict using (Lex-<)
2119
open import Data.Vec.Base as Vec using (Vec)
@@ -38,7 +36,8 @@ import Agda.Builtin.String as String
3836

3937
open String public using ( String )
4038
renaming
41-
( primStringToList to toList
39+
( primStringUncons to uncons
40+
; primStringToList to toList
4241
; primStringFromList to fromList
4342
; primShowString to show
4443
)
@@ -174,7 +173,7 @@ rectangle : ∀ {n} → Vec (ℕ → String → String) n →
174173
rectangle pads cells = Vec.zipWith (λ p c p width c) pads cells where
175174

176175
sizes = List.map length (Vec.toList cells)
177-
width = max 0 sizes
176+
width = List.foldr _⊔_ 0 sizes
178177

179178
-- Special cases for left, center, and right alignment
180179

0 commit comments

Comments
 (0)