Commit Graph

389 Commits

Author SHA1 Message Date
Gabriel Gonzalez
90315e9eda Fix dhall freeze to always re-freeze an import (#1471)
Fixes https://github.com/dhall-lang/dhall-haskell/issues/1470

`dhall freeze` no longer attempts to use the cache to fetch an import since
the cache might not match the underlying import any longer.  Instead,
`dhall freeze` now always attempts to fetch the underlying import to
compute the new hash.
2019-10-24 15:19:09 +00:00
Simon Jakobi
8f2c28a5dc
Move normalization code from Dhall.Core to a new module Dhall.Normalize (#1452)
Also try to decouple a few modules from Dhall.Core.

Closes #1127.
2019-10-24 00:01:02 +02:00
Simon Jakobi
6c2db48d42 Fix operator precedence in the parser (#1466)
Previously some operator expressions were associated incorrectly, e.g.

* a || b + c  -> (a || b) + c
* a // b == c -> (a // b) == c

Fixes #1457.
2019-10-23 19:50:17 +00:00
Michael Gilliland
16e6a12c3d Resolve #1451: fix format --check given STDIN input. (#1462)
* Resolve #1451: fix `format --check` given STDIN input.

I'm not really sure if this is the "best" approach so let me know if you
know a way to simplify this.

The issue was that `getExpressionAndHeader` was doing a second
`IO.getContents` (thus reading STDIN twice).

* Rename `Input` constructor.
2019-10-23 14:51:06 +00:00
Simon Jakobi
0f3a89eae6
Tweak the Header generator a bit (#1463)
* Reduce the discard rate by generating shorter Headers
   with more characters from the valid-ASCII range
* Shrink headers too
2019-10-23 05:06:24 +02:00
Basile Henry
3c99d5c988 Fix precedence of the import alt operator (#1460)
* Add test for format precedence #1455

* Fix precedence of the import alt operator
2019-10-23 01:19:50 +00:00
Simon Jakobi
62fd7a1b0d
Clarify the types involved in the formatting idempotence test (#1456)
Previously it wasn't obvious what the type parameters for the
'Expr' are.
2019-10-22 23:48:08 +02:00
Simon Jakobi
a3d9d2c9d2 Make the number of test cases for the idempotence test configurable on the CLI (#1453) 2019-10-22 20:38:55 +00:00
Basile Henry
69b228454e Test that dhall format is idempotent (#1427) 2019-10-22 19:45:08 +02:00
Philip Potter
1fed252488 fix index in MismatchedListElements (#1448)
If you run `dhall --explain` to explain a type error from a list with
mismatched elements, the index of the offending term was wrong.  For a
minimal example, you can run:

    dhall --explain <<<'[0, True]'

The problem is that `i` is an index into the tail of the list, not into
the whole list.  The fix is just to add one to it to correct for the
missing head.
2019-10-20 22:34:00 +00:00
Gabriel Gonzalez
7b414d9846
Version 1.26.1 → 1.27.0 (#1428) 2019-10-20 07:00:43 -07:00
Gabriel Gonzalez
47383de623 Update Dhall.Tutorial module (#1439)
* Update `Dhall.Tutorial` module

This overhauls the `Dhall.Tutorial` module to reflect recent changes to
the language (and also to link to external documentation when possible).

* Fix doctests

* Rephrase import syntax caveat

... as suggested by @sjakobi

* Explain `<<<`

... as suggested by @sjakobi@

* Rephrase things

... as suggested by @sjakobi

* `s/The annotated/This/`

... as caught by @sjakobi

* Add commas to description of link to built-ins reference

... as caught by @sjakobi

Co-Authored-By: Simon Jakobi <simon.jakobi@gmail.com>

* Remove paragraph describing role of Prelude

* Update dhall/src/Dhall/Tutorial.hs

... as suggested by @sjakobi

Co-Authored-By: Simon Jakobi <simon.jakobi@gmail.com>
2019-10-20 00:38:07 +00:00
Simon Jakobi
a944d12591 Add --file option for dhall hash (#1445)
To use the existing utilities in Dhall.Main more easily, I have moved
the implementation to Dhall.Main.
2019-10-19 22:38:44 +00:00
Simon Jakobi
bec6ce610f Move syntax things from Dhall.Core to a new module Dhall.Syntax (#1440)
This partially addresses #1127.
2019-10-19 20:13:22 +00:00
Steven Leiva
c284c19c11 Add --no-cache to dhall type. (#1441) 2019-10-19 13:47:27 +00:00
Simon Jakobi
301477de59 Rename Interpret to FromDhall, Inject to ToDhall (#1437)
* Rename Interpret to FromDhall

The "Interpret" name remains in `InterpretOptions`, which are
actually used for marshalling in both directions.

* s/injectThenInterpretIsIdentity/embedThenExtractIsIdentity

* s/Inject/ToDhall

* s/shouldInjectInto*/shouldEmbedAs*

* Keep Interpret and Inject as constraint synonyms for compatibility

… as suggested by @Gabriel439.
2019-10-19 03:24:49 +00:00
Steven Leiva
270adddf37 Add --no-cache flag to dhall resolve. (#1436) 2019-10-19 02:40:27 +00:00
Simon Jakobi
b75962a405 Use a more conventional spelling for "etags", mostly just use "tags" (#1432)
The previous "ETags" spelling was likely to cause confusion with HTTP ETags:
https://en.wikipedia.org/wiki/HTTP_ETag
2019-10-19 01:59:29 +00:00
Simon Jakobi
743d2ab5d6 dhall:tasty: s/skip/expectedFailures (#1438) 2019-10-18 23:22:44 +00:00
Steven Leiva
9d739b553a Do not warn about cache on --no-cache. (#1434) 2019-10-18 20:33:53 +00:00
Gabriel Gonzalez
58fcc6fe90 Fix formatting in error message (#1429) 2019-10-17 08:51:56 +00:00
Gabriel Gonzalez
03ca91baca
Fix CI to properly reject incomplete haddocks (#1418)
My first attempt to do this in #1416 did not correctly reject incomplete
haddocks, which this change fixes
2019-10-16 19:49:44 -07:00
tenniscp25
a343b19a63 Marshalling HashMap (#1394) (#1426) 2019-10-16 15:53:33 +00:00
Simon Jakobi
40535f3f17
Format tests: Add newlines at the ends of the expected output files (#1424)
Fixes #1423.
2019-10-16 10:03:34 +02:00
Frederik Ramcke
3f6a5ad8df Restore idempotency when formatting comments (#1415)
* Move prefix out of renderSrc

This reduces the complexity of renderSrc slightly without affecting
anything else much.

* Make formatting of comments idempotent

Fixes #1413. Previously the formatter would insert an additional line
break before some comments whilst preserving existing line breaks. In
order to restore idempotent behaviour, we need to strip a leading
newline character from the comment string in those cases, if present.

* Test idempotency when formatting comments

Test case taken from @AJChapman's bug report (#1413).

* Change argument order of renderSrc

Reads a bit more idiomatic, as suggested by @sjakobi.
2019-10-15 15:01:10 +00:00
Jie
1cd856a449 [#1392] Injecting Data.Map (#1412)
* [#1392] Injecting Data.Map

* injecting via Generic

* Explicit instance

* Cleanup code

* Minor code cleanup

* Property testing for Inject/Interpret

* Refactor test

* Adding TypeApplications to .cabal

* No more TypeApplications

* Simplified tests using extract

* Added test for Text amnf fixed Natural import

* Update dhall/dhall.cabal

Co-Authored-By: Simon Jakobi <simon.jakobi@gmail.com>

* Update dhall/dhall.cabal

Co-Authored-By: Simon Jakobi <simon.jakobi@gmail.com>
2019-10-15 11:27:29 +00:00
Gabriel Gonzalez
17fb0e3c46
100% haddock coverage (#1416)
This updates the `dhall` package to have 100% haddock coverage and
also updates CI to enforce this going forward.

This also includes a change to deprecate the `X` type synonym, which
I noticed along the way
2019-10-13 22:22:39 -07:00
Gabriel Gonzalez
4b8b8cd730
Add new record completion operator (#1375)
... as standardized in https://github.com/dhall-lang/dhall-lang/pull/767
2019-10-11 08:26:51 -07:00
Jie
34f706ed93 [#1395] Marshalling Set and HashSet (#1405)
* [#1395] Marshalling Set and HashSet

* Update dhall/src/Dhall.hs

Co-Authored-By: Simon Jakobi <simon.jakobi@gmail.com>

* Update dhall/src/Dhall.hs

Co-Authored-By: Simon Jakobi <simon.jakobi@gmail.com>

* Added distinctList

* setFromDistinctList updates

* Doctests abour ordering

* both set and hashset can ignore or fail with duplicates

* Comments on instances

* Moved length computation deeper

* Little wibble

Co-Authored-By: Simon Jakobi <simon.jakobi@gmail.com>
2019-10-10 16:31:44 +00:00
Dima
5b8ae442c8 Add tags subcommand (#1398)
Fixes #370.
2019-10-10 16:16:20 +02:00
Gabriel Gonzalez
a24ddfc3b9 Add support for leading separators (#1355)
* Add support for leading separators

... as standardized in https://github.com/dhall-lang/dhall-lang/pull/755

Note that this does not yet change the formatter to use them

* Update `dhall-lang` submodule

* Fix `dhall.cabal` to mention new Prelude files

* Remove duplicate lines
2019-10-10 05:01:34 +00:00
Michael Gilliland
1dba96c2c8 Resolves #1408: Add more detail in --explain when toMap has the w… (#1411)
* Resolves #1408: Add more detail in `--explain` when `toMap` has the wrong type.

Specifically, add common reason of using `{}` for record value.

For example,
``` shell
echo 'toMap {}' | ~/.local/bin/dhall
```

Outputs

> Error: ❰toMap❱ expects a record value
>
> Explanation: You can apply ❰toMap❱ to any homogenous record, like this:
>
>
>     ┌─────────────────────────────────────────────────────────────────────┐
>     │ let record = { one = 1, two = 2 }
> │
>     │ in  toMap record : List { mapKey : Text, mapValue : Natural}
> │
>     └─────────────────────────────────────────────────────────────────────┘
>
>
> ... but the argument to ❰toMap❱ must be a record and not some other
> type.
>
> Some common reasons why you might get this error:
>
> ● You accidentally provide an empty record type instead of an empty
> record when
>   using ❰toMap❱:
>
>
>     ┌──────────┐
>     │ toMap {} │
>     └──────────┘
>             ⇧
>             This should be ❰{=}❱ instead
>
> ────────────────────────────────────────────────────────────────────────────────
>
> 1│ toMap {}
>
> (stdin):1:1

* Add type annotation to `toMap` suggestion.
2019-10-09 23:54:42 +00:00
Jie
3e5cb34922 [#1381] Word* types to Natural, not Integer (#1387)
* #1381 Word* to Natural

* Added instance for Word

* Got rid of linting issues

* Added docsets

* Added comments

* Revert Crypto to master version

* Spread the doctests

* Improve Docstring
2019-10-07 17:54:42 +00:00
Andika Demas Riyandi
bf40ec52a1 add --output options to dhall (#1399) 2019-10-07 09:51:30 +00:00
Simon Jakobi
5e7794c652
Update dhall-lang submodule (#1403)
This includes some simplifications/optimizations for the `ToTerm DhallDouble` instance.

Most notably we let `cborg` take care of the correct encoding of NaNs:
See `Codec.CBOR.Write.doubleMP`:
  977c0c0820/cborg/src/Codec/CBOR/Write.hs (L571-L573)
2019-10-07 10:39:59 +02:00
Andika Demas Riyandi
9de7ac51a8 dhall: make lazyText use strictText (#1401) 2019-10-06 14:00:22 +00:00
Jie
cc3e50eaf1 [#1378] instance Interpret () (#1388)
* [#1378] instance Interpret ()

* Remove instance from tests
2019-10-06 03:46:25 +00:00
Curtis
c8ddedcc8c [#1389] Change Interpret [a] to use list (#1397) 2019-10-06 02:02:08 +00:00
Simon Jakobi
d172e4b677 Add 'instance Interpret (Map k v)' (#1391)
… and helper 'Type's 'map' and 'pairFromMapEntry'
2019-10-05 16:37:58 +00:00
Simon Jakobi
613a44d512 Add Interpret and Inject instances for Void (#1382) 2019-10-04 06:06:38 +00:00
Simon Jakobi
94ff61b152 Fix formatting of multi-argument function applications (#1380)
merge-expressions with additional arguments are also formatted with
consistent indentation for all arguments. E.g.

    merge
      { x = Natural/even }
      < x >.x
      1111111111111111111111111111111111111111111111111111111111

Fixes a small regression introduced in 7634ee7.
2019-10-04 04:47:51 +00:00
Simon Jakobi
7538552a7f Always break annotated let-bindings (#1372)
Fixes #1370.
2019-10-04 03:42:15 +00:00
Simon Jakobi
7634ee740b Fix indentation for multiline Some-, toMap- and merge-expressions (#1377)
The loss of indentation for toMap and merge was due to
75e6cc5ca7. I have included Some for
consistency.

Fixes #1376.

Also improve format test failure messages
2019-10-03 22:59:42 +00:00
Simon Jakobi
6bc182a08a Move parser-pretty-printer note to D.Pretty.Internal (#1374)
I've toned it down a bit since the correspondence doesn't seem
to be as close anymore as it once was.

Fixes #1364.
2019-10-03 02:49:27 +00:00
Simon Jakobi
e04f5af952 Adjust test setup to acceptance test suite changes (#1367)
… from https://github.com/dhall-lang/dhall-lang/pull/758
and https://github.com/dhall-lang/dhall-lang/pull/763.
2019-10-03 00:37:07 +00:00
Simon Jakobi
5a2ee1ca57 Improve type-inference of annotated list literals (#1366)
* Remove a redundant check of the type annotation.

* Replace dead code for processing the list elements
  with an error.

* Document the ListLit invariant.

Closes https://github.com/dhall-lang/dhall-haskell/issues/1359.
2019-10-02 05:17:03 +00:00
Simon Jakobi
a44fb420a5 Delete Dhall.Parser.Expression.renderChunks (#1363)
This is dead code.
2019-10-02 03:47:45 +00:00
Simon Jakobi
a4b4cfb1b3 infer: Remove redundant checks for field selections and record projections (#1368)
… as pointed out by @MonoidMusician in #741.
2019-10-02 01:41:18 +00:00
Gabriel Gonzalez
75e6cc5ca7 Fix pretty-printing precedence of toMap (#1360)
* Fix pretty-printing precedence of `toMap`

Fixes https://github.com/dhall-lang/dhall-haskell/issues/1358

* Also correctly format `merge` expressions without a type annotation

... as suggested by @sjakobi

* Add test for formatting "function-like" expressions

This verifies that the code correctly handles `toMap` expressions with
type annotations as @sjakobi was asking about
2019-10-01 04:01:22 +00:00
Gabriel Gonzalez
e707db04ec Remove unnecessary type-checking step (#1362)
Fixes https://github.com/dhall-lang/dhall-haskell/issues/1361
2019-10-01 02:56:57 +00:00