Skip to content

Switching (hacky->principled) functions for the string context #802

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 11 commits into from
Jan 7, 2021
Merged

Switching (hacky->principled) functions for the string context #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
208106d
Nix/String: form "Deprecated API" to gather hacky* functions
Anton-Latukha Jan 7, 2021
3ba7e80
(hacky->principled)MakeNixStringWithoutContext
Anton-Latukha Jan 7, 2021
67fe11c
(hacky->principled)StringIgnoreContext
Anton-Latukha Jan 7, 2021
147ba1e
(hacky->principled)GetStringNoContext
Anton-Latukha Jan 7, 2021
41be26c
Nix/String: principle the remaining hacky implementations
Anton-Latukha Jan 7, 2021
529095d
reduce (principled->) from NixString functions, use NixString monoid
Anton-Latukha Jan 7, 2021
ba09cdd
(stringMConcat->mconcat)
Anton-Latukha Jan 7, 2021
f81cd78
Nix/String: organization
Anton-Latukha Jan 7, 2021
d086f7e
Nix/String: rm hacky functions
Anton-Latukha Jan 7, 2021
7097531
Nix/String: clean-up
Anton-Latukha Jan 7, 2021
80b283d
benchmarks/ParserBench: clean-up
Anton-Latukha Jan 7, 2021
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: 11 additions & 11 deletions benchmarks/ParserBench.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ module ParserBench (benchmarks) where

import Nix.Parser

import Control.Applicative
import Criterion

benchFile :: FilePath -> Benchmark
benchFile = bench <*> whnfIO . parseNixFile . ("data/" ++)
benchFile = bench <*> whnfIO . parseNixFile . ("data/" <>)

benchmarks :: Benchmark
benchmarks = bgroup
"Parser"
[ benchFile "nixpkgs-all-packages.nix"
, benchFile "nixpkgs-all-packages-pretty.nix"
, benchFile "let-comments.nix"
, benchFile "let-comments-multiline.nix"
, benchFile "let.nix"
, benchFile "simple.nix"
, benchFile "simple-pretty.nix"
]
"Parser" $
fmap benchFile
[ "nixpkgs-all-packages.nix"
, "nixpkgs-all-packages-pretty.nix"
, "let-comments.nix"
, "let-comments-multiline.nix"
, "let.nix"
, "simple.nix"
, "simple-pretty.nix"
]
4 changes: 2 additions & 2 deletions main/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@ main = do
= liftIO
. putStrLn
. Text.unpack
. principledStringIgnoreContext
. stringIgnoreContext
. toXML
<=< normalForm
| json opts
= liftIO
. Text.putStrLn
. principledStringIgnoreContext
. stringIgnoreContext
<=< nvalueToJSONNixString
| strict opts
= liftIO . print . prettyNValue <=< normalForm
Expand Down
Loading