Commit 74775c6b authored by simonpj's avatar simonpj
Browse files

[project @ 2003-02-04 12:40:00 by simonpj]

Make utils/genprimopcode recognise the type ().
    It was previously written 'Unit', which is easily
    confused with the type 'Unit' (used for generic
    derived instances).
parent e6d00492
-----------------------------------------------------------------------
-- $Id: primops.txt.pp,v 1.23 2002/12/11 15:36:35 simonmar Exp $
-- $Id: primops.txt.pp,v 1.24 2003/02/04 12:40:00 simonpj Exp $
--
-- Primitive Operations
--
......@@ -1481,7 +1481,7 @@ primop DeRefWeakOp "deRefWeak#" GenPrimOp
primop FinalizeWeakOp "finalizeWeak#" GenPrimOp
Weak# a -> State# RealWorld -> (# State# RealWorld, Int#,
(State# RealWorld -> (# State# RealWorld, Unit #)) #)
(State# RealWorld -> (# State# RealWorld, () #)) #)
with
usage = { mangle FinalizeWeakOp [mkM, mkP]
(mkR . (inUB FinalizeWeakOp
......
......@@ -383,7 +383,7 @@ ppType (TyApp "RealWorld" []) = "realWorldTy"
ppType (TyApp "ThreadId#" []) = "threadIdPrimTy"
ppType (TyApp "ForeignObj#" []) = "foreignObjPrimTy"
ppType (TyApp "BCO#" []) = "bcoPrimTy"
ppType (TyApp "Unit" []) = "unitTy" -- dodgy
ppType (TyApp "()" []) = "unitTy" -- unitTy is TysWiredIn's name for ()
ppType (TyVar "a") = "alphaTy"
......@@ -647,7 +647,7 @@ ppT = alts [apply TyVar pTyvar,
]
pTyvar = sat (`notElem` ["section","primop","with"]) pName
pTycon = pConstructor
pTycon = alts [pConstructor, lexeme (string "()")]
pName = lexeme (then2 (:) lower (many isIdChar))
pConstructor = lexeme (then2 (:) upper (many isIdChar))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment