Skip to content

Commit

Permalink
Removed most long lines
Browse files Browse the repository at this point in the history
  • Loading branch information
propensive committed Jan 24, 2025
1 parent e7ecbc9 commit ffa05d3
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 8 deletions.
3 changes: 2 additions & 1 deletion src/core/gesticulate-core.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ package gesticulate
import language.experimental.captureChecking

extension (inline ctx: StringContext)
transparent inline def media(inline parts: String*): MediaType = ${Media.Prefix.expand('ctx, 'parts)}
transparent inline def media(inline parts: String*): MediaType =
${Media.Prefix.expand('ctx, 'parts)}
10 changes: 6 additions & 4 deletions src/core/gesticulate.Media.scala
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ object Media:
then raise(MediaTypeError(string, MediaTypeError.Reason.MissingParam))
ps.map(_.cut(t"=", 2).to(List)).map { p => p(0).show -> p(1).show }

def parseSuffixes(suffixes: List[Text]): List[Suffix] = suffixes.map(_.lower.capitalize).flatMap: suffix =>
try List(Suffix.valueOf(suffix.s)) catch IllegalArgumentException =>
raise(MediaTypeError(string, MediaTypeError.Reason.InvalidSuffix(suffix)), Nil)
def parseSuffixes(suffixes: List[Text]): List[Suffix] =
suffixes.map(_.lower.capitalize).flatMap: suffix =>
try List(Suffix.valueOf(suffix.s)) catch IllegalArgumentException =>
raise(MediaTypeError(string, MediaTypeError.Reason.InvalidSuffix(suffix)), Nil)

def parseInit(str: Text): (Subtype, List[Suffix]) =
val xs: List[Text] = str.cut(t"+").to(List)
Expand All @@ -146,7 +147,8 @@ object Media:
raise(MediaTypeError(string, MediaTypeError.Reason.InvalidGroup), Group.Text)

def parseSubtype(str: Text): Subtype =
def notAllowed(char: Char): Boolean = char.isWhitespace || char.isControl || specials.contains(char)
def notAllowed(char: Char): Boolean =
char.isWhitespace || char.isControl || specials.contains(char)

str.chars.find(notAllowed(_)).map: char =>
raise
Expand Down
4 changes: 3 additions & 1 deletion src/core/gesticulate.Multipart.scala
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ object Multipart:

conduit.datum match
case '\r' =>
if !conduit.next() || conduit.datum != '\n' then raise(MultipartError(Reason.Expected('\n')))
if !conduit.next() || conduit.datum != '\n'
then raise(MultipartError(Reason.Expected('\n')))

part #:: { part.body.strict; conduit.next(); parts() }

case '-' =>
Expand Down
4 changes: 2 additions & 2 deletions src/core/soundness+gesticulate-core.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@

package soundness

export gesticulate.{Extensions, Media, MediaType, MediaTypeError, media, Multipart, MultipartError, Part,
Content}
export gesticulate .
{ Extensions, Media, MediaType, MediaTypeError, media, Multipart, MultipartError, Part, Content }

0 comments on commit ffa05d3

Please sign in to comment.