John Wiegley
230eb99ade
Rename fromNixMay -> fromValueMay
2018-04-15 20:22:24 -07:00
John Wiegley
fb6191c949
Rename the internal version of ToNix/FromNix to ToValue/FromValue
2018-04-15 19:05:44 -07:00
John Wiegley
ef82d5e9f2
Make ToNix monadic, to avoid making any assumptions about its use
2018-04-15 16:21:47 -07:00
John Wiegley
5ce5ac8791
Get rid of ConvertValue in favor of Nix.Context
...
There remains some simplification work to be done, still, as there is much
duplication in Builtins.hs as things stand now. At least for now only one type
class-based, automatic conversion mechanism exists.
2018-04-15 01:43:01 -07:00
John Wiegley
a6b004d04b
Make some uses of Nix.Convert with forcing more explicit
2018-04-15 00:51:50 -07:00
John Wiegley
7f9a7c5ce8
Remove posFromSourcePos, it is no longer needed
2018-04-14 23:55:37 -07:00
John Wiegley
58b65d2ce1
Don't evaluate to normal form by default in the top level evaluators
2018-04-13 19:29:18 -07:00
John Wiegley
6c9cbf241a
Rewrite ToNix/FromNix, although Builtins.hs is not using it yet
2018-04-13 18:09:12 -07:00
John Wiegley
7f6a64da04
More corrections to the search path logic
...
Fixes #112
2018-04-13 16:37:11 -07:00
John Wiegley
fb0466769d
Further minor simplification
2018-04-13 10:43:18 -07:00
John Wiegley
caa897af4a
Introduce new helper function Exec.foldNixPath
2018-04-13 10:38:57 -07:00
John Wiegley
3edc7edbd3
Allow path == str and path != str
2018-04-13 01:20:40 -07:00
John Wiegley
ef489753e7
Fix to find env path
2018-04-13 00:52:09 -07:00
John Wiegley
14bc5360f4
More work on supporting -I and completing env paths
2018-04-13 00:34:49 -07:00
John Wiegley
d3a01cc073
Resolve some warnings
2018-04-12 10:26:54 -07:00
John Wiegley
b0b372e151
Further work on env paths
2018-04-11 22:22:55 -07:00
John Wiegley
a1a4fac2e9
Change the way some error messages are displayed
2018-04-11 20:46:44 -07:00
John Wiegley
39e175be85
Rename some helper functions
2018-04-11 20:21:34 -07:00
John Wiegley
e9299dce7b
Implement builtins.fetchTarball at the moment by calling nix-instantiate
2018-04-11 13:56:18 -07:00
John Wiegley
ffa8d85dd2
Move handling of with statements into MonadEval
2018-04-11 11:53:30 -07:00
John Wiegley
3233c9cb31
Restore the pretty show instance for NValue m (orphaned in Pretty for now)
2018-04-10 21:11:46 -07:00
John Wiegley
74de14dc7d
Restore the linter, to some degree, at least for the language tests
2018-04-10 21:02:01 -07:00
John Wiegley
62ec530c9d
Move handling of 'if' into MonadEval
2018-04-10 18:26:29 -07:00
John Wiegley
9beb9364e0
The Megaparsec version of Parser.hs is at least compiling
2018-04-09 16:11:31 -07:00
John Wiegley
4c2eebbe40
Refactor evaluation using a type class
2018-04-09 00:52:10 -07:00
