Commit Graph

2649 Commits

Author SHA1 Message Date
Adam Sampson
75d4684a1d Remove the obj directory in a less complicated way.
(I appreciate that it was being careful before, but actually I really do
want obj gone completely on make clean!)
2011-07-20 15:21:38 +00:00
Adam Sampson
1555d0f5eb Port to use QuickCheck 2.
Most of this is trivial -- e.g. getting rid of dummy definitions of
coarbitrary, which is a separate typeclass in QC2, and changing the
parameter specs to use the new Args type.

The chunk of code that runs a QC test as an HUnit test is now quite a
bit simpler because QC's top-level interface returns a result. However,
this means that some gymnastics are required to get at the right
definition of Result in different places -- QC2 has two different types
called Result, and we use both for different jobs!
2011-07-20 15:10:10 +00:00
Adam Sampson
763ba7108e Test genNumsToTotal by using it to generate a datatype.
This is because QuickCheck 2 no longer exports the "generate" function;
since it's a test generator anyway, we may as well test it by using it
to test something trivial.
2011-07-20 15:08:54 +00:00
Adam Sampson
6a047982a3 TestMain should export main. 2011-07-20 15:07:29 +00:00
Adam Sampson
19b432796b Fix misleading comment. 2011-07-20 11:04:00 +00:00
Adam Sampson
476906f5be Qualify "empty".
Data.Generic exports "empty" as well in GHC 7.0.
2011-07-20 09:54:20 +00:00
Adam Sampson
97625082ea Add a couple of missing imports to the Alloy example. 2011-07-19 15:02:31 +00:00
Adam Sampson
ca1bbbfa47 -XImpredicativeTypes is only available on GHC 6.10+.
This also pulls out the duplicate -fglasgow-exts.
2010-04-10 21:46:34 +00:00
Adam Sampson
b006500274 Simplify the GHC version logic a bit.
This just flattens the version number into an integer (e.g. 6.8.2 ->
6008002), which makes comparisons much simpler. (Previously it would
have broken for GHC 7.x.)

Also remove duplicate "Checking" from messages.
2010-04-10 21:37:51 +00:00
Adam Sampson
b5fd2707e2 Fix SYB package name detection for older GHC. 2010-04-10 21:11:51 +00:00
Neil Brown
424810f464 Fixed the build system to allow compilation with GHC 6.12 2010-04-10 19:41:48 +00:00
Neil Brown
b6a2ed798e Added the option to use ImpredicativeTypes
They will be deprecated in future, but for now it's easier to do this than work out how to stop using them
2010-04-10 19:41:09 +00:00
Neil Brown
fe1ef8f6f5 Tidied up a use of impredicative types 2010-04-10 19:40:54 +00:00
Neil Brown
f12f0f9219 Stopped using StringConstr, which has been removed from the latest version of syb 2010-04-10 19:40:35 +00:00
Neil Brown
7b80564828 Removed all uses of rec, which seems to be a reserved word these days 2010-04-10 19:39:54 +00:00
Neil Brown
c0e2e9c401 Improved the commenting on the flow algorithm stuff and fixed a bug in the implicit mobility 2009-08-19 17:00:12 +00:00
Neil Brown
728fa5f328 Fixed up the implicit mobility to work with oak (but needs some more work to make sure normal mobility still functions) 2009-05-27 18:01:03 +00:00
Neil Brown
c92af101ef Added a function for joining together two GraphFuncs for flow analysis 2009-05-27 13:42:46 +00:00
Neil Brown
e7412d0721 Fixed a problem where variables used in calls to intrinsic PROCs weren't being recorded properly 2009-05-27 13:42:13 +00:00
Neil Brown
0efe1c856b Fixed various things in the implicit mobility 2009-05-22 21:58:10 +00:00
Neil Brown
677d78a229 Added a line to handle some missing cases in ShowCode 2009-05-22 21:57:17 +00:00
Neil Brown
734685d715 Fixed genOverArray to be okay with mobile arrays 2009-05-22 21:57:00 +00:00
Neil Brown
f625019aec Added bits to the implicit mobility to stop things being used in parallel being moved 2009-05-22 17:23:05 +00:00
Neil Brown
4f0ebbc672 Added a new setToMap function to Utils 2009-05-22 17:19:28 +00:00
Neil Brown
014f83d65d Moved the extra parameters in the compiler commands so that the source file is always the last parameter 2009-05-22 17:13:10 +00:00
Neil Brown
ed63476ad7 Fixed strings passed on the command-line for defines 2009-05-19 13:28:39 +00:00
Neil Brown
589a6380fb Fixed a couple of problems with the implicit mobility system 2009-05-19 12:58:49 +00:00
Neil Brown
703bfe1afe Added better error messages for problems with C types in the backend 2009-05-19 12:58:22 +00:00
Neil Brown
2c7fc86533 Fixed the processing of -D arguments on the command-line 2009-05-19 09:53:54 +00:00
Neil Brown
9ec69aa8fb Twiddled some of the alloy documentation 2009-06-05 10:43:12 +00:00
Neil Brown
e528a144df More changes to the cabal file 2009-06-05 10:10:24 +00:00
Neil Brown
7f5b141a35 Fixed the cabal file to work with the latest version of alloy 2009-06-05 09:56:14 +00:00
Neil Brown
111c77b3b1 Renamed the cabal file to alloy 2009-06-05 09:38:49 +00:00
Neil Brown
af1e4b6b7f Added an EXIT intrinsic that's useful for profiling 2009-05-25 17:08:11 +00:00
Neil Brown
d98c5079ca Cleaned up all the warnings in Tock's code (most unused modules, or unused functions) 2009-05-19 09:05:38 +00:00
Neil Brown
48e50938f7 Got the build system to use specific versions of some packages
Eventually we should probably do this for all packages, but we certainly need it for base on GHC 6.10 (this avoids dealing with some other things, such as base being split up), and I needed it for QuickCheck too, since something had installed the latest version.
2009-05-18 22:32:19 +00:00
Neil Brown
3d4f16341f Made all the needed packages explicit, and added configure tests for all of them 2009-05-18 19:56:21 +00:00
Neil Brown
b70811926a Fixed some imports that were secretly causing a haskell98 package dependency 2009-05-18 19:55:59 +00:00
Neil Brown
853a52cc00 Finished the name change from Polyplate to Alloy
Most of this was a find-and-replace, PolyplateM -> AlloyA.  But I also fixed some of the opsets and removed types that were no longer needed, and so on.
2009-05-11 15:22:58 +00:00
Neil Brown
bee000b9c7 Renamed all the Polyplate files to Alloy 2009-05-11 10:47:29 +00:00
Neil Brown
bc917e1442 Added an Applicative-based function to PolyplateM and PolyplateMRoute, which seems to work 2009-05-06 13:02:51 +00:00
Neil Brown
44eabe4baa Reworked Polyplate to have a simpler way of expressing opsets, and also simplified PolyplateM and PolyplateMRoute 2009-05-06 11:32:19 +00:00
Neil Brown
efa5c57fd0 Changed Polyplate to use a different system of ops-sets, that's looking quite nice 2009-05-05 17:48:20 +00:00
Neil Brown
aaa3ffe3f3 Fixed some of the clean rules (again?) 2009-05-05 17:47:59 +00:00
Neil Brown
7f702aaca2 Fixed a few tocktest compilation failures 2009-04-21 12:25:04 +00:00
Neil Brown
f4eea82bb7 Fixed a bug where C. externals were turned into blocking calls, and B. externals were turned into normal external calls
This turned out to be the reason for the slowness in parrot_attack.
2009-04-19 23:09:18 +00:00
Neil Brown
fcacdd3235 Turned csCurrentFile into a monad transformer variable, and added csCompilationHash to help in uniquifying names between files 2009-04-19 19:36:38 +00:00
Neil Brown
d29b5b67cf Got the tests compiling again after the changes to the AST for extended rendezvous 2009-04-19 17:34:36 +00:00
Neil Brown
d3f4bd587e Fixed the type-inference to work again with input from timers 2009-04-19 17:35:35 +00:00
Neil Brown
13ce688271 Fixed the parser again for extended rendezvous 2009-04-19 17:29:43 +00:00