diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-04-28 11:50:15 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-04-28 11:50:15 +0100 |
| commit | 5ccf658872ea2304f34eda6b1fb840fc1bfc0ba0 (patch) | |
| tree | 47e49e4456b062e140737418c034c2df1464b720 /compiler/prelude | |
| parent | 478e69b303eb2e653a2ebf5c888b5efdfef1fb9d (diff) | |
| parent | 51bbdda993815fc0c3e55cbfcc60ffd512b9d4bd (diff) | |
| download | haskell-5ccf658872ea2304f34eda6b1fb840fc1bfc0ba0.tar.gz | |
Merge remote branch 'origin/master' into monad-comp
Conflicts:
compiler/main/HscMain.lhs
Diffstat (limited to 'compiler/prelude')
| -rw-r--r-- | compiler/prelude/PrelRules.lhs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/prelude/PrelRules.lhs b/compiler/prelude/PrelRules.lhs index b37556be12..8f2d21f364 100644 --- a/compiler/prelude/PrelRules.lhs +++ b/compiler/prelude/PrelRules.lhs @@ -54,7 +54,7 @@ Well, of course you'd need a lot of rules if you did it like that, so we use a BuiltinRule instead, so that we can match in any two literal values. So the rule is really more like - (Lit 4) +# (Lit y) = Lit (x+#y) + (Lit x) +# (Lit y) = Lit (x+#y) where the (+#) on the rhs is done at compile time That is why these rules are built in here. Other rules |