From: Ian Lynagh Date: Tue, 23 Nov 2010 23:35:36 +0000 (+0000) Subject: Remove references to Haskell 98 X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=46809fa91667e952afe016e4cd704b21274241b4 Remove references to Haskell 98 They are no longer right, as we have Haskell' generating new Haskell standards. --- diff --git a/ANNOUNCE b/ANNOUNCE index 416ec03..0c2b97f 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -49,9 +49,7 @@ system isn't available yet, please try again later. Background ~~~~~~~~~~ -Haskell is a standard lazy functional programming language; the -current language version is Haskell 98, agreed in December 1998 and -revised December 2002. +Haskell is a standard lazy functional programming language. GHC is a state-of-the-art programming suite for Haskell. Included is an optimising compiler generating good code for a variety of diff --git a/compiler/parser/LexCore.hs b/compiler/parser/LexCore.hs index 736450a..68b3419 100644 --- a/compiler/parser/LexCore.hs +++ b/compiler/parser/LexCore.hs @@ -86,7 +86,8 @@ lexNum cont cs = | isDigit c -> cont (TKrational (fromInteger sgn * r)) rest' where ((r,rest'):_) = readFloat (digits ++ ('.':c:rest)) -- When reading a floating-point number, which is - -- a bit complicated, use the Haskell 98 library function + -- a bit complicated, use the standard library function + -- "readFloat" (digits,rest) -> cont (TKinteger (sgn * (read digits))) rest lexName :: (a -> String -> b) -> (String -> a) -> String -> b diff --git a/compiler/parser/Parser.y.pp b/compiler/parser/Parser.y.pp index 8d561ba..9859949 100644 --- a/compiler/parser/Parser.y.pp +++ b/compiler/parser/Parser.y.pp @@ -1356,8 +1356,8 @@ aexp2 :: { LHsExpr RdrName } | RATIONAL { sL (getLoc $1) (HsOverLit $! mkHsFractional (getRATIONAL $1) placeHolderType) } -- N.B.: sections get parsed by these next two productions. - -- This allows you to write, e.g., '(+ 3, 4 -)', which isn't correct Haskell98 - -- (you'd have to write '((+ 3), (4 -))') + -- This allows you to write, e.g., '(+ 3, 4 -)', which isn't + -- correct Haskell (you'd have to write '((+ 3), (4 -))') -- but the less cluttered version fell out of having texps. | '(' texp ')' { LL (HsPar $2) } | '(' tup_exprs ')' { LL (ExplicitTuple $2 Boxed) } @@ -1417,8 +1417,8 @@ texp :: { LHsExpr RdrName } -- Note [Parsing sections] -- ~~~~~~~~~~~~~~~~~~~~~~~ -- We include left and right sections here, which isn't - -- technically right according to Haskell 98. For example - -- (3 +, True) isn't legal + -- technically right according to the Haskell standard. + -- For example (3 +, True) isn't legal. -- However, we want to parse bang patterns like -- (!x, !y) -- and it's convenient to do so here as a section diff --git a/compiler/types/TypeRep.lhs b/compiler/types/TypeRep.lhs index e80bd4d..8551409 100644 --- a/compiler/types/TypeRep.lhs +++ b/compiler/types/TypeRep.lhs @@ -584,7 +584,7 @@ pprTvBndr tv | isLiftedTypeKind kind = ppr tv Note [Infix type variables] ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In Haskell 98 you can say +With TypeOperators you can say f :: (a ~> b) -> b diff --git a/distrib/MacOS/GHC-relocatable.pmdoc/index.xml b/distrib/MacOS/GHC-relocatable.pmdoc/index.xml index f3ab818..8b76c1c 100644 --- a/distrib/MacOS/GHC-relocatable.pmdoc/index.xml +++ b/distrib/MacOS/GHC-relocatable.pmdoc/index.xml @@ -1,4 +1,4 @@ -Glasgow Haskell Compiler/Users/chak/Desktop/Glasgow Haskell Compiler.pkgorg.haskellThe Glasgow Haskell Compiler (GHC) is a state-of-the-art, open source, compiler and interactive environment for the functional language Haskell. GHC supports the entire Haskell 98 language plus a wide variety of extensions. GHC generates fast code, is available on a range of platforms, and includes an extensive set of libraries.build/Release/GHC.framework/Versions/609/ghc/LICENSEGlasgow Haskell Compiler/Users/chak/Desktop/Glasgow Haskell Compiler.pkgorg.haskellThe Glasgow Haskell Compiler (GHC) is a state-of-the-art, open source, compiler and interactive environment for the functional language Haskell. GHC supports the entire Haskell language plus a wide variety of extensions. GHC generates fast code, is available on a range of platforms, and includes an extensive set of libraries.build/Release/GHC.framework/Versions/609/ghc/LICENSEGlasgow Haskell Compiler/Users/bjs/Desktop/Glasgow Haskell Compiler.pkgorg.haskellThe Glasgow Haskell Compiler (GHC) is a state-of-the-art, open source, compiler and interactive environment for the functional language Haskell. GHC supports the entire Haskell 98 language plus a wide variety of extensions. GHC generates fast code, is available on a range of platforms, and includes an extensive set of libraries. For more information, please consult <http://haskell.org/ghc>.installer-docs/lambda-logo.pnginstaller-docs/license.htmlGlasgow Haskell Compiler/Users/bjs/Desktop/Glasgow Haskell Compiler.pkgorg.haskellThe Glasgow Haskell Compiler (GHC) is a state-of-the-art, open source, compiler and interactive environment for the functional language Haskell. GHC supports the entire Haskell language plus a wide variety of extensions. GHC generates fast code, is available on a range of platforms, and includes an extensive set of libraries. For more information, please consult <http://haskell.org/ghc>.installer-docs/lambda-logo.pnginstaller-docs/license.html - GHC (mostly) conforms to the Haskell 98 Foreign Function Interface - Addendum 1.0, whose definition is available from http://www.haskell.org/. + GHC (mostly) conforms to the Haskell Foreign Function Interface, + whose definition is part of the Haskell Report on http://www.haskell.org/. - To enable FFI support in GHC, give the + FFI support is enabled by default, but can be enabled or disabled explicitly with the flag. GHC implements a number of GHC-specific extensions to the FFI diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml index dab683a..172d6ff 100644 --- a/docs/users_guide/glasgow_exts.xml +++ b/docs/users_guide/glasgow_exts.xml @@ -3,8 +3,9 @@ language, GHC extensions, GHC As with all known Haskell systems, GHC implements some extensions to -the language. They are all enabled by options; by default GHC -understands only plain Haskell 98. +the language. They can all be enabled or disabled by commandline flags +or language pragmas. By default GHC understands the most recent Haskell +version it supports, plus a handful of extensions. @@ -39,8 +40,7 @@ documentation describes all the libraries that come with GHC. The language option flags control what variation of the language are - permitted. Leaving out all of them gives you standard Haskell - 98. + permitted. Language options can be controlled in two ways: @@ -439,10 +439,10 @@ Indeed, the bindings can even be recursive. 'x'# has type Char# "foo"# has type Addr# 3# has type Int#. In general, - any Haskell 98 integer lexeme followed by a # is an Int# literal, e.g. + any Haskell integer lexeme followed by a # is an Int# literal, e.g. -0x3A# as well as 32#. 3## has type Word#. In general, - any non-negative Haskell 98 integer lexeme followed by ## + any non-negative Haskell integer lexeme followed by ## is a Word#. 3.2# has type Float#. 3.2## has type Double# @@ -460,11 +460,11 @@ Indeed, the bindings can even be recursive. option. In the new syntax, the prefix form of a qualified operator is written module.(symbol) - (in Haskell 98 this would + (without NewQualifiedOperators this would be (module.symbol)), and the infix form is written `module.(symbol)` - (in Haskell 98 this would + (without NewQualifiedOperators this would be `module.symbol`. For example: @@ -476,13 +476,13 @@ Indeed, the bindings can even be recursive. like Prelude... For example, when NewQualifiedOperators is on, it is possible to write the enumerated sequence [Monday..] - without spaces, whereas in Haskell 98 this would be a + without spaces, whereas without NewQualifiedOperators this would be a reference to the operator ‘.‘ from module Monday. - When is on, the old Haskell - 98 syntax for qualified operators is not accepted, so this - option may cause existing Haskell 98 code to break. + When is on, the old + syntax for qualified operators is not accepted, so this + option may cause existing code to break. diff --git a/ghc/Main.hs b/ghc/Main.hs index 53a7af1..da2a1f2 100644 --- a/ghc/Main.hs +++ b/ghc/Main.hs @@ -639,7 +639,7 @@ showBanner _postLoadMode dflags = do when (verb >= 2) $ do hPutStr stderr "Glasgow Haskell Compiler, Version " hPutStr stderr cProjectVersion - hPutStr stderr ", for Haskell 98, stage " + hPutStr stderr ", stage " hPutStr stderr cStage hPutStr stderr " booted by GHC version " hPutStrLn stderr cBooterVersion diff --git a/includes/rts/FileLock.h b/includes/rts/FileLock.h index 17087db..a7d8d3c 100644 --- a/includes/rts/FileLock.h +++ b/includes/rts/FileLock.h @@ -2,7 +2,7 @@ * * (c) The GHC Team, 2007-2009 * - * File locking support as required by Haskell 98 + * File locking support as required by Haskell * * Do not #include this file directly: #include "Rts.h" instead. * diff --git a/mk/config.mk.in b/mk/config.mk.in index 6caece7..cc4d767 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -462,7 +462,6 @@ EXECUTABLE_FILE = chmod +x # $(GHC), $(HBC) and $(NHC) point to installed versions of the relevant # compilers, if available. # -# $(HC) is a generic Haskell 98 compiler, set to $(GHC) by default. # $(MKDEPENDHS) is the Haskell dependency generator (ghc -M). # # NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead diff --git a/rts/HsFFI.c b/rts/HsFFI.c index 57f91b1..38a520d 100644 --- a/rts/HsFFI.c +++ b/rts/HsFFI.c @@ -2,7 +2,7 @@ * * (c) The GHC Team, 2005 * - * RTS entry points as mandated by the FFI addendum to the Haskell 98 report + * RTS entry points as mandated by the FFI section of the Haskell report * * ---------------------------------------------------------------------------*/ diff --git a/rts/posix/FileLock.c b/rts/posix/FileLock.c index 7023b9e..cb36366 100644 --- a/rts/posix/FileLock.c +++ b/rts/posix/FileLock.c @@ -2,7 +2,7 @@ * * (c) The GHC Team, 2007 * - * File locking support as required by Haskell 98 + * File locking support as required by Haskell * * ---------------------------------------------------------------------------*/ diff --git a/rts/posix/FileLock.h b/rts/posix/FileLock.h index 508cee8..72ab170 100644 --- a/rts/posix/FileLock.h +++ b/rts/posix/FileLock.h @@ -2,7 +2,7 @@ * * (c) The GHC Team, 2007 * - * File locking support as required by Haskell 98 + * File locking support as required by Haskell * * ---------------------------------------------------------------------------*/