From: Tim Chevalier Date: Mon, 5 Jan 2009 19:24:34 +0000 (+0000) Subject: ext-core: twiddle primitive things X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=1718c708d577ddc87bd1a8774935189d4f0b418b ext-core: twiddle primitive things --- diff --git a/utils/ext-core/Language/Core/Core.hs b/utils/ext-core/Language/Core/Core.hs index 2b98ab7..f538ff2 100644 --- a/utils/ext-core/Language/Core/Core.hs +++ b/utils/ext-core/Language/Core/Core.hs @@ -210,7 +210,7 @@ mainPkg = P "main" primPkg = P $ zEncodeString "ghc-prim" ghcPrefix = ["GHC"] mainPrefix = [] -baseMname = mkBaseMname "Base" +baseMname = error "Somebody called baseMname!" -- mkBaseMname "Base" boolMname = mkPrimMname "Bool" mainVar = qual mainMname "main" wrapperMainVar = qual wrapperMainMname "main" @@ -287,3 +287,6 @@ flattenBinds :: [Vdefg] -> [Vdef] -- Get all the lhs/rhs pairs flattenBinds (Nonrec vd : binds) = vd : flattenBinds binds flattenBinds (Rec prs1 : binds) = prs1 ++ flattenBinds binds flattenBinds [] = [] + +unitMname :: AnMname +unitMname = mkPrimMname "Unit" diff --git a/utils/ext-core/Language/Core/Prims.hs b/utils/ext-core/Language/Core/Prims.hs index 13254d3..69e0cb9 100644 --- a/utils/ext-core/Language/Core/Prims.hs +++ b/utils/ext-core/Language/Core/Prims.hs @@ -99,12 +99,15 @@ tStatezh t = Tapp (Tcon tcStatezh) t {- Properly defined in PrelError, but needed in many modules before that. -} errorVals :: [(Var, Ty)] -errorVals = [ +errorVals = [] +{- + [ ("error", Tforall ("a",Kopen) (tArrow tString (Tvar "a"))), ("irrefutPatError", str2A), ("patError", str2A), ("divZZeroError", forallAA), ("overflowError", forallAA)] +-} {- Non-primitive, but mentioned in the types of primitives. -}