Skip to content

tidying up Data.String #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 20, 2023
Merged

tidying up Data.String #2061

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
255ffd2
tightened `import` from `Bool`
jamesmckinna Aug 16, 2023
e20291b
removed redundant `with`
jamesmckinna Aug 16, 2023
98f60f6
tightened `import`s
jamesmckinna Aug 16, 2023
b0e25e4
tightened `import`s
jamesmckinna Aug 16, 2023
8a076d4
removed parens around `parens`
jamesmckinna Aug 17, 2023
904301d
tighter import still; fewer parens still
jamesmckinna Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions src/Data/String.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,17 @@

module Data.String where

open import Data.Bool using (true; false; T?)
open import Data.Bool.Base using (if_then_else_)
open import Data.Char as Char using (Char)
open import Function.Base
open import Data.Nat.Base as ℕ using (ℕ; _∸_; ⌊_/2⌋; ⌈_/2⌉)
open import Function.Base using (_∘_; _$_)
open import Data.Nat.Base as ℕ using (ℕ)
import Data.Nat.Properties as ℕₚ
open import Data.List.Base as List using (List; _∷_; []; [_])
open import Data.List.NonEmpty as NE using (List⁺)
open import Data.List.Base as List using (List)
open import Data.List.Extrema ℕₚ.≤-totalOrder
open import Data.List.Relation.Binary.Pointwise.Base using (Pointwise)
open import Data.List.Relation.Binary.Lex.Strict using (Lex-<; Lex-≤)
open import Data.Vec.Base as Vec using (Vec)
open import Data.Char.Base as Char using (Char)
import Data.Char.Properties as Char using (_≟_)
open import Relation.Binary.Core using (Rel)
open import Relation.Binary.PropositionalEquality.Core using (_≡_; refl)
open import Relation.Nullary.Decidable using (does)
open import Relation.Unary using (Pred; Decidable)

open import Data.List.Membership.DecPropositional Char._≟_

Expand All @@ -48,9 +42,9 @@ fromVec = fromList ∘ Vec.toList

-- enclose string with parens if it contains a space character
parensIfSpace : String → String
parensIfSpace s with does (' ' ∈? toList s)
... | true = parens s
... | false = s
parensIfSpace s = if (does (' ' ∈? toList s))
then (parens s)
else s


------------------------------------------------------------------------
Expand Down