[commit: ghc] master: Fake (->) fixity declaration (#10145) (0721e55)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0721e552b863c28ffb5920c70b208947831c3dc2/ghc

>---------------------------------------------------------------

commit 0721e552b863c28ffb5920c70b208947831c3dc2
Author: Oleg Grenrus <oleg.grenrus at iki.fi>
Date:   Thu Apr 2 11:28:03 2015 +0200

    Fake (->) fixity declaration (#10145)
    
    Reviewed By: simonpj, austin
    
    Differential Revision: https://phabricator.haskell.org/D741


>---------------------------------------------------------------

0721e552b863c28ffb5920c70b208947831c3dc2
 compiler/iface/LoadIface.hs                                             | 2 ++
 testsuite/tests/ghci/scripts/T8535.stdout                               | 1 +
 testsuite/tests/ghci/scripts/ghci020.stdout                             | 1 +
 .../tests/ghci/{scripts/ghci020.script => should_run/T10145.script}     | 0
 testsuite/tests/ghci/{scripts/T8535.stdout => should_run/T10145.stdout} | 1 +
 testsuite/tests/ghci/should_run/all.T                                   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/compiler/iface/LoadIface.hs b/compiler/iface/LoadIface.hs
index 169e929..cfb8a11 100644
--- a/compiler/iface/LoadIface.hs
+++ b/compiler/iface/LoadIface.hs
@@ -46,6 +46,7 @@ import PrelNames
 import PrelInfo
 import PrimOp   ( allThePrimOps, primOpFixity, primOpOcc )
 import MkId     ( seqId )
+import TysPrim  ( funTyConName )
 import Rules
 import TyCon
 import Annotations
@@ -871,6 +872,7 @@ ghcPrimIface
     }
   where
     fixities = (getOccName seqId, Fixity 0 InfixR)  -- seq is infixr 0
+             : (occName funTyConName, funTyFixity)  -- trac #10145
              : mapMaybe mkFixity allThePrimOps
     mkFixity op = (,) (primOpOcc op) <$> primOpFixity op
 
diff --git a/testsuite/tests/ghci/scripts/T8535.stdout b/testsuite/tests/ghci/scripts/T8535.stdout
index 749a244..2f35e23 100644
--- a/testsuite/tests/ghci/scripts/T8535.stdout
+++ b/testsuite/tests/ghci/scripts/T8535.stdout
@@ -1,4 +1,5 @@
 data (->) a b 	-- Defined in ‘GHC.Prim’
+infixr 0 `(->)`
 instance Monad ((->) r) -- Defined in ‘GHC.Base’
 instance Functor ((->) r) -- Defined in ‘GHC.Base’
 instance Applicative ((->) a) -- Defined in ‘GHC.Base’
diff --git a/testsuite/tests/ghci/scripts/ghci020.stdout b/testsuite/tests/ghci/scripts/ghci020.stdout
index 749a244..2f35e23 100644
--- a/testsuite/tests/ghci/scripts/ghci020.stdout
+++ b/testsuite/tests/ghci/scripts/ghci020.stdout
@@ -1,4 +1,5 @@
 data (->) a b 	-- Defined in ‘GHC.Prim’
+infixr 0 `(->)`
 instance Monad ((->) r) -- Defined in ‘GHC.Base’
 instance Functor ((->) r) -- Defined in ‘GHC.Base’
 instance Applicative ((->) a) -- Defined in ‘GHC.Base’
diff --git a/testsuite/tests/ghci/scripts/ghci020.script b/testsuite/tests/ghci/should_run/T10145.script
similarity index 100%
copy from testsuite/tests/ghci/scripts/ghci020.script
copy to testsuite/tests/ghci/should_run/T10145.script
diff --git a/testsuite/tests/ghci/scripts/T8535.stdout b/testsuite/tests/ghci/should_run/T10145.stdout
similarity index 94%
copy from testsuite/tests/ghci/scripts/T8535.stdout
copy to testsuite/tests/ghci/should_run/T10145.stdout
index 749a244..2f35e23 100644
--- a/testsuite/tests/ghci/scripts/T8535.stdout
+++ b/testsuite/tests/ghci/should_run/T10145.stdout
@@ -1,4 +1,5 @@
 data (->) a b 	-- Defined in ‘GHC.Prim’
+infixr 0 `(->)`
 instance Monad ((->) r) -- Defined in ‘GHC.Base’
 instance Functor ((->) r) -- Defined in ‘GHC.Base’
 instance Applicative ((->) a) -- Defined in ‘GHC.Base’
diff --git a/testsuite/tests/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T
index b28e4a3..cd5b1f2 100644
--- a/testsuite/tests/ghci/should_run/all.T
+++ b/testsuite/tests/ghci/should_run/all.T
@@ -22,3 +22,4 @@ test('ghcirun004', just_ghci, compile_and_run, [''])
 test('T8377',      just_ghci, compile_and_run, [''])
 test('T9914',      just_ghci, ghci_script, ['T9914.script'])
 test('T9915',      just_ghci, ghci_script, ['T9915.script'])
+test('T10145',     just_ghci, ghci_script, ['T10145.script'])