Skip to content

move parensIfSpace from Data.String to Data.String.Base #2024

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

Closed
Sofia-Insa wants to merge 1 commit into from
Closed

move parensIfSpace from Data.String to Data.String.Base #2024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 1 addition & 21 deletions src/Data/String.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,14 @@
module Data.String where

open import Data.Bool using (true; false; T?)
open import Data.Char as Char using (Char)
open import Function.Base
open import Data.Nat.Base as ℕ using (ℕ; _∸_; ⌊_/2⌋; ⌈_/2⌉)
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.Extrema ℕₚ.≤-totalOrder
open import Data.List.Relation.Binary.Pointwise 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 Function
open import Relation.Binary 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._≟_



------------------------------------------------------------------------
-- Re-export contents of base, and decidability of equality
Expand All @@ -46,14 +33,6 @@ toVec s = Vec.fromList (toList s)
fromVec : ∀ {n} → Vec Char n → String
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


------------------------------------------------------------------------
-- Rectangle

Expand All @@ -76,5 +55,6 @@ rectangleˡ c = rectangle (Vec.replicate $ padLeft c)
rectangleʳ : ∀ {n} → Char → Vec String n → Vec String n
rectangleʳ c = rectangle (Vec.replicate $ padRight c)


rectangleᶜ : ∀ {n} → Char → Char → Vec String n → Vec String n
rectangleᶜ cₗ cᵣ = rectangle (Vec.replicate $ padBoth cₗ cᵣ)
12 changes: 12 additions & 0 deletions src/Data/String/Base.agda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@

module Data.String.Base where


open import Data.Bool.Base using (Bool; true; false)
open import Data.Char.Base as Char using (Char)
import Data.Char.Properties as Char
open import Data.List.Base as List using (List; [_]; _∷_; [])
import Data.List.Membership.DecSetoid as Membership
open import Data.List.NonEmpty.Base as NE using (List⁺)
open import Data.List.Relation.Binary.Pointwise.Base using (Pointwise)
open import Data.List.Relation.Binary.Lex.Core using (Lex-<; Lex-≤)
Expand All @@ -21,9 +24,12 @@ open import Function.Base using (_on_; _∘′_; _∘_)
open import Level using (Level; 0ℓ)
open import Relation.Binary.Core using (Rel)
open import Relation.Binary.PropositionalEquality.Core using (_≡_; refl)
open import Relation.Binary.PropositionalEquality.Properties using (decSetoid)
open import Relation.Unary using (Pred; Decidable)
open import Relation.Nullary.Decidable.Core using (does)

open Membership (decSetoid Char._≟_) using (_∈?_)

------------------------------------------------------------------------
-- From Agda.Builtin: type and renamed primitives

Expand Down Expand Up @@ -115,6 +121,12 @@ _<+>_ : String → String → String
a <+> "" = a
a <+> b = a ++ " " ++ b

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

------------------------------------------------------------------------
-- Padding

Expand Down