Adam C. Foltzer
3168bef3fa
fix some 7.8 build failures
2015-10-21 13:19:15 -07:00
Adam C. Foltzer
d31fc9d24a
Adapt to SBV 5.3 interface
...
We special-case `allSat` because we don't support running parallel
solvers for multiple answers
2015-10-21 13:18:37 -07:00
Brian Huffman
0cde0f3aab
Add function unpackIdent :: Ident -> String
2015-10-16 17:08:12 -07:00
Trevor Elliott
993d19011c
Remove debug info, and redundant imports
2015-10-16 13:38:06 -07:00
Trevor Elliott
39bac2034a
Merge remote-tracking branch 'origin/master' into wip/name-change
2015-10-16 13:23:29 -07:00
Adam C. Foltzer
ad3fdb4e14
use base-compat to remove much CPP
2015-10-08 16:54:08 -07:00
Trevor Elliott
8100d90324
Merge remote-tracking branch 'origin/master' into wip/name-change
2015-10-07 09:18:31 -07:00
Adam C. Foltzer
4c441898d9
remove a merge error from docs Makefile
2015-10-05 15:33:04 -07:00
Trevor Elliott
5436acdbb8
Merge remote-tracking branch 'origin/master' into wip/name-change
2015-10-04 11:49:57 -07:00
Adam C. Foltzer
80daf82b8c
add threading by default for executables
2015-10-01 13:50:32 -07:00
Adam C. Foltzer
baddfcaab8
Merge branch 'heads/hotfixes/v2.2.5'
2015-10-01 10:56:30 -07:00
Trevor Elliott
8942289b7f
Remove problematic comment
2015-09-30 15:45:49 -07:00
Adam C. Foltzer
7d81568555
remove iteSolver option for compat with sbv 5+
2015-09-30 14:24:21 -07:00
Trevor Elliott
cacc59529e
Update test output
2015-09-29 17:35:18 -07:00
Trevor Elliott
c61467e612
Fix a shift/reduce conflict
2015-09-29 17:35:08 -07:00
Trevor Elliott
f8685e4f7c
Prevent warnings or errors from shadowNames, conditionally
...
In some cases, it's nice to prevent errors/warnings from coming out of
shadowNames.
2015-09-29 14:53:43 -07:00
Trevor Elliott
2cec1e3782
Revert to the original makefile
2015-09-29 14:04:57 -07:00
Trevor Elliott
7f9e4f6aa1
let shouldn't interact with mono-binds
2015-09-29 11:46:21 -07:00
Adam C. Foltzer
243e051df3
bump version number, add SBV upper bound
...
Conflicts:
stackage.config
2015-09-29 11:28:30 -07:00
Trevor Elliott
f8e6582230
Update tests and output
2015-09-28 21:26:26 -07:00
Trevor Elliott
0b19e4ab4d
Add a NameDisp to renamer errors
2015-09-28 18:05:09 -07:00
Trevor Elliott
1a6825a5c0
Comput the output of :browse based on what's in scope
2015-09-28 17:32:15 -07:00
Trevor Elliott
45234b15cf
Don't give warnings when imported names are shadowed
2015-09-28 17:31:48 -07:00
Trevor Elliott
2a202fd60a
Makefile wibbles
2015-09-28 13:58:39 -07:00
Trevor Elliott
91eae415c2
Print name origins in a shadowing warning
2015-09-28 13:57:45 -07:00
Trevor Elliott
58da031a90
Sort properties by name
2015-09-28 13:57:34 -07:00
Trevor Elliott
60694f8456
Output format changed
2015-09-28 12:07:42 -07:00
Trevor Elliott
496b87b9d3
Simplify the IfaceDecls type
...
As IfaceDecls is no longer used when interpreting imports, there's no way for
conflicts to appear. As a result, the values of each map no longer need to be
lists, and the mappend operation is greatly simplified.
2015-09-27 19:58:54 -05:00
Trevor Elliott
b4fbec108e
Update some test output
...
The core AST now always prints fully-qualified names.
2015-09-27 19:56:58 -05:00
Trevor Elliott
3a39b271da
Smarter merging of naming environments
...
When merging two entries that are the same, don't duplicate the binding on the
RHS of the map.
2015-09-27 19:42:15 -05:00
Trevor Elliott
0541e80a98
Add a way to print names with their location info
2015-09-27 19:40:36 -05:00
Trevor Elliott
5cb9280530
Fix a display bug in the :help command
...
Don't try to figure out when parens are needed on operators
2015-09-27 19:39:33 -05:00
Trevor Elliott
8bcefbe4dd
Don't produce warnings when shadowing in the dynamic env
2015-09-27 19:39:06 -05:00
Trevor Elliott
a7b7e25c0f
Remove some dead code
2015-09-27 19:38:41 -05:00
Trevor Elliott
694a1ed92d
Fix some bugs with the dynamic env
...
Shadowing wasn't working correctly, as names were being added to the dynamic
naming environment in multiple places.
2015-09-27 18:55:48 -05:00
Trevor Elliott
bc5759f867
Try to have make test rebuild cryptol less frequently
2015-09-27 18:02:26 -05:00
Trevor Elliott
06b5156b17
Compare two names based on how they would display
2015-09-27 18:02:02 -05:00
Trevor Elliott
454270165f
Case analysis wibbles
2015-09-27 18:01:24 -05:00
Trevor Elliott
8f7e76b714
mkTInfix was rewriting too much
...
`max 1 (a + b) - 1` was rewriting to `max 1 (a + b - 1)`, as mkTInfix was
considering the use of max to be an infix operator. The fix was to make it only
perform this way when the thing in the position of `max` was one of the
un-renamed infix constraints (==,>=,<=).
2015-09-27 18:01:09 -05:00
Trevor Elliott
89aaa72e0b
Start fixing failing tests
2015-09-27 14:35:24 -05:00
Trevor Elliott
c855463fd9
Warning removal
2015-09-26 13:15:10 -05:00
Trevor Elliott
4839de6048
Makefile fix
...
Something wasn't happening correctly with the PKG target, so I altered it to
run everything in one shell.
2015-09-26 13:15:00 -05:00
Trevor Elliott
9e36f05f4b
Merge remote-tracking branch 'origin/master' into wip/name-change
2015-09-26 01:26:23 -05:00
Trevor Elliott
23f520c810
NameMap wasn't actually helping
2015-09-26 01:25:40 -05:00
Trevor Elliott
d9a3bb1de7
Prelude loads again
2015-09-25 16:04:07 -05:00
Trevor Elliott
a133ea0f67
Fixed some renamer problems
2015-09-25 15:02:43 -05:00
Trevor Elliott
c191aebb52
Fix some renamer/parser bugs
2015-09-24 17:32:25 -05:00
Trevor Elliott
55ae1f852d
Major changes plumbed through, now for the bugs!
2015-09-24 16:47:52 -05:00
Trevor Elliott
56171c60ca
Library is building again
2015-09-24 16:30:23 -05:00
Trevor Elliott
e5ab23cfe8
Lib nearly builds
2015-09-23 15:45:42 -07:00
