diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-05-01 15:05:11 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-05-01 15:06:26 +0100 |
| commit | 2f6a0ac7061c59ed68a6dd5a2243e3e690acbd5f (patch) | |
| tree | 3a0cca1160b5479c3ef89f3df565ab470cd62e41 /testsuite/tests/ghci | |
| parent | de5d022e1543283effd67c2a03598e2bcaf49930 (diff) | |
| download | haskell-2f6a0ac7061c59ed68a6dd5a2243e3e690acbd5f.tar.gz | |
Move IP, Symbol, Nat to ghc-prim
This motivation is to declare class IP much earlier (in ghc-prim),
so that implicit parameters (which depend on IP) is available
to library code, notably the 'error' function.
* Move class IP from base:GHC.IP
to ghc-prim:GHC.Classes
* Delete module GHC.IP from base
* Move types Symbol and Nat
from base:GHC.TypeLits
to ghc-prim:GHC.Types
There was a name clash in GHC.RTS.Flags, where I renamed
the local type Nat to RtsNat.
Diffstat (limited to 'testsuite/tests/ghci')
| -rw-r--r-- | testsuite/tests/ghci/scripts/T9181.stdout | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/testsuite/tests/ghci/scripts/T9181.stdout b/testsuite/tests/ghci/scripts/T9181.stdout index 6b67785d0b..7e8b95af80 100644 --- a/testsuite/tests/ghci/scripts/T9181.stdout +++ b/testsuite/tests/ghci/scripts/T9181.stdout @@ -1,29 +1,29 @@ -type family (*) (a :: Nat) (b :: Nat) :: Nat
-type family (+) (a :: Nat) (b :: Nat) :: Nat
-type family (-) (a :: Nat) (b :: Nat) :: Nat
-type (<=) (x :: Nat) (y :: Nat) = (x <=? y) ~ 'True
-type family (<=?) (a :: Nat) (b :: Nat) :: Bool
-type family CmpNat (a :: Nat) (b :: Nat) :: Ordering
-type family CmpSymbol (a :: Symbol) (b :: Symbol) :: Ordering
-class KnownNat (n :: Nat) where
- natSing :: SNat n
-class KnownSymbol (n :: Symbol) where
- symbolSing :: SSymbol n
-data Nat
-data SomeNat where
- SomeNat :: KnownNat n => (Proxy n) -> SomeNat
-data SomeSymbol where
- SomeSymbol :: KnownSymbol n => (Proxy n) -> SomeSymbol
-data Symbol
-type family (^) (a :: Nat) (b :: Nat) :: Nat
-natVal :: KnownNat n => proxy n -> Integer
-natVal' :: KnownNat n => Proxy# n -> Integer
-sameNat ::
- (KnownNat a, KnownNat b) => Proxy a -> Proxy b -> Maybe (a :~: b)
-sameSymbol ::
- (KnownSymbol a, KnownSymbol b) =>
- Proxy a -> Proxy b -> Maybe (a :~: b)
-someNatVal :: Integer -> Maybe SomeNat
-someSymbolVal :: String -> SomeSymbol
-symbolVal :: KnownSymbol n => proxy n -> String
-symbolVal' :: KnownSymbol n => Proxy# n -> String
+type family (*) (a :: Nat) (b :: Nat) :: Nat +type family (+) (a :: Nat) (b :: Nat) :: Nat +type family (-) (a :: Nat) (b :: Nat) :: Nat +type (<=) (x :: Nat) (y :: Nat) = (x <=? y) ~ 'True +type family (<=?) (a :: Nat) (b :: Nat) :: Bool +type family CmpNat (a :: Nat) (b :: Nat) :: Ordering +type family CmpSymbol (a :: Symbol) (b :: Symbol) :: Ordering +class KnownNat (n :: Nat) where + natSing :: SNat n +class KnownSymbol (n :: Symbol) where + symbolSing :: SSymbol n +data SomeNat where + SomeNat :: KnownNat n => (Proxy n) -> SomeNat +data SomeSymbol where + SomeSymbol :: KnownSymbol n => (Proxy n) -> SomeSymbol +type family (^) (a :: Nat) (b :: Nat) :: Nat +natVal :: KnownNat n => proxy n -> Integer +natVal' :: KnownNat n => Proxy# n -> Integer +sameNat :: + (KnownNat a, KnownNat b) => Proxy a -> Proxy b -> Maybe (a :~: b) +sameSymbol :: + (KnownSymbol a, KnownSymbol b) => + Proxy a -> Proxy b -> Maybe (a :~: b) +someNatVal :: Integer -> Maybe SomeNat +someSymbolVal :: String -> SomeSymbol +symbolVal :: KnownSymbol n => proxy n -> String +symbolVal' :: KnownSymbol n => Proxy# n -> String +data Nat +data Symbol |