hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-04 16:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pep508: Also return ungrouped expressions

Browse source
This commit is contained in:
adisbladis 2019-11-16 17:50:26 +00:00
parent ff8d58af7d
commit 17cfb71c37
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pep508.nix
View file

@ -14,9 +14,9 @@ let
posNew = acc.pos + 1;
isOpen = acc.openP == 0;
startPos = if isOpen then posNew else acc.startPos;
exprs = if isOpen then acc.exprs else acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ];
in acc // {
inherit exprs startPos;
inherit startPos;
exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ];
pos = posNew;
openP = acc.openP + 1;
}
@ -47,8 +47,8 @@ let
parseExpressions = exprs: let
splitCond = (s: builtins.map
(x: if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)
(builtins.split " (and|or) " s));
(x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
(builtins.split " (and|or) " (s + " ")));
mapfn = expr: (
if (builtins.match "^ ?$" expr != null) then null # Filter empty