@@ -282,12 +282,11 @@ merge a b =
282282linesMap :: (a -> (Lines, b)) -> [a] -> (Bool, [b])
283283linesMap func xs =
284284 let
285− pairs =
286− map func xs
285+ pairs = map func xs
287286 in
288− ( any ((==) Many . fst) pairs
289− , map snd pairs
290− )
287+ ( any ((==) Many . fst) pairs
288+ , map snd pairs
289+ )
291290
292291
293292data Grouping = Atomic | Whatever
@@ -327,35 +326,29 @@ fromExpr indent grouping expression =
327326 Array exprs ->
328327 (,) Many $
329328 let
330− (anyMany, builders) =
331− linesMap (fromExpr indent Whatever) exprs
329+ (anyMany, builders) = linesMap (fromExpr indent Whatever) exprs
332330 in
333− if anyMany then
334− "[\n"
335− <> deeper indent
336− <> commaNewlineSep indent builders
337− <> "\n" <> indent <> "]"
338−
339− else
340− "[" <> commaSep builders <> "]"
331+ if anyMany then
332+ "[\n"
333+ <> deeper indent
334+ <> commaNewlineSep indent builders
335+ <> "\n" <> indent <> "]"
336+ else
337+ "[" <> commaSep builders <> "]"
341338
342339 Object fields ->
343340 (,) Many $
344341 let
345− deeperIndent =
346− deeper indent
347−
348− (anyMany, builders) =
349− linesMap (fromField deeperIndent) fields
342+ deeperIndent = deeper indent
343+ (anyMany, builders) = linesMap (fromField deeperIndent) fields
350344 in
351− if anyMany then
352− "{\n"
353− <> deeperIndent
354− <> commaNewlineSep indent builders
355− <> "\n" <> indent <> "}"
356−
357− else
358− "{" <> commaSep builders <> "}"
345+ if anyMany then
346+ "{\n"
347+ <> deeperIndent
348+ <> commaNewlineSep indent builders
349+ <> "\n" <> indent <> "}"
350+ else
351+ "{" <> commaSep builders <> "}"
359352
360353 Ref name ->
361354 (One, Name.toBuilder name)
@@ -368,24 +361,20 @@ fromExpr indent grouping expression =
368361
369362 Prefix op expr ->
370363 let
371− (lines, builder) =
372− fromExpr indent Atomic expr
364+ (lines, builder) = fromExpr indent Atomic expr
373365 in
374− ( lines
375− , parensFor grouping (fromPrefix op <> builder)
376− )
366+ ( lines
367+ , parensFor grouping (fromPrefix op <> builder)
368+ )
377369
378370 Infix op leftExpr rightExpr ->
379371 let
380− (leftLines, left) =
381− fromExpr indent Atomic leftExpr
382−
383− (rightLines, right) =
384− fromExpr indent Atomic rightExpr
372+ (leftLines , left ) = fromExpr indent Atomic leftExpr
373+ (rightLines, right) = fromExpr indent Atomic rightExpr
385374 in
386− ( merge leftLines rightLines
387− , parensFor grouping (left <> fromInfix op <> right)
388− )
375+ ( merge leftLines rightLines
376+ , parensFor grouping (left <> fromInfix op <> right)
377+ )
389378
390379 If condExpr thenExpr elseExpr ->
391380 let
@@ -393,39 +382,30 @@ fromExpr indent grouping expression =
393382 thenB = snd (fromExpr indent Atomic thenExpr)
394383 elseB = snd (fromExpr indent Atomic elseExpr)
395384 in
396− ( Many
397− , parensFor grouping (condB <> " ? " <> thenB <> " : " <> elseB)
398− )
385+ ( Many
386+ , parensFor grouping (condB <> " ? " <> thenB <> " : " <> elseB)
387+ )
399388
400389 Assign lValue expr ->
401390 let
402− (leftLines, left) =
403− fromLValue indent lValue
404−
405− (rightLines, right) =
406− fromExpr indent Whatever expr
391+ (leftLines , left ) = fromLValue indent lValue
392+ (rightLines, right) = fromExpr indent Whatever expr
407393 in
408− ( merge leftLines rightLines
409− , parensFor grouping (left <> " = " <> right)
410− )
394+ ( merge leftLines rightLines
395+ , parensFor grouping (left <> " = " <> right)
396+ )
411397
412398 Call function args ->
413399 (,) Many $
414400 let
415− deeperIndent =
416− deeper indent
417−
418− funcB =
419− snd (fromExpr indent Atomic function)
420−
421− (anyMany, argsB) =
422− linesMap (fromExpr deeperIndent Whatever) args
401+ deeperIndent = deeper indent
402+ funcB = snd (fromExpr indent Atomic function)
403+ (anyMany, argsB) = linesMap (fromExpr deeperIndent Whatever) args
423404 in
424− if anyMany then
425− funcB <> "(\n" <> deeperIndent <> commaNewlineSep indent argsB <> ")"
426−
427− else
428− funcB <> "(" <> commaSep argsB <> ")"
405+ if anyMany then
406+ funcB <> "(\n" <> deeperIndent <> commaNewlineSep indent argsB <> ")"
407+ else
408+ funcB <> "(" <> commaSep argsB <> ")"
429409
430410 Function maybeName args stmts ->
431411 (,) Many $
@@ -443,12 +423,11 @@ fromExpr indent grouping expression =
443423fromField :: Builder -> (Name, Expr) -> (Lines, Builder)
444424fromField indent (field, expr) =
445425 let
446− (lines, builder) =
447− fromExpr indent Whatever expr
426+ (lines, builder) = fromExpr indent Whatever expr
448427 in
449− ( lines
450− , Name.toBuilder field <> ": " <> builder
451− )
428+ ( lines
429+ , Name.toBuilder field <> ": " <> builder
430+ )
452431
453432
454433
@@ -471,24 +450,20 @@ fromLValue indent lValue =
471450makeDot :: Builder -> Expr -> Name -> (Lines, Builder)
472451makeDot indent expr field =
473452 let
474− (lines, builder) =
475− fromExpr indent Atomic expr
453+ (lines, builder) = fromExpr indent Atomic expr
476454 in
477− (lines, builder <> "." <> Name.toBuilder field)
455+ (lines, builder <> "." <> Name.toBuilder field)
478456
479457
480458makeBracketed :: Builder -> Expr -> Expr -> (Lines, Builder)
481459makeBracketed indent expr bracketedExpr =
482460 let
483− (lines, builder) =
484− fromExpr indent Atomic expr
485−
486− (bracketedLines, bracketedBuilder) =
487− fromExpr indent Whatever bracketedExpr
461+ (lines , builder ) = fromExpr indent Atomic expr
462+ (bracketedLines, bracketedBuilder) = fromExpr indent Whatever bracketedExpr
488463 in
489− ( merge lines bracketedLines
490− , builder <> "[" <> bracketedBuilder <> "]"
491− )
464+ ( merge lines bracketedLines
465+ , builder <> "[" <> bracketedBuilder <> "]"
466+ )
492467
493468
494469