Skip to content

GitLab

GHC
GHC
Commit 46809fa9 authored by Ian Lynagh's avatar Ian Lynagh
Browse files
Options

Remove references to Haskell 98 

They are no longer right, as we have Haskell' generating new Haskell
standards.
parent b56d7878
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 32 deletions
ANNOUNCE
View file @ 46809fa9
......@@ -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
......
compiler/parser/LexCore.hs
View file @ 46809fa9
......@@ -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
......
compiler/parser/Parser.y.pp
View file @ 46809fa9
......@@ -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
......
compiler/types/TypeRep.lhs
View file @ 46809fa9
......@@ -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
......
distrib/MacOS/GHC-relocatable.pmdoc/index.xml
View file @ 46809fa9
<pkmkdoc spec="1.12"><properties><title>Glasgow Haskell Compiler</title><build>/Users/chak/Desktop/Glasgow Haskell Compiler.pkg</build><organization>org.haskell</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true" system="true" user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>The 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.</description><contents><choice title="GHC" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.haskell.ghc.pkg"/><choice-reqs><requirement id="file" operator="eq" value="true" selected="no" enabled="no" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>/usr/bin/gcc-4.0</file></requirement></choice-reqs></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="de"/><locale lang="en"><resource relative="true" mod="true" type="license">build/Release/GHC.framework/Versions/609/ghc/LICENSE</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949
<pkmkdoc spec="1.12"><properties><title>Glasgow Haskell Compiler</title><build>/Users/chak/Desktop/Glasgow Haskell Compiler.pkg</build><organization>org.haskell</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true" system="true" user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>The 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.</description><contents><choice title="GHC" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.haskell.ghc.pkg"/><choice-reqs><requirement id="file" operator="eq" value="true" selected="no" enabled="no" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>/usr/bin/gcc-4.0</file></requirement></choice-reqs></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="de"/><locale lang="en"><resource relative="true" mod="true" type="license">build/Release/GHC.framework/Versions/609/ghc/LICENSE</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
......
distrib/MacOS/GHC-system.pmdoc/index.xml.in
View file @ 46809fa9
<pkmkdoc spec="1.12"><properties><title>Glasgow Haskell Compiler</title><build>/Users/bjs/Desktop/Glasgow Haskell Compiler.pkg</build><organization>org.haskell</organization><userSees ui="easy"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>The 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 &lt;http://haskell.org/ghc>.</description><contents><choice title="GHC" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.haskell.ghc.pkg"/><choice-reqs><requirement id="file" operator="eq" value="true" selected="no" enabled="no" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>/usr/bin/gcc</file></requirement></choice-reqs></choice></contents><resources bg-scale="none" bg-align="center"><locale lang="en"><resource relative="true" mod="true" type="background">installer-docs/lambda-logo.png</resource><resource relative="true" mod="true" type="license">installer-docs/license.html</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290
<pkmkdoc spec="1.12"><properties><title>Glasgow Haskell Compiler</title><build>/Users/bjs/Desktop/Glasgow Haskell Compiler.pkg</build><organization>org.haskell</organization><userSees ui="easy"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>The 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 &lt;http://haskell.org/ghc>.</description><contents><choice title="GHC" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.haskell.ghc.pkg"/><choice-reqs><requirement id="file" operator="eq" value="true" selected="no" enabled="no" hidden="unchanged" startSelected="unchanged" startEnabled="unchanged" startHidden="unchanged"><file>/usr/bin/gcc</file></requirement></choice-reqs></choice></contents><resources bg-scale="none" bg-align="center"><locale lang="en"><resource relative="true" mod="true" type="background">installer-docs/lambda-logo.png</resource><resource relative="true" mod="true" type="license">installer-docs/license.html</resource><resource mime-type="text/rtf" kind="embedded" type="welcome"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
......
docs/users_guide/ffi-chap.xml
View file @ 46809fa9
......@@ -6,10 +6,10 @@
Foreign function interface (FFI)
</title>
<para>GHC (mostly) conforms to the Haskell 98 Foreign Function Interface
Addendum 1.0, whose definition is available from <ulink url="http://www.haskell.org/"><literal>http://www.haskell.org/</literal></ulink>.</para>
<para>GHC (mostly) conforms to the Haskell Foreign Function Interface,
whose definition is part of the Haskell Report on <ulink url="http://www.haskell.org/"><literal>http://www.haskell.org/</literal></ulink>.</para>
<para>To enable FFI support in GHC, give the <option>-XForeignFunctionInterface</option><indexterm><primary><option>-XForeignFunctionInterface</option></primary>
<para>FFI support is enabled by default, but can be enabled or disabled explicitly with the <option>-XForeignFunctionInterface</option><indexterm><primary><option>-XForeignFunctionInterface</option></primary>
</indexterm> flag.</para>
<para>GHC implements a number of GHC-specific extensions to the FFI
......
docs/users_guide/glasgow_exts.xml
View file @ 46809fa9
......@@ -3,8 +3,9 @@
<indexterm><primary>language, GHC</primary></indexterm>
<indexterm><primary>extensions, GHC</primary></indexterm>
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.
</para>
<para>
......@@ -39,8 +40,7 @@ documentation</ulink> describes all the libraries that come with GHC.
</indexterm>
<para>The language option flags control what variation of the language are
permitted. Leaving out all of them gives you standard Haskell
98.</para>
permitted.</para>
<para>Language options can be controlled in two ways:
<itemizedlist>
......@@ -439,10 +439,10 @@ Indeed, the bindings can even be recursive.
<listitem><para> <literal>'x'&num;</literal> has type <literal>Char&num;</literal></para> </listitem>
<listitem><para> <literal>&quot;foo&quot;&num;</literal> has type <literal>Addr&num;</literal></para> </listitem>
<listitem><para> <literal>3&num;</literal> has type <literal>Int&num;</literal>. In general,
any Haskell 98 integer lexeme followed by a <literal>&num;</literal> is an <literal>Int&num;</literal> literal, e.g.
any Haskell integer lexeme followed by a <literal>&num;</literal> is an <literal>Int&num;</literal> literal, e.g.
<literal>-0x3A&num;</literal> as well as <literal>32&num;</literal></para>.</listitem>
<listitem><para> <literal>3&num;&num;</literal> has type <literal>Word&num;</literal>. In general,
any non-negative Haskell 98 integer lexeme followed by <literal>&num;&num;</literal>
any non-negative Haskell integer lexeme followed by <literal>&num;&num;</literal>
is a <literal>Word&num;</literal>. </para> </listitem>
<listitem><para> <literal>3.2&num;</literal> has type <literal>Float&num;</literal>.</para> </listitem>
<listitem><para> <literal>3.2&num;&num;</literal> has type <literal>Double&num;</literal></para> </listitem>
......@@ -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 <literal><replaceable>module</replaceable>.(<replaceable>symbol</replaceable>)</literal>
(in Haskell 98 this would
(without NewQualifiedOperators this would
be <literal>(<replaceable>module</replaceable>.<replaceable>symbol</replaceable>)</literal>),
and the infix form is
written <literal>`<replaceable>module</replaceable>.(<replaceable>symbol</replaceable>)`</literal>
(in Haskell 98 this would
(without NewQualifiedOperators this would
be <literal>`<replaceable>module</replaceable>.<replaceable>symbol</replaceable>`</literal>.
For example:
<programlisting>
......@@ -476,13 +476,13 @@ Indeed, the bindings can even be recursive.
like <literal>Prelude..</literal>. For example,
when <literal>NewQualifiedOperators</literal> is on, it is possible to
write the enumerated sequence <literal>[Monday..]</literal>
without spaces, whereas in Haskell 98 this would be a
without spaces, whereas without NewQualifiedOperators this would be a
reference to the operator &lsquo;<literal>.</literal>&lsquo;
from module <literal>Monday</literal>.</para>
<para>When <option>-XNewQualifiedOperators</option> is on, the old Haskell
98 syntax for qualified operators is not accepted, so this
option may cause existing Haskell 98 code to break.</para>
<para>When <option>-XNewQualifiedOperators</option> is on, the old
syntax for qualified operators is not accepted, so this
option may cause existing code to break.</para>
</sect2>
......
ghc/Main.hs
View file @ 46809fa9
......@@ -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
......
includes/rts/FileLock.h
View file @ 46809fa9
......@@ -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.
*
......
mk/config.mk.in
View file @ 46809fa9
......@@ -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
......
rts/HsFFI.c
View file @ 46809fa9
......@@ -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
*
* ---------------------------------------------------------------------------*/
......
rts/posix/FileLock.c
View file @ 46809fa9
......@@ -2,7 +2,7 @@
*
* (c) The GHC Team, 2007
*
* File locking support as required by Haskell 98
* File locking support as required by Haskell
*
* ---------------------------------------------------------------------------*/
......
rts/posix/FileLock.h
View file @ 46809fa9
......@@ -2,7 +2,7 @@
*
* (c) The GHC Team, 2007
*
* File locking support as required by Haskell 98
* File locking support as required by Haskell
*
* ---------------------------------------------------------------------------*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment