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

__curPos requires that we evaluation with location info

Browse source 
Fixes #125
This commit is contained in:
John Wiegley 2018-04-05 00:12:27 -07:00
parent 897f552264
commit a1fdb35be0
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Nix/Builtins.hs
View file

@ -170,20 +170,20 @@ apply f arg = evalApp (force f) (force arg)
curPos :: forall e m. Framed e m => m (NValue m)
curPos = do
Compose (Ann (SrcSpan (line -> (file, line, col)) _) _):_ <-
Compose (Ann (SrcSpan (line -> (f, l, c)) _) _):_ <-
asks (mapMaybe (either (const Nothing) Just)
. view @_ @Frames hasLens)
return $ NVSet $ M.fromList
[ ("file", valueThunk $ NVStr (decodeUtf8 file) mempty)
, ("line", valueThunk $ NVConstant (NInt (fromIntegral line)))
, ("column", valueThunk $ NVConstant (NInt (fromIntegral col)))
[ ("file", valueThunk $ NVStr f mempty)
, ("line", valueThunk $ NVConstant (NInt (fromIntegral l)))
, ("column", valueThunk $ NVConstant (NInt (fromIntegral c)))
]
where
line = \case
Columns c _ -> ("<string>", 1, c)
Columns c _ -> ("<string>", 1, c + 1)
Tab {} -> ("<string>", 1, 1)
Lines l _ _ _ -> ("<string>", l, 1)
Directed fn l c _ _ -> (fn, l, c)
Lines l _ _ _ -> ("<string>", l + 1, 1)
Directed fn l c _ _ -> (decodeUtf8 fn, l + 1, c + 1)
toString :: MonadBuiltins e m => NThunk m -> m (NValue m)
toString str = do

4
tests/NixLanguageTests.hs
View file

@ -119,10 +119,10 @@ assertEvalFail file = catch eval (\(ErrorCall _) -> return ())
nixEvalFile :: FilePath -> IO (NValueNF (Lazy IO))
nixEvalFile file = do
parseResult <- parseNixFile file
parseResult <- parseNixFileLoc file
case parseResult of
Failure err ->
error $ "Parsing failed for file `" ++ file ++ "`.\n" ++ show err
Success expression -> do
setEnv "TEST_VAR" "foo"
eval (Just file) expression
evalLoc (Just file) expression