Anton-Latukha
ffc82fc97e
clean-up: LANGUAGE pragmas
...
M Setup.hs
M main/Repl.hs
M src/Nix/Builtins.hs
M src/Nix/Cache.hs
M src/Nix/Cited.hs
M src/Nix/Cited/Basic.hs
M src/Nix/Convert.hs
M src/Nix/Exec.hs
M src/Nix/Expr/Types.hs
M src/Nix/Expr/Types/Annotated.hs
M src/Nix/Lint.hs
M src/Nix/Normal.hs
M src/Nix/Pretty.hs
M src/Nix/Render/Frame.hs
M src/Nix/Scope.hs
M src/Nix/TH.hs
M src/Nix/Thunk.hs
M src/Nix/Thunk/Basic.hs
M src/Nix/Utils.hs
M src/Nix/Value.hs
M src/Nix/Value/Equal.hs
2020-09-14 20:54:37 +03:00
Anton-Latukha
83c483d160
src/Nix/Value.hs: clean-up imports, clen-up GHC warning
...
M src/Nix/Value.hs
2020-06-02 01:38:39 +03:00
Silvan Mosberger
f682907c97
Make URI's be separate from strings
2020-05-15 17:49:11 -07:00
Anton-Latukha
c03a40acea
upd texts of more messages
...
Heterogeneous: consisting of dissimilar elements.
Heterogenous:
1. not originating within the body;
(ex: "You are NOT of the body!" by Dr. Leonard "Bones" McCoy)
2. of foreign origin;
3. heterogeneous.
2019-08-04 15:00:57 -07:00
John Wiegley
4607639774
Remove the NValueNF type, as it provides little utility
2019-03-27 21:16:01 -07:00
John Wiegley
92ca9ff831
Restore rendering of Expectation frames
2019-03-18 21:34:04 -07:00
John Wiegley
77d67b106c
8 test failures remaining
2019-03-18 18:20:07 -07:00
John Wiegley
2c0c896871
Everything compiling again, but 25 tests failing
2019-03-18 17:30:31 -07:00
John Wiegley
522585a7f1
Begin work on harmonizing the two different value representations
2019-03-18 11:41:46 -07:00
John Wiegley
18c49f6a0d
Reorganize code in Nix.Value, creating new Nix.Value.Equal
2019-03-17 22:44:22 -07:00
John Wiegley
3881101ebd
Some very minor changes for consistency
2019-03-17 16:54:59 -07:00
John Wiegley
94e0be3882
Reformat all sources with Brittany, to restore consistency
2019-03-17 14:47:38 -07:00
John Wiegley
5c10be3e3b
More cleanup, get rid of the Eq and Ord instances for NValue'
...
They had dubious semantics anyway; there is now only valueEqM and valueNFEq.
2019-03-16 23:35:16 -07:00
John Wiegley
1a6978fe6b
Change NValueNF so that the Pure case preserves the looped thunk
2019-03-16 23:13:13 -07:00
John Wiegley
492a3ae0bc
Factor out thunk id representation into its own class, MonadThunkId
2019-03-16 16:23:40 -07:00
John Wiegley
9405074cd8
Fix hnix-tests
2019-03-16 14:41:25 -07:00
John Wiegley
3c2393e5af
Add sequenceNValueNF
2019-03-16 13:16:45 -07:00
John Wiegley
537f1fc8c7
Finish out the instance definitions in Standard.hs
2019-03-16 12:48:07 -07:00
John Wiegley
6ae5764221
All type checks, but many instance definitions are still missing
2019-03-16 01:10:47 -07:00
John Wiegley
5d9c858f5d
More work toward getting Exec.hs to compile
2019-03-14 23:18:16 -07:00
John Wiegley
ba33d8c117
Further revision in Value.hs
2019-03-14 10:40:30 -07:00
John Wiegley
6daaf18018
More work on Value.hs
2019-03-13 23:24:11 -07:00
John Wiegley
9583b7aa70
Introduce IsNThunk t m, with many thanks to Ryan Trinkle
2019-03-13 11:02:53 -07:00
John Wiegley
67bc3f2a69
Hopefully finished up with Value.hs and Normal.hs
2019-03-13 10:53:58 -07:00
John Wiegley
505591515f
More work on Value.hs
2019-03-12 23:44:42 -07:00
John Wiegley
28a1410013
Split off NCited into its own file
2019-03-12 07:21:24 -07:00
John Wiegley
3cb9834792
Begin abstracting the thunk/value data representation
2019-03-11 22:41:56 -07:00
John Wiegley
107f29d3fd
Move certain constraints from MonadThunk to the BasicThunk instance
2019-03-11 13:55:40 -07:00
John Wiegley
2e2ee3589c
Mix-in provenance information as a functoral layer, rather than directly
...
This changes nothing about how the code is structured just yet, but paves the
way for fully generalizing this up to the point where the thunk/value
representation is chosen. By making information like this functoral, we allow
full re-use of the NThunk/NValue machinery.
2019-03-11 08:44:22 -07:00
John Wiegley
39fd51c1a8
Split Nix.Thunk into Nix.Var, Nix.Thunk and Nix.Thunk.Basic
...
This is in preparation for further generalization of the thunk/value scheme
used by the execution code.
2019-03-11 08:42:46 -07:00
John Wiegley
f397b80a9c
Factor out citation information to its own data structure
2019-03-10 16:07:13 -07:00
Ken Micklas
ec62bce3a0
Fix pointer equality case in thunkEq
2019-03-09 21:57:38 -05:00
Ken Micklas
2366aff91d
Use valueEq when not pointer equal
2019-03-09 20:49:25 -05:00
Ken Micklas
8ddbe165e6
Only short-circuit pointer equality for correct types
2019-03-09 20:40:12 -05:00
Ken Micklas
05fccda825
Revert "Use thunk ID to short-circuit thunkEq"
...
This reverts commit c287ab8b59
.
2019-03-09 20:35:39 -05:00
Ken Micklas
c287ab8b59
Use thunk ID to short-circuit thunkEq
2019-03-09 20:26:19 -05:00
John Ericson
3b5649c0a2
WIP fix equality
2019-03-09 20:26:19 -05:00
Doug Beardsley
38147f81a9
Fix toJSON context handling and add test case
2018-12-05 14:59:42 -05:00
Doug Beardsley
ab3fc101dd
Merge branch 'master' into remove-fromnix-text-instances
2018-11-29 10:36:03 -05:00
Domen Kožar
2cc20c045f
Distinguish string with or without context when revealing type
2018-11-20 12:20:16 +00:00
Doug Beardsley
752ff745a8
Remove unnecessary cases
2018-11-19 07:13:19 -05:00
Doug Beardsley
5dd3e2d7ce
Remove Text FromValue, ToValue, FromNix, and ToNix
...
This commit makes the handling of string context much more explicit and correct
throughout entire codebase.
2018-11-19 07:04:08 -05:00
Ken Micklas
ff1166aba6
replace *StringIgnoreContextMaybe with more accurate *GetStringNoContext
2018-11-17 18:40:22 -05:00
Ken Micklas
c9071db5bc
Use custom force for isDerivation instead of relying on valueEq
2018-11-17 18:40:22 -05:00
Ken Micklas
a7bdda4912
Ignore context when comparing strings
2018-11-17 18:40:22 -05:00
Ken Micklas
8dc1762f8e
Use curry and LambdaCase for valueEq
2018-11-17 18:40:22 -05:00
gb
4baa4f7108
change Nix.NixString module to Nix.String
2018-09-23 16:03:44 -04:00
gb
be056b3dd7
builds with -Werror -Wno-deprecations
2018-09-16 16:30:24 -04:00
gb
ae6725871b
removed executable permissions
2018-09-15 20:32:38 -04:00
gb
6f1ed3c2e9
documented methods;added more methods with deprecation
2018-09-15 20:04:54 -04:00