Commit Graph

343 Commits

Author SHA1 Message Date
Trevor Elliott
28fdd44100 Fix #140
The Smtlib solver was translating Fin constraints to True, as it didn't know
how to handle them.  They should have been skipped, and returned back as
unsolved goals instead.
2014-12-11 15:12:14 -08:00
Iavor S. Diatchki
6f65845e16 Some fixes to proving implications. 2014-12-11 10:30:25 -08:00
Iavor S. Diatchki
08cec44702 Merge remote-tracking branch 'origin/master' into wip/cs 2014-12-10 14:10:49 -08:00
Trevor Elliott
296ee335a0 Try to minimize the differences with master 2014-12-10 11:45:21 -08:00
Trevor Elliott
ad664014dd All bindings without signatures are monomorphic with mono-binds
Tracking the closed environment was tricky, and it wasn't clear how easy it
would be to find free type variables in bindings that lack signatures, as we
don't kind check the AST before making the decision about making it monomorphic.
2014-12-10 11:41:32 -08:00
Trevor Elliott
441d3e84f9 Add three more tests for mono-binds 2014-12-09 18:09:06 -08:00
Trevor Elliott
00b99b7581 Revert "Update two tests for mono-binds changes"
This reverts commit 23cd430f3b.
2014-12-09 16:54:45 -08:00
Trevor Elliott
8e954b1ab1 Stop accidentally clobbering the top-level closed env 2014-12-09 16:53:53 -08:00
Trevor Elliott
23cd430f3b Update two tests for mono-binds changes 2014-12-09 16:17:52 -08:00
Trevor Elliott
1742ce0912 Forgot to add this module in the last commit 2014-12-09 16:17:36 -08:00
Trevor Elliott
808e16db2d Fix a bug with the closed env, and add a test
It was possible to exploit shadowing to get a name into the closed environment
that wasn't actually closed.  The change here is that `partitionClosed` now
returns a completely new closed environment with any shadowed names removed, and
that environment is used when checking the declarations it describes, instead.
2014-12-09 16:17:02 -08:00
Trevor Elliott
ae2f0b6770 Update issue 225 to reflect the use of mono-binds 2014-12-09 13:57:27 -08:00
Trevor Elliott
86336b9c02 Add a test that shows programs that fail with mono-binds 2014-12-09 13:54:22 -08:00
Trevor Elliott
21ab16db4b Add some tests for the mono-binds feature 2014-12-09 12:08:17 -08:00
Trevor Elliott
7dc76662e9 Better partitioning of the monomorphizing code 2014-12-09 12:07:52 -08:00
Trevor Elliott
48d1be1315 Merge branch 'master' into wip/mono-binds 2014-12-09 11:21:01 -08:00
Trevor Elliott
b1eae187e5 Make the cryptol binary depend on the sources
Instead of making the cryptol binary .PHONY, use find to locate all the
sources to depend on.
2014-12-09 11:20:31 -08:00
Trevor Elliott
29448e5789 Merge remote-tracking branch 'origin/master' into wip/mono-binds 2014-12-09 10:40:26 -08:00
Trevor Elliott
7b3fc614bf Remove debugging output 2014-12-08 18:20:32 -08:00
Trevor Elliott
4a0149ed52 Thread a flag through to manage let-generalization
Setting `mono-binds` to `yes` will cause bindings to be made monomorphic when
they don't refer to closed values, and setting `mono-binds` to no will cause
them to always be generalized.
2014-12-08 18:18:14 -08:00
Adam C. Foltzer
abf19641be small tweak to readme wording 2014-12-08 17:30:32 -08:00
Adam C. Foltzer
61e9b4e1fe add pointer to low-hanging fruit issue label 2014-12-08 17:29:26 -08:00
Trevor Elliott
0c22144f55 Test 225 no longer fails, this fixes #5 2014-12-08 16:57:02 -08:00
Trevor Elliott
a8dc88ffaf Merge remote-tracking branch 'origin/master' into wip/mono-binds 2014-12-08 16:46:02 -08:00
Trevor Elliott
f9319b4e9f Updated test output for monomorphic bindings 2014-12-08 16:45:51 -08:00
Trevor Elliott
ed81311a86 Only return changes to the closed environment 2014-12-08 16:35:06 -08:00
Trevor Elliott
55854f2eb0 Make sure to initialize iClosed with the imported environment 2014-12-08 15:58:23 -08:00
Trevor Elliott
b2b27b672f Make sure to pass out the new closed set from inferBinds 2014-12-08 15:57:13 -08:00
Trevor Elliott
907c5f393f Make bindings monomorphic based on use of closed values
Adopt the definition of closed values defined by this post on the ghc blog:

https://ghc.haskell.org/trac/ghc/blog/LetGeneralisationInGhc7
2014-12-08 15:18:40 -08:00
Adam C. Foltzer
7030924083 tweak escaped variable message to be more clear 2014-12-08 14:07:28 -08:00
Brian Huffman
25ee274d38 Merge changes from SBV version 3.3
Includes changes after LeventErkok/sbv@67656c6aba (Nov 3)
and up to LeventErkok/sbv@6468f41bde (Dec 5)
2014-12-08 11:04:28 -08:00
Adam C. Foltzer
9abc779340 update random values after changing random generation 2014-12-05 17:38:00 -08:00
Trevor Elliott
fa104983bd Merge branch 'master' into wip/mono-binds
Conflicts:
	Makefile
	tests/Main.hs
2014-12-05 17:25:56 -08:00
Adam C. Foltzer
969c96e8e1 Don't do fancy progress bars for :check in batch mode 2014-12-05 17:18:29 -08:00
Trevor Elliott
465b0eb103 Add a stdout file for the failing test, issues/T146 2014-12-05 16:52:45 -08:00
Trevor Elliott
b3341c02c9 Allow make test to output the diff results 2014-12-05 16:49:58 -08:00
Trevor Elliott
c2821da104 Make the diff command line absolute 2014-12-05 16:27:08 -08:00
Trevor Elliott
63fe690ef9 Add block decls to the local environment after partitioning 2014-12-05 16:23:51 -08:00
Trevor Elliott
2ea484288e Rename iParams to iLocalEnv 2014-12-05 16:23:26 -08:00
Trevor Elliott
481430ee7d Better partitioning of monomorphic declarations
Partition out declarations that should be monomorphic, based on what they
reference in the environment; declarations that lack signatures but don't
reference anything in the local environment can still be generalized.
2014-12-05 14:27:31 -08:00
Iavor S. Diatchki
9d385d5af2 Make general substitutions, and move code into AST module. 2014-12-05 11:46:09 -08:00
Iavor S. Diatchki
71f3b8dd13 Split off translation between TypeCheck.AST and TypeCheck.Numeric.AST 2014-12-05 11:32:11 -08:00
Iavor S. Diatchki
7d5854e661 Add extra rule. 2014-12-05 11:31:04 -08:00
Iavor S. Diatchki
ecdfb07ecc Checkpoint. 2014-12-04 17:26:46 -08:00
Iavor S. Diatchki
8d3a7e7b4f Hook-in incomplete new solver. 2014-12-04 14:40:09 -08:00
Iavor S. Diatchki
207e3854fc Fix typpo 2014-12-04 14:39:52 -08:00
Trevor Elliott
b13eb959aa Make the diff command line absolute 2014-12-04 14:36:26 -08:00
Trevor Elliott
80343e7256 Don't generalize bindings in where clauses
A first pass on skipping generalization for bindings in a where clause that
lack type signatures.  The tests that fail as a result of this change are either
because of error locations changing, or a changing number of defaulting
warnings.
2014-12-04 14:21:57 -08:00
Trevor Elliott
ee3647b814 Update renamer errors to clarify some funny situations
This tries to address #125 by making the errors from the renamer a little bit
more clear.

Squashed commit of the following:

commit 8afd3d7961b58df042fe801c3c5e1b9787f813bc
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 19:33:59 2014 -0800

    Update tests for new renamer errors

commit 7cac01836d8943cf3b08d6715ac328e3b6658cef
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 19:33:49 2014 -0800

    Add `at` on errors and warnings to be more consistent

commit 308908ba318a4cdc839710f66f1a487543f8c07e
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 19:06:57 2014 -0800

    More consistent renamer warnings

commit be8100a78e9eaba6d554591121c24ed5dcd3c780
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 18:56:53 2014 -0800

    More consistent error formatting from the renamer

commit 26c45c3b51e0bdbcf6a1431cab8e1eb8760ea0bb
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 18:56:36 2014 -0800

    Remove an un-triggerable error

commit ccdb93e036ba1e111ccd977c8b3b35523f3c1bf0
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 16:38:44 2014 -0800

    Try to give better errors for unbound identifiers

commit eb5784145985bb55c761088eaba27c67d08c1326
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 16:38:23 2014 -0800

    Remove old TODOs about located errors

commit b984bb5f451f3aa7b4fc8f15167483c5142ee9a3
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 14:37:34 2014 -0800

    Differentiate missing type and expression symbols

commit b9e6f13856db6765dced3cb9565cdc8387a7976d
Author: Trevor Elliott <trevor@galois.com>
Date:   Wed Dec 3 14:36:52 2014 -0800

    Remove a shadowing warning
2014-12-03 19:36:06 -08:00
Iavor S. Diatchki
dace04905f Towards integrating into the typechecker. We still need to do improvement. 2014-12-03 17:39:49 -08:00