Commit Graph

737 Commits

Author SHA1 Message Date
Trevor Elliott
6ecd1b52c2 Log checkLR messages instead of putStrLn 2015-03-31 17:58:04 -07:00
Trevor Elliott
5e0c694d71 Remove unused Solver type 2015-03-31 17:57:23 -07:00
Trevor Elliott
3571768daa Spelling fixes 2015-03-31 17:38:42 -07:00
Trevor Elliott
9c464e5684 Fix a warning 2015-03-31 17:38:12 -07:00
Trevor Elliott
42c6552b54 Upgrade the simple-smt dependency 2015-03-31 17:38:04 -07:00
Adam C. Foltzer
7ceae6630a fix haddocks 2015-03-30 17:08:07 -07:00
Trevor Elliott
3ca8746eb3 Allow expected failures to be ignored 2015-03-30 16:58:33 -07:00
Trevor Elliott
2bba4a6871 Set options before logic for yices 2015-03-30 16:34:04 -07:00
Iavor S. Diatchki
75c8d4d2d6 Merge branch 'wip/cs' of github.com:GaloisInc/cryptol into wip/cs
Conflicts:
	cryptol.cabal
2015-03-30 16:28:02 -07:00
Trevor Elliott
3203128b40 Merge remote-tracking branch 'origin/master' into wip/cs 2015-03-30 16:25:25 -07:00
Trevor Elliott
47851a9715 Warning removal 2015-03-30 16:24:41 -07:00
Trevor Elliott
e68caee830 Support z3 through the use of the :global-decls option 2015-03-30 16:21:09 -07:00
Trevor Elliott
471838b582 Only one option for tc-solver 2015-03-30 16:20:48 -07:00
Trevor Elliott
5071018a7a Connect the tc solver to a repl option 2015-03-30 15:46:42 -07:00
Trevor Elliott
4848ef11a2 Abstract the solver used 2015-03-30 14:47:48 -07:00
Iavor S. Diatchki
b037c6a6ea Merge remote-tracking branch 'origin/master' into wip/cs
Conflicts:
	cryptol.cabal
2015-03-30 14:00:35 -07:00
Adam C. Foltzer
5768dac5c0 prepare for 7.10
- Move the stackage file so it's not on by default (will test with it on
  Jenkins instead of all the time)
- Use CPP to remove unnecessary import warnings in 7.10
2015-03-30 13:07:37 -07:00
Iavor S. Diatchki
bc3e4a6f01 Extra pragma 2015-03-30 11:35:17 -07:00
Iavor S. Diatchki
afd53bb6a1 Merge remote-tracking branch 'origin/master' into wip/cs
Conflicts:
	cryptol.cabal
	src/Cryptol/TypeCheck/Solve.hs
	src/Cryptol/TypeCheck/Solver/CrySAT.hs
	src/Cryptol/TypeCheck/Solver/Selector.hs
2015-03-30 11:29:20 -07:00
Adam C. Foltzer
60ec857969 note about CVC4 from Homebrew 2015-03-30 10:23:00 -07:00
Adam C. Foltzer
ce4db94fdc update readme with Homebrew info 2015-03-30 10:16:10 -07:00
Brian Huffman
b6b7e18adb Adapt to use new Data.SBV.Dynamic API in SBV-4.3 2015-03-30 10:03:59 -07:00
Adam C. Foltzer
275b9a99f1 fix #197
Remove the autoconf hooks from Setup.hs and bump cabal version
requirement so that `license-files` is supported
2015-03-27 12:10:42 -07:00
Adam C. Foltzer
300ed3cba9 Merge branch 'release/2.2.1' into releases 2015-03-25 16:35:30 -07:00
Adam C. Foltzer
6cb0da9dfe clean up doc distribution 2015-03-25 13:25:32 -07:00
Adam C. Foltzer
7f57eea48e bump to 2.2.1 2015-03-25 11:30:39 -07:00
Adam C. Foltzer
7ec1106eeb fix problems uncovered by hackage and stackage 2015-03-25 11:13:46 -07:00
Adam C. Foltzer
7deef9c8b2 Merge branch 'release/2.2.0' into releases 2015-03-24 11:56:16 -07:00
Adam C. Foltzer
0536d0f15a update copyright years 2015-03-24 11:19:52 -07:00
Adam C. Foltzer
dd312bd218 clean up how license files are included in dist 2015-03-23 10:42:10 -07:00
Adam C. Foltzer
abf5a49333 add pointer to CRYPTOLPATH in error message 2015-03-20 14:30:33 -07:00
Adam C. Foltzer
7c85517ae2 add environment variable documentation to --help 2015-03-20 14:24:39 -07:00
Adam C. Foltzer
3d9628cf6f clean up warnings and remove dead code 2015-03-20 12:04:01 -07:00
Adam C. Foltzer
40c0bf9395 add latest Stackage LTS for release 2015-03-17 17:06:11 -07:00
Adam C. Foltzer
890e74ff76 bump version for 2.2.0 release 2015-03-17 17:04:21 -07:00
Adam C. Foltzer
1587c01706 bump SBV version for better ABC support 2015-03-17 16:30:49 -07:00
Brian Huffman
37cb5880fd Speed up 'packWord' and 'unpackWord' functions in SBV backend
This greatly speeds up primitives such as 'split' when
applied to very large bitvectors. Fixes #189.
2015-03-17 15:47:34 -07:00
Adam C. Foltzer
293200e722 switch to hackage version of gitrev 2015-03-17 12:03:58 -07:00
Adam C. Foltzer
fe1a2403c9 handle EvalErrors more gracefully in :check
Fixes #114 (mostly; Ctrl-C still doesn't clean everything up, but fixing
that would require a whole lot of work).
2015-03-16 17:17:36 -07:00
Adam C. Foltzer
a46b4c31c2 switch to TH solution for GitRev
This helps with #18 and should also reduce the number of unnecessary
recompiles that were triggered by the Makefile and/or cabal. The cabal
build type is now Simple.

Most of the complication in the TH.hs module is due to the various
places the current git hash might be stored:

1. Detached HEAD: the hash is in `.git/HEAD`
2. On a branch or tag: the hash is in a file pointed to by `.git/HEAD`
in a location like `.git/refs/heads`
3. On a branch or tag but in a repository with packed refs: the hash is
in `.git/packed-refs`

These situations all arise under normal development workflows and on the
Jenkins build machines, but there might be further scenarios that cause
problems. The tradeoff seems worthwhile though as now projects that
build Cryptol as a dependency wind up having to rebuild Cryptol far less
frequently.
2015-03-16 13:18:28 -07:00
Adam C. Foltzer
489a926589 clean up cabal file for Hackagability
Fixes #18
2015-03-09 15:17:26 -07:00
Dylan McNamee
1fd98e02b0 removed property keyword from helper functions. Thanks to Joey Dodds for pointing this out. 2015-03-09 14:43:30 -07:00
Adam C. Foltzer
5fb8521ea7 add abc prover support 2015-03-09 14:20:27 -07:00
Adam C. Foltzer
faab7b0b0a tweak paths in test output for Windows 2015-03-06 12:03:21 -08:00
Adam C. Foltzer
56ab951d7f fixup last commit 2015-03-05 16:10:34 -08:00
Adam C. Foltzer
0c7b21674c add "self-contained" mode for Cryptol-as-a-Library
Many of our projects that depend on Cryptol break because we forgot to
drag along `Cryptol.cry` or it just can't work out where it is from the
perspective of the other executable.

There's now a new flag `self-contained` in `cryptol.cabal` that is on by
default that bakes the contents of the Prelude into the library, so that
it can be reproduced on demand.

This is really a hack at this point because the module system bakes in
the assumption that a module has an associated file path, so we actually
have to write the contents to a tmp file before reading them back
in. Let's do better than this in the future.

This option is disabled for targets in the Makefile because we want the
standalone interpreter to be using the distribution's `Cryptol.cry`.
2015-03-05 15:18:18 -08:00
Iavor S. Diatchki
db0d036966 Correct the test to expose the proper bug. 2015-03-05 10:36:15 -08:00
Iavor S. Diatchki
7be9914cb8 Merge branch 'wip/cs' of github.com:GaloisInc/cryptol into wip/cs 2015-03-05 10:22:51 -08:00
Iavor S. Diatchki
1cbd34b8c8 Fix a sign error 2015-03-05 09:25:16 -08:00
Iavor S. Diatchki
2f366b29ad Add some position when basic goals got solved, but we still have extra props.
We should either think of a better location or, perhpas, not emit
the extra props?
2015-03-05 08:41:31 -08:00