picnoir/hnix
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Record contextual provenance more fully in some places

Browse source
This commit is contained in:
John Wiegley 2018-04-23 10:18:28 -07:00
parent 596f2d160b
commit 2aa418d60a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Nix/Exec.hs
View file

@ -105,25 +105,25 @@ instance MonadNix e m => MonadEval (NValue m) m where
evalConstant c = do
scope <- currentScopes
span <- currentPos
pure $ nvConstantP (Provenance scope (NConstant_ span c) Nothing) c
pure $ nvConstantP (Provenance scope (NConstant_ span c) []) c
evalString s d = do
scope <- currentScopes
span <- currentPos
-- jww (2018-04-22): Determine full provenance for the string?
pure $ nvStrP (Provenance scope (NStr_ span (DoubleQuoted [Plain s]))
Nothing) s d
[]) s d
evalLiteralPath p = do
scope <- currentScopes
span <- currentPos
fmap (nvPathP (Provenance scope (NLiteralPath_ span p) Nothing))
fmap (nvPathP (Provenance scope (NLiteralPath_ span p) []))
(makeAbsolutePath p)
evalEnvPath p = do
scope <- currentScopes
span <- currentPos
fmap (nvPathP (Provenance scope (NEnvPath_ span p) Nothing))
fmap (nvPathP (Provenance scope (NEnvPath_ span p) []))
(findEnvPath p)
evalUnary op arg = do
@ -171,7 +171,7 @@ instance MonadNix e m => MonadEval (NValue m) m where
scope <- currentScopes
span <- currentPos
pure $ nvClosureP (Provenance scope (NAbs_ span (fmap absurd p) Nothing)
Nothing) p b
[]) p b
evalError = throwError
@ -211,7 +211,7 @@ execUnaryOp scope span op arg = do
++ " must evaluate to an atomic type: " ++ show x
where
unaryOp = pure . nvConstantP
(Provenance scope (NUnary_ span op (Just arg)) Nothing)
(Provenance scope (NUnary_ span op (Just arg)) [])
execBinaryOp
:: forall e m. (MonadNix e m, MonadEval (NValue m) m)
@ -228,7 +228,7 @@ execBinaryOp scope span NOr larg rarg = fromNix larg >>= \l ->
else rarg >>= \rval -> fromNix @Bool rval >>= orOp (Just rval)
where
orOp r b = pure $
nvConstantP (Provenance scope (NBinary_ span NOr (Just larg) r) Nothing)
nvConstantP (Provenance scope (NBinary_ span NOr (Just larg) r) [])
(NBool b)
execBinaryOp scope span NAnd larg rarg = fromNix larg >>= \l ->
@ -237,7 +237,7 @@ execBinaryOp scope span NAnd larg rarg = fromNix larg >>= \l ->
else andOp Nothing False
where
andOp r b = pure $
nvConstantP (Provenance scope (NBinary_ span NAnd (Just larg) r) Nothing)
nvConstantP (Provenance scope (NBinary_ span NAnd (Just larg) r) [])
(NBool b)
-- jww (2018-04-08): Refactor so that eval (NBinary ..) *always* dispatches
@ -246,7 +246,7 @@ execBinaryOp scope span op lval rarg = do
rval <- rarg
let bin :: (Provenance m -> a) -> a
bin f = f (Provenance scope (NBinary_ span op (Just lval) (Just rval))
Nothing)
[])
toBool = pure . bin nvConstantP . NBool
case (lval, rval) of
(NVConstant lc, NVConstant rc) -> case (op, lc, rc) of

6
src/Nix/Value.hs
View file

@ -81,7 +81,7 @@ type ValueSet m = AttrSet (NThunk m)
data Provenance m = Provenance
{ lexicalScope :: Scopes m (NThunk m)
, originExpr :: NExprLocF (Maybe (NValue m))
, contextExpr :: Maybe (NExprLocF (Maybe (NValue m)))
, contextExpr :: [NExprLocF (Maybe (NValue m))]
-- ^ When calling the function x: x + 2 with argument x = 3, the
-- 'originExpr' for the resulting value will be 3 + 2, while the
-- 'contextExpr' will be @(x: x + 2) 3@, preserving not only the
@ -99,12 +99,12 @@ changeProvenance :: Scopes m (NThunk m)
-> (NValue m -> NExprLocF (Maybe (NValue m)))
-> NValue m -> NValue m
changeProvenance s f l@(NValue _ v) =
NValue (Just (Provenance s (f l) Nothing)) v
NValue (Just (Provenance s (f l) [])) v
provenanceContext :: NExprLocF (Maybe (NValue m))
-> NValue m -> NValue m
provenanceContext c (NValue p v) =
NValue (fmap (\x -> x { contextExpr = Just c }) p) v
NValue (fmap (\x -> x { contextExpr = c : contextExpr x }) p) v
pattern NVConstant x <- NValue _ (NVConstantF x)