Commit Graph

2662 Commits

Author SHA1 Message Date
Adam Sampson
a21fb263e9 Adjust quoting that autoconf warned about. 2011-08-10 12:42:19 +00:00
Adam Sampson
760baa710e Add TOCK_CHECK_CFLAGS for checking compiler flags. 2011-08-10 12:37:47 +00:00
Adam Sampson
a741719169 Use TOCK_ rather than AC_ prefix for m4 macros. 2011-08-10 12:25:08 +00:00
Adam Sampson
2a2057683f Use -fwarn-incomplete-patterns instead of -simple-.
The two have meant the same thing for a while, and GHC 7.0 only accepts
the former.
2011-08-10 12:24:23 +00:00
Adam Sampson
77b5ac716b Don't remove the nasty GCC workaround...
... because they still haven't fixed it!
2011-08-10 12:02:05 +00:00
Adam Sampson
d9856814aa Remove support for GHC versions < 6.12.
Debian stable ships 6.12 now, and this simplifies supporting GHC 7.
2011-08-10 11:52:03 +00:00
Adam Sampson
97e6031d0c Touch Haskell programs after ghc --makeing them.
If GHC didn't need to do anything (e.g. you've touched one of the source
files but not changed the contents), it doesn't update the output file
-- so next time you run make, it thinks it needs to run the rule again.
Touching the output matches make's expectation of what a compiler should
do.
2011-07-21 14:59:29 +00:00
Adam Sampson
0db99b03c4 Use sed with multiple -es, rather than multiple seds. 2011-07-21 14:55:32 +00:00
Adam Sampson
913aeadd01 Use setjmp to implement occam_stop in rangetest.
This stops GCC complaining about occam_stop failing to return.
2011-07-21 14:34:01 +00:00
Adam Sampson
2c4ccfbf39 Update all the copyright notices.
I've checked these all against the Darcs history using a script
(check-copyright, in my misccode collection). Anything Neil or I did as
part of our PhDs is copyright University of Kent; more recent work
belongs to us, as appropriate.
2011-07-21 11:38:13 +00:00
Adam Sampson
88daedb1c5 Fix copyright notice format. 2011-07-21 11:19:15 +00:00
Adam Sampson
3e42a3956b Remove config_sources on distclean, not clean.
"make clean" shouldn't remove files generated by "configure".
2011-07-21 10:15:38 +00:00
Adam Sampson
e40226ce02 Make Tock work with QuickCheck 2.1.0.3.
This is the slightly older version that Debian stable is current
shipping; it has fewer fields in its Result structure, so we need to be
more flexible about pattern-matching (which is probably a good thing
anyway).
2011-07-21 09:51:54 +00:00
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