projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8c25494
)
fix definition of fib in example code
author
Simon Marlow
<simonmar@microsoft.com>
Thu, 12 Oct 2006 11:07:11 +0000
(11:07 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Thu, 12 Oct 2006 11:07:11 +0000
(11:07 +0000)
docs/users_guide/parallel.xml
patch
|
blob
|
history
diff --git
a/docs/users_guide/parallel.xml
b/docs/users_guide/parallel.xml
index
3d14622
..
7792ea6
100644
(file)
--- a/
docs/users_guide/parallel.xml
+++ b/
docs/users_guide/parallel.xml
@@
-136,7
+136,7
@@
import Control.Parallel
nfib :: Int -> Int
nfib n | n <= 1 = 1
nfib :: Int -> Int
nfib n | n <= 1 = 1
- | otherwise = par n1 (seq n2 (n1 + n2 + 1))
+ | otherwise = par n1 (seq n2 (n1 + n2))
where n1 = nfib (n-1)
n2 = nfib (n-2)</programlisting>
where n1 = nfib (n-1)
n2 = nfib (n-2)</programlisting>
@@
-149,8
+149,8
@@
nfib n | n <= 1 = 1
(leaving the parent to evaluate the other branch). Also, we must use
<function>seq</function> to ensure that the parent will evaluate
<varname>n2</varname> <emphasis>before</emphasis> <varname>n1</varname>
(leaving the parent to evaluate the other branch). Also, we must use
<function>seq</function> to ensure that the parent will evaluate
<varname>n2</varname> <emphasis>before</emphasis> <varname>n1</varname>
- in the expression <literal>(n1 + n2 + 1)</literal>. It is not sufficient
- to reorder the expression as <literal>(n2 + n1 + 1)</literal>, because
+ in the expression <literal>(n1 + n2)</literal>. It is not sufficient
+ to reorder the expression as <literal>(n2 + n1)</literal>, because
the compiler may not generate code to evaluate the addends from left to
right.</para>
the compiler may not generate code to evaluate the addends from left to
right.</para>