- Cvs-hugs - Haskell.org

cvs commit: hugs98/src parser.y
by nordland＠glass.cse.ogi.edu 19 Sep '01

19 Sep '01

nordland 2001/09/19 14:36:04 PDT Modified files: src parser.y Log: Fixed the incorrect acceptance of rank-2 types like (Ord a => Tree a) -> IO () The parser now insists that such types be explicitly quantified, as in (forall a . Ord a => Tree a) -> IO () This also holds for the (somewhat counterintuitive) syntax for constructors with local existential quantification, i.e., Ord a => Con (Tree a) is banned in favor of forall a . Ord a => Con (Tree a) *Note*, however, that this fix doesn't solve the "rank-2 implicit parameters" problem reported by John Hughes earlier today: foo :: ((?x :: Int) => b) -> Int -> b foo s z = s with ?x = z Was that feature anticipated? In any case, there are two problems that must be solved here: (1) Loosen up the syntax somehow so that local monomorphic contexts are allowed -- perhaps by allowing (forall . (?x :: Int) => b) -> Int -> b (2) Fixing the erroneous unification that John describes. [Who will take the lead and define what all the common Haskell extensions really mean when used in conjunction?] Revision Changes Path 1.23 +3 -4 hugs98/src/parser.y

1 0

cvs commit: hugs98/src connect.h input.c machdep.c
by nordland＠glass.cse.ogi.edu 19 Sep '01

19 Sep '01

nordland 2001/09/19 12:14:07 PDT Modified files: src connect.h input.c machdep.c Log: Reimplemented the file search algorithm according to the following principle. I assume that the file found will be the first readable filename in the list produced by "find". find along nm hugspath = [ d++f++e | f <- files, d <- dirs, e <- exts ] where (pref,name) = rspan (/=slash) nm dirs = if null pref then along : hugspath ++ [""] else [pref] files = if isQModId name then [mod2dir name, name] else [name] exts = ["",".hs",".lhs"] rspan p s = let (a,b) = span p (reverse s) in (reverse b, reverse a) mod2dir s = map (\c -> if c=='.' then slash else c) s isQModId s = -- is s a valid qualified module identifier? The SEARCH_DIR option is still compatible with this principle, although it is turned off by default. Revision Changes Path 1.23 +3 -2 hugs98/src/connect.h 1.28 +18 -2 hugs98/src/input.c 1.27 +90 -48 hugs98/src/machdep.c

1 0

cvs commit: hugs98/src hugs.c
by Sigbjorn Finne 19 Sep '01

19 Sep '01

sof 2001/09/19 10:21:07 PDT Modified files: src hugs.c Log: errHead: put the filename portion inside of double quotes. Doing so makes it easier for editor mode writers to unravel source location info in an error message. Revision Changes Path 1.46 +9 -4 hugs98/src/hugs.c

1 0

cvs commit: hugs98/src/unix convert_hslibs
by Jeff Lewis 18 Sep '01

18 Sep '01

lewie 2001/09/18 16:42:35 PDT Modified files: src/unix convert_hslibs Log: The argument is now the directory that `hslibs' lives in (not the directory that `fptools/hslibs' lives in). Revision Changes Path 1.3 +3 -3 hugs98/src/unix/convert_hslibs

1 0

cvs commit: hugs98/src/bcc32 Makefile hugs98/src/winhugs Makefile
by Sigbjorn Finne 18 Sep '01

18 Sep '01

sof 2001/09/18 12:58:11 PDT Modified files: src/bcc32 Makefile src/winhugs Makefile Log: Use bison, not byacc Revision Changes Path 1.4 +1 -1 hugs98/src/bcc32/Makefile 1.2 +1 -1 hugs98/src/winhugs/Makefile

1 0

cvs commit: hugs98/src/winhugs Wintext.c
by Sigbjorn Finne 18 Sep '01

18 Sep '01

sof 2001/09/18 12:55:36 PDT Modified files: src/winhugs Wintext.c Log: -DoChar: preserve tab character, don't expand it to 8 spaces. -WinPutChar: - fixed tab handling, cursor was being reset post-\t expansion. - interpret \t as 'move to next tab stop', not tab as a shorthand for 8 spaces. Revision Changes Path 1.3 +9 -5 hugs98/src/winhugs/Wintext.c

1 0

cvs commit: hugs98/src/winhugs Winbrows.c Winframe.c Winhint.c Winhint.h Winhugs.h Winmenu.h Winstln.c Wintext.c Wintext.h Wintoolb.c Winutils.c Winutils.h menusbm.c resource.h winhugs.c
by Sigbjorn Finne 18 Sep '01

18 Sep '01

sof 2001/09/18 12:51:32 PDT Modified files: src/winhugs Winbrows.c Winframe.c Winhint.c Winhint.h Winhugs.h Winmenu.h Winstln.c Wintext.c Wintext.h Wintoolb.c Winutils.c Winutils.h menusbm.c resource.h winhugs.c Log: nuke carriage returns Revision Changes Path 1.2 +1632 -1632hugs98/src/winhugs/Winbrows.c 1.2 +471 -471 hugs98/src/winhugs/Winframe.c 1.2 +253 -253 hugs98/src/winhugs/Winhint.c 1.2 +29 -29 hugs98/src/winhugs/Winhint.h 1.2 +77 -77 hugs98/src/winhugs/Winhugs.h 1.2 +138 -138 hugs98/src/winhugs/Winmenu.h 1.2 +240 -240 hugs98/src/winhugs/Winstln.c 1.2 +2930 -2930hugs98/src/winhugs/Wintext.c 1.2 +100 -100 hugs98/src/winhugs/Wintext.h 1.2 +600 -600 hugs98/src/winhugs/Wintoolb.c 1.2 +528 -528 hugs98/src/winhugs/Winutils.c 1.2 +25 -25 hugs98/src/winhugs/Winutils.h 1.2 +105 -105 hugs98/src/winhugs/menusbm.c 1.2 +16 -16 hugs98/src/winhugs/resource.h 1.4 +1752 -1752hugs98/src/winhugs/winhugs.c

1 0

cvs commit: hugs98/src/winhugs Winframe.h Winstln.h Wintoolb.h WINFRAME.H WINSTLN.H WINTOOLB.H
by Sigbjorn Finne 18 Sep '01

18 Sep '01

sof 2001/09/18 12:49:23 PDT Added files: src/winhugs Winframe.h Winstln.h Wintoolb.h Removed files: src/winhugs WINFRAME.H WINSTLN.H WINTOOLB.H Log: no need to shout

1 0

cvs commit: hugs98/src/unix configure configure.in
by Sigbjorn Finne 17 Sep '01

17 Sep '01

sof 2001/09/17 15:24:12 PDT Modified files: src/unix configure configure.in Log: If the _basename_ of YACC is 'byacc', give up and insist on 'bison' Revision Changes Path 1.13 +1 -1 hugs98/src/unix/configure 1.16 +3 -3 hugs98/src/unix/configure.in

1 0

cvs commit: hugs98/src parser.y static.c
by Jeff Lewis 13 Sep '01

13 Sep '01

lewie 2001/09/13 13:14:13 PDT Modified files: src parser.y static.c Log: Extend where rank-2 types can appear (e.g. in the RHS of a `type' decl). Revision Changes Path 1.22 +5 -4 hugs98/src/parser.y 1.42 +3 -3 hugs98/src/static.c

1 0

cvs commit: hugs98/src storage.c
by Sigbjorn Finne 13 Sep '01

13 Sep '01

sof 2001/09/12 17:53:02 PDT Modified files: src storage.c Log: markSnd: have it return its argument; enables tail-call optimisations when compiling markCell(), which reduces C stack usage by the marking code quite considerably. Revision Changes Path 1.18 +15 -12 hugs98/src/storage.c

2 1

cvs commit: hugs98/src static.c
by Jeff Lewis 12 Sep '01

12 Sep '01

lewie 2001/09/12 15:19:06 PDT Modified files: src static.c Log: Fix static check on data constrs w/ existential quantifiers. (George Russell's bug of Feb 21 2001). Revision Changes Path 1.41 +4 -3 hugs98/src/static.c

1 0

cvs commit: hugs98/src type.c
by Jeff Lewis 12 Sep '01

12 Sep '01

lewie 2001/09/12 12:22:34 PDT Modified files: src type.c Log: Explicitly look in Prelude for `zip' and `zip2' (looks in List for the others). Revision Changes Path 1.36 +3 -3 hugs98/src/type.c

1 0

cvs commit: hugs98/src parser.y
by Jeff Lewis 12 Sep '01

12 Sep '01

lewie 2001/09/12 11:52:42 PDT Modified files: src parser.y Log: Delete spurious empty production from `fds'. Add error production to `fd' rule. Revision Changes Path 1.21 +3 -3 hugs98/src/parser.y

1 0

cvs commit: hugs98/src static.c
by Sigbjorn Finne 12 Sep '01

12 Sep '01

sof 2001/09/12 11:06:25 PDT Modified files: src static.c Log: depFields: handle QVars when printing missing-field err msg Revision Changes Path 1.40 +8 -2 hugs98/src/static.c

1 0

RE: cvs commit: hugs98/lib/hugs HugsLibs.hs hugs98/src/unix convert_hslibs hugs98/tests testScript.in
by Simon Marlow 11 Sep '01

11 Sep '01

> reid 2001/09/02 13:32:02 PDT > > Modified files: > lib/hugs HugsLibs.hs > src/unix convert_hslibs > tests testScript.in > Log: > o Removed lib/hugs/Sequence.hs and removed > mention of it from lib/hugs/HugsLibs.hs > > o Updated testsuite to handle the hslibs libraries > > o Copy COPYRIGHT file from edison over into COPYRIGHT.edison > Are there any other copyright files to worry about? > > Outstanding question: > > Is anything in hslibs not under a BSD-style license - 'cos > if there is, we can't include it in a Hugs distro which > effectively > means it won't get used. The license status of hslibs/util/Regex.hs is questionable, and hslibs/util/cbits/regex.c is GPL. There's a replacement designed to use the POSIX regex API in fptools/libraries/core/Text/Regex/Posix.hs. Cheers, Simon

2 1

cvs commit: hugs98/lib/hugs Quote.hs
by Jeff Lewis 07 Sep '01

07 Sep '01

lewie 2001/09/07 15:31:33 PDT Modified files: lib/hugs Quote.hs Log: Fix wibbles w/ `trim'. Revision Changes Path 1.4 +10 -3 hugs98/lib/hugs/Quote.hs

1 0

cvs commit: hugs98/lib Prelude.hs hugs98/tests testScript.in hugs98/tests/libs except1.output prodcon.output hugs98/tests/rts ioerror1.output mvar.output
by Alastair Reid 03 Sep '01

03 Sep '01

reid 2001/09/03 16:40:17 PDT Modified files: lib Prelude.hs tests testScript.in tests/libs except1.output prodcon.output tests/rts ioerror1.output mvar.output Log: This commit is all based on the following change to the scheduler loop in the Prelude: 1766c1766 < loop (Hugs_ForkThread a b:r) = loop (b:a:r) --- > loop (Hugs_ForkThread a b:r) = loop (a:b:r) [all other changes are to make the testsuite happy with the change] This has the effect of changing what happens when a thread becomes runnable. The old behaviour was to schedule the new thread immediately. That is, the new thread would preempt the current thread. The new behaviour is to maintain the current thread and just add the new thread to the list of runnable threads. The effect of this is that a thread executing a sequence of takes and puts (e.g., the sequence involved in reading from or writing to a Chan) will not be preempted unless one of the takes is on an empty mvar or one of the puts is on a full mvar. This is important because of one of the subtleties of the Hugs' thread implementation: each invocation of hugsIORun (e.g., the initial call to main, callbacks from C code, calls to unsafePerformIO, etc.) creates its own list of runnable threads and runs until all threads in that list are done (and, reports deadlock if the main thread from that invocation hasn't returned a value). Since threads cannot migrate from one runnable list to another, there's a distinct possibility of deadlock when the main thread in one invocation is blocked waiting for a thread in another list to wake it up. [I saw exactly this happening in the Win32 implementation of the HGL where callbacks from C into Haskell insert events into the event channel of each window. One thread would start writing to a Chan object but would get preempted before it finished. The preempting thread would then make a call to C which calls back into Haskell and tries to read the value written to the Chan. But it isn't allowed to read the value until the writer completes so it blocks. Now the writer should start running again but it can't because, although it is runnable, it is on a different runnable list so it gets ignored. So now the runnable list is empty and the callback terminates with a deadlock error message.] The most obvious fix would be to create a single global mutable list of threads but I'll save this (huge!) change for another day. [If anyone wants to take a stab at this before I get round to it (next 3-4 day weekend :-)), feel free. That'd probably be a good time to try implementing GHC's killThread and other asynchronous exception features.] A simpler fix is to prevent the first thread from being preempted unless it actually blocks. This change required changes to the sample output in the testsuite. All changes are either: 1) A permutation of the lines in the old file; or 2) Correcting for the change in the output format of IOErrors. (Should have been a separate fix but I only just noticed the problem.) Revision Changes Path 1.13 +1 -1 hugs98/lib/Prelude.hs 1.7 +3 -3 hugs98/tests/testScript.in 1.3 +21 -21 hugs98/tests/libs/except1.output 1.2 +12 -12 hugs98/tests/libs/prodcon.output 1.2 +4 -2 hugs98/tests/rts/ioerror1.output 1.3 +3 -3 hugs98/tests/rts/mvar.output

1 0

cvs commit: hugs98/lib/hugs HugsLibs.hs hugs98/src/unix convert_hslibs hugs98/tests testScript.in
by Alastair Reid 02 Sep '01

02 Sep '01

reid 2001/09/02 13:32:02 PDT Modified files: lib/hugs HugsLibs.hs src/unix convert_hslibs tests testScript.in Log: o Removed lib/hugs/Sequence.hs and removed mention of it from lib/hugs/HugsLibs.hs o Updated testsuite to handle the hslibs libraries o Copy COPYRIGHT file from edison over into COPYRIGHT.edison Are there any other copyright files to worry about? Outstanding question: Is anything in hslibs not under a BSD-style license - 'cos if there is, we can't include it in a Hugs distro which effectively means it won't get used. Revision Changes Path 1.2 +0 -1 hugs98/lib/hugs/HugsLibs.hs 1.2 +1 -1 hugs98/src/unix/convert_hslibs 1.6 +21 -14 hugs98/tests/testScript.in

1 0

cvs commit: hugs98/lib/hugs Sequence.hs
by Alastair Reid 02 Sep '01

02 Sep '01

reid 2001/09/02 13:20:00 PDT Removed files: lib/hugs Sequence.hs Log: Remove Sequence which is made redundant by Edison's ListSeq

1 0

cvs commit: hugs98/lib Time.hs
by Sigbjorn Finne 22 Aug '01

22 Aug '01

sof 2001/08/22 18:07:03 PDT Modified files: lib Time.hs Log: toCalendarTime: is an IO action, not a function. Revision Changes Path 1.2 +5 -5 hugs98/lib/Time.hs

1 0

cvs commit: hugs98/lib/hugs Quote.hs
by Jeff Lewis 22 Aug '01

22 Aug '01

lewie 2001/08/22 11:07:30 PDT Modified files: lib/hugs Quote.hs Log: Add `trim' - useful for laying out quoted documents that are indented in the source file (but not indented in the output). Revision Changes Path 1.3 +25 -1 hugs98/lib/hugs/Quote.hs

1 0

cvs commit: hugs98/src version.h
by Jeff Lewis 20 Aug '01

20 Aug '01

lewie 2001/08/20 06:31:54 PDT Modified files: src version.h Log: Turn off MAJOR_RELEASE flag. Revision Changes Path 1.15 +2 -2 hugs98/src/version.h

1 0

cvs commit: hugs98/src prelude.h
by Jeff Lewis 20 Aug '01

20 Aug '01

lewie 2001/08/20 06:29:22 PDT Modified files: src prelude.h Log: Bump stack size for large memory model (the default) to 160000. Revision Changes Path 1.25 +3 -3 hugs98/src/prelude.h

1 0

cvs commit: hugs98/lib/hugs Quote.hs hugs98/src connect.h hugs.c input.c prelude.h
by Jeff Lewis 20 Aug '01

20 Aug '01

lewie 2001/08/20 06:24:35 PDT Modified files: lib/hugs Quote.hs src connect.h hugs.c input.c prelude.h Log: Got tired of building a special version of hugs w/ here docs... now under control of a flag `:set +H' - not enabled by default. Revision Changes Path 1.2 +6 -0 hugs98/lib/hugs/Quote.hs 1.22 +3 -2 hugs98/src/connect.h 1.45 +9 -2 hugs98/src/hugs.c 1.27 +4 -3 hugs98/src/input.c 1.24 +4 -3 hugs98/src/prelude.h

1 0