tockhttp://offog.org/git/tock.atomgitatom2011-08-10T12:42:19Zhttp://offog.org/git/tock.git#a21fb263e906b5e51e6fb54d3faaed145752abaa2011-08-10T12:42:19Z2011-08-10T12:42:19ZAdjust quoting that autoconf warned about.Adjust quoting that autoconf warned about.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#760baa710e7b4327221f747560b99a2b8cb6bdd32011-08-10T12:37:47Z2011-08-10T12:37:47ZAdd TOCK_CHECK_CFLAGS for checking compiler flags.Add TOCK_CHECK_CFLAGS for checking compiler flags.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#a7417191693d32e4d5259135a0e7a004c873ba702011-08-10T12:25:08Z2011-08-10T12:25:08ZUse TOCK_ rather than AC_ prefix for m4 macros.Use TOCK_ rather than AC_ prefix for m4 macros.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#2a2057683f2a3616b343ff33a05fb3e6e1ca037e2011-08-10T12:24:23Z2011-08-10T12:24:23ZUse -fwarn-incomplete-patterns instead of -simple-.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.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#77b5ac716b34e402cd6af22183d951a4c3155c962011-08-10T12:02:05Z2011-08-10T12:02:05ZDon't remove the nasty GCC workaround...Don't remove the nasty GCC workaround...
... because they still haven't fixed it!
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#d9856814aa02a3651aff2000da0a26b19a2c78282011-08-10T11:52:03Z2011-08-10T11:52:03ZRemove support for GHC versions < 6.12.Remove support for GHC versions < 6.12.
Debian stable ships 6.12 now, and this simplifies supporting GHC 7.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#97e6031d0ca68e2ed0403d7be003cdafd6c423512011-07-21T14:59:29Z2011-07-21T14:59:29ZTouch Haskell programs after ghc --makeing them.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.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#0db99b03c4dce83f6e69137270ce541c9a0897072011-07-21T14:55:32Z2011-07-21T14:55:32ZUse sed with multiple -es, rather than multiple seds.Use sed with multiple -es, rather than multiple seds.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#913aeadd01a1e909c41171f5aea4e7fe969042dd2011-07-21T14:34:01Z2011-07-21T14:34:01ZUse setjmp to implement occam_stop in rangetest.Use setjmp to implement occam_stop in rangetest.
This stops GCC complaining about occam_stop failing to return.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#2c4ccfbf39ddab319d4233e30cf0041f24af00802011-07-21T11:38:13Z2011-07-21T11:38:13ZUpdate all the copyright notices.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.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#88daedb1c52cb160da14ffc59bd429fb4f3d8ee82011-07-21T11:19:15Z2011-07-21T11:19:15ZFix copyright notice format.Fix copyright notice format.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#3e42a3956b8aae1be1ec62e92bdb46b5a65298342011-07-21T10:15:38Z2011-07-21T10:15:38ZRemove config_sources on distclean, not clean.Remove config_sources on distclean, not clean.
"make clean" shouldn't remove files generated by "configure".
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#e40226ce0252f154f603f34eaf74fcb146f5e11b2011-07-21T09:51:54Z2011-07-21T09:51:54ZMake Tock work with QuickCheck 2.1.0.3.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).
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#75d4684a1d3837b9b5914cfa55c50e3522ebfd6c2011-07-20T15:21:38Z2011-07-20T15:21:38ZRemove the obj directory in a less complicated way.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!)
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#1555d0f5eba33d477d462ee815af7cead53918462011-07-20T15:10:10Z2011-07-20T15:10:10ZPort to use QuickCheck 2.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!
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#763ba7108e22a71cbc3d2241fde32fc98eaf95522011-07-20T15:08:54Z2011-07-20T15:08:54ZTest genNumsToTotal by using it to generate a datatype.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.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#6a047982a3e83d6f4385623f71e18965dfd2cb052011-07-20T15:07:29Z2011-07-20T15:07:29ZTestMain should export main.TestMain should export main.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#19b432796bdcba029924919de356078de532444e2011-07-20T11:04:00Z2011-07-20T11:04:00ZFix misleading comment.Fix misleading comment.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#476906f5be8fc46a6b1fe16d8f81e29929903bed2011-07-20T09:54:20Z2011-07-20T09:54:20ZQualify "empty".Qualify "empty".
Data.Generic exports "empty" as well in GHC 7.0.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#97625082ea1786c16e29cf31ce388158a3c1b5442011-07-19T15:02:31Z2011-07-19T15:02:31ZAdd a couple of missing imports to the Alloy example.Add a couple of missing imports to the Alloy example.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#ca1bbbfa47671a9b9aa341a1e5e5a89bf010e0dd2010-04-10T21:46:34Z2010-04-10T21:46:34Z-XImpredicativeTypes is only available on GHC 6.10+.-XImpredicativeTypes is only available on GHC 6.10+.
This also pulls out the duplicate -fglasgow-exts.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#b00650027400ac8912a53273a154566a3d87600f2010-04-10T21:37:51Z2010-04-10T21:37:51ZSimplify the GHC version logic a bit.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.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#b5fd2707e2691dbdd1bac1be6caea3c20251caa52010-04-10T21:11:51Z2010-04-10T21:11:51ZFix SYB package name detection for older GHC.Fix SYB package name detection for older GHC.
Adam Sampsonats@offog.orghttp://offog.org/git/tock.git#424810f464afe95ebcb0580670f3dc7de5ed7ba52010-04-10T19:41:48Z2010-04-10T19:41:48ZFixed the build system to allow compilation with GHC 6.12Fixed the build system to allow compilation with GHC 6.12
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#b6a2ed798e7e639e4f3a82bb1d998afb3213b5e32010-04-10T19:41:09Z2010-04-10T19:41:09ZAdded the option to use ImpredicativeTypesAdded 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
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#fe1ef8f6f5632f5c7b1bf7830d49ba7f636bb4fa2010-04-10T19:40:54Z2010-04-10T19:40:54ZTidied up a use of impredicative typesTidied up a use of impredicative types
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#f12f0f9219cbde89fc099f1043bed95e29d089da2010-04-10T19:40:35Z2010-04-10T19:40:35ZStopped using StringConstr, which has been removed from the latest version of sybStopped using StringConstr, which has been removed from the latest version of syb
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#7b80564828909be3368edf12322bbd697399fe0c2010-04-10T19:39:54Z2010-04-10T19:39:54ZRemoved all uses of rec, which seems to be a reserved word these daysRemoved all uses of rec, which seems to be a reserved word these days
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#c0e2e9c401ad40d7253a61e2799497bb67e6a3ae2009-08-19T17:00:12Z2009-08-19T17:00:12ZImproved the commenting on the flow algorithm stuff and fixed a bug in the implicit mobilityImproved the commenting on the flow algorithm stuff and fixed a bug in the implicit mobility
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#728fa5f328cafa0fee5324515794314a21892c592009-05-27T18:01:03Z2009-05-27T18:01:03ZFixed up the implicit mobility to work with oak (but needs some more work to make sure normal mobility still functions)Fixed up the implicit mobility to work with oak (but needs some more work to make sure normal mobility still functions)
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#c92af101ef7a3bfc976af17e424ccc4b8a8397d72009-05-27T13:42:46Z2009-05-27T13:42:46ZAdded a function for joining together two GraphFuncs for flow analysisAdded a function for joining together two GraphFuncs for flow analysis
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#e7412d0721b3af210ad9dded195b3e2ead7b2cf12009-05-27T13:42:13Z2009-05-27T13:42:13ZFixed a problem where variables used in calls to intrinsic PROCs weren't being recorded properlyFixed a problem where variables used in calls to intrinsic PROCs weren't being recorded properly
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#0efe1c856b1fd27eed7495a248688338a0ea57922009-05-22T21:58:10Z2009-05-22T21:58:10ZFixed various things in the implicit mobilityFixed various things in the implicit mobility
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#677d78a22915727e380b55232ddb89b0c9ba9ca92009-05-22T21:57:17Z2009-05-22T21:57:17ZAdded a line to handle some missing cases in ShowCodeAdded a line to handle some missing cases in ShowCode
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#734685d7157c5d96c403c9dea49c62cd6038ab112009-05-22T21:57:00Z2009-05-22T21:57:00ZFixed genOverArray to be okay with mobile arraysFixed genOverArray to be okay with mobile arrays
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#f625019aec102f83a8576fd836f743e237e928692009-05-22T17:23:05Z2009-05-22T17:23:05ZAdded bits to the implicit mobility to stop things being used in parallel being movedAdded bits to the implicit mobility to stop things being used in parallel being moved
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#4f0ebbc6727fd4e1bb5de3c68de36448c99169b82009-05-22T17:19:28Z2009-05-22T17:19:28ZAdded a new setToMap function to UtilsAdded a new setToMap function to Utils
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#014f83d65d4f1dc7f8c9800c8fcc7bb027c3bf872009-05-22T17:13:10Z2009-05-22T17:13:10ZMoved the extra parameters in the compiler commands so that the source file is always the last parameterMoved the extra parameters in the compiler commands so that the source file is always the last parameter
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#ed63476ad7bfa30980f840ca7ec94ffc3c73bbdb2009-05-19T13:28:39Z2009-05-19T13:28:39ZFixed strings passed on the command-line for definesFixed strings passed on the command-line for defines
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#589a6380fb999d32edc1856130acddf25ce7a6292009-05-19T12:58:49Z2009-05-19T12:58:49ZFixed a couple of problems with the implicit mobility systemFixed a couple of problems with the implicit mobility system
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#703bfe1afe5a3b2bcc26906413fa62686e6b1a422009-05-19T12:58:22Z2009-05-19T12:58:22ZAdded better error messages for problems with C types in the backendAdded better error messages for problems with C types in the backend
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#2c7fc86533d9ec5d4a1e4c904f36227c239ba97b2009-05-19T09:53:54Z2009-05-19T09:53:54ZFixed the processing of -D arguments on the command-lineFixed the processing of -D arguments on the command-line
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#9ec69aa8fb53d8770e544d04ed9b82bb43666dc12009-06-05T10:43:12Z2009-06-05T10:43:12ZTwiddled some of the alloy documentationTwiddled some of the alloy documentation
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#e528a144df613e2c327f0d89a77d1df1c15e8ed92009-06-05T10:10:24Z2009-06-05T10:10:24ZMore changes to the cabal fileMore changes to the cabal file
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#7f5b141a3506e2b1d55fc49f702b2966991701622009-06-05T09:56:14Z2009-06-05T09:56:14ZFixed the cabal file to work with the latest version of alloyFixed the cabal file to work with the latest version of alloy
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#111c77b3b1fb2e81f978c5383c7013f191ab8ca42009-06-05T09:38:49Z2009-06-05T09:38:49ZRenamed the cabal file to alloyRenamed the cabal file to alloy
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#af1e4b6b7f6bf71479cd3a257cec3d66ce93b3752009-05-25T17:08:11Z2009-05-25T17:08:11ZAdded an EXIT intrinsic that's useful for profilingAdded an EXIT intrinsic that's useful for profiling
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#d98c5079ca52943eecc435d5db4e8977c859ff6e2009-05-19T09:05:38Z2009-05-19T09:05:38ZCleaned up all the warnings in Tock's code (most unused modules, or unused functions)Cleaned up all the warnings in Tock's code (most unused modules, or unused functions)
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#48e50938f71acaac5f3aa38b29364cda726e2a3d2009-05-18T22:32:19Z2009-05-18T22:32:19ZGot the build system to use specific versions of some packagesGot 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.
Neil Brownneil@twistedsquare.comhttp://offog.org/git/tock.git#3d4f16341f482c722116f991dca33b529e1a1b792009-05-18T19:56:21Z2009-05-18T19:56:21ZMade all the needed packages explicit, and added configure tests for all of themMade all the needed packages explicit, and added configure tests for all of them
Neil Brownneil@twistedsquare.com