data constructors
- There are tWO classes for each Constructor
(1) - Class with the payload extends the relevent datatype baseclass.
- - This class has the prefix zdw ($W)
+ - This class has the prefix zdw ($w)
(2) - Constructor *wrapper* just use their own name.
- Constructors are upper case, so never clash with keywords
- So Foo would become 2 classes.
* Foo -- the constructor wrapper
* zdwFoo -- the worker, with the payload
+
+$i for instances.
+$k for keyword nameclash avoidance.
+
\begin{code}
module JavaGen( javaGen ) where
import Java
import Literal ( Literal(..) )
-import Id ( Id, isDataConId_maybe, isId, idName, isDeadBinder, idPrimRep )
-import Name ( NamedThing(..), getOccString, isGlobalName
+import Id ( Id, isDataConWorkId_maybe, isId, idName, isDeadBinder, idPrimRep
+ , isPrimOpId_maybe )
+import Name ( NamedThing(..), getOccString, isExternalName, isInternalName
, nameModule )
import PrimRep ( PrimRep(..) )
-import DataCon ( DataCon, dataConRepArity, dataConRepArgTys, dataConId )
-import qualified TypeRep
+import DataCon ( DataCon, dataConRepArity, dataConRepArgTys, dataConWorkId )
import qualified Type
import qualified CoreSyn
import CoreSyn ( CoreBind, CoreExpr, CoreAlt, CoreBndr,
- Bind(..), Alt, AltCon(..), collectBinders, isValArg
+ Bind(..), AltCon(..), collectBinders, isValArg
)
+import TysWiredIn ( boolTy, trueDataCon, falseDataCon )
import qualified CoreUtils
import Module ( Module, moduleString )
import TyCon ( TyCon, isDataTyCon, tyConDataCons )
import Outputable
+import Maybe
+import PrimOp
+import Util ( lengthIs, notNull )
+
#include "HsVersions.h"
\end{code}
javaGen :: Module -> [Module] -> [TyCon] -> [CoreBind] -> CompilationUnit
javaGen mod import_mods tycons binds
- = id {-liftCompilationUnit-} package
+ = liftCompilationUnit package
where
decls = [Import "haskell.runtime.*"] ++
[Import (moduleString mod) | mod <- import_mods] ++
\begin{code}
javaVar :: Id -> Expr
-javaVar v | isGlobalName (idName v) = mkNew (javaIdType v) []
+javaVar v | isExternalName (idName v) = mkNew (javaIdType v) []
| otherwise = Var (javaName v)
javaLit :: Literal.Literal -> Expr
javaLit (MachInt i) = Literal (IntLit (fromInteger i))
-javaLit (MachChar c) = Literal (CharLit c)
+javaLit (MachChar c) = Literal (CharLit c)
+javaLit (MachStr fs) = Literal (StringLit str)
+ where
+ str = concatMap renderString (unpackFS fs) ++ "\\000"
+ -- This should really handle all the chars 0..31.
+ renderString '\NUL' = "\\000"
+ renderString other = [other]
+
javaLit other = pprPanic "javaLit" (ppr other)
-- Pass in the 'shape' of the result.
-- final Object p = ((Cons) x).f1
-- final Object q = ((Cons) x).f2
-- ...translation of r2...
--- } else return null
+-- } else throw java.lang.Exception
+
+-- This first special case happens a lot, typically
+-- during dictionary deconstruction.
+-- We need to access at least *one* field, to check to see
+-- if we have correct constructor.
+-- If we've got the wrong one, this is _|_, and the
+-- casting will catch this with an exception.
+
+javaCase r e x [(DataAlt d,bs,rhs)] | notNull bs
+ = java_expr PushExpr e ++
+ [ var [Final] (javaName x)
+ (whnf primRep (vmPOP (primRepToType primRep))) ] ++
+ bind_args d bs ++
+ javaExpr r rhs
+ where
+ primRep = idPrimRep x
+ whnf PtrRep = vmWHNF -- needs evaluation
+ whnf _ = id -- anything else does notg
+ bind_args d bs = [var [Final] (javaName b)
+ (Access (Cast (javaConstrWkrType d) (javaVar x)
+ ) f
+ )
+ | (b,f) <- filter isId bs `zip` (constrToFields d)
+ , not (isDeadBinder b)
+ ]
+
javaCase r e x alts
- -- TODO: This will need to map prims to "haskell.runtime.Value".
- = javaArg Nothing e ++
- [ var [Final] (javaName x)
- (whnf primRep (vmPOP (primRepToType primRep)))
- , IfThenElse (map mk_alt alts) (Just (Return javaNull))
- ]
+ | isIfThenElse && isPrimCmp
+ = javaIfThenElse r (fromJust maybePrim) tExpr fExpr
+ | otherwise
+ = java_expr PushExpr e ++
+ [ var [Final] (javaName x)
+ (whnf primRep (vmPOP (primRepToType primRep)))
+ , IfThenElse (map mk_alt con_alts) (Just default_code)
+ ]
where
+ isIfThenElse = CoreUtils.exprType e `Type.eqType` boolTy
+ -- also need to check that x is not free in
+ -- any of the branches.
+ maybePrim = findCmpPrim e []
+ isPrimCmp = isJust maybePrim
+ (_,_,tExpr) = CoreUtils.findAlt (DataAlt trueDataCon) alts
+ (_,_,fExpr) = CoreUtils.findAlt (DataAlt falseDataCon) alts
+
primRep = idPrimRep x
whnf PtrRep = vmWHNF -- needs evaluation
whnf _ = id
- mk_alt (DEFAULT, [], rhs) = (true, Block (javaExpr r rhs))
- mk_alt (DataAlt d, bs, rhs) = (instanceOf x d, Block (bind_args d bs ++ javaExpr r rhs))
- mk_alt alt@(LitAlt lit, [], rhs)
- = (eqLit lit , Block (javaExpr r rhs))
- mk_alt alt@(LitAlt _, _, _) = pprPanic "mk_alt" (ppr alt)
+ (con_alts, maybe_default) = CoreUtils.findDefault alts
+ default_code = case maybe_default of
+ Nothing -> ExprStatement (Raise excName [Literal (StringLit "case failure")])
+ Just rhs -> Block (javaExpr r rhs)
+
+ mk_alt (DataAlt d, bs, rhs) = (instanceOf x d, Block (bind_args d bs ++ javaExpr r rhs))
+ mk_alt (LitAlt lit, bs, rhs) = (eqLit lit , Block (javaExpr r rhs))
eqLit (MachInt n) = Op (Literal (IntLit n))
+
"=="
(Var (javaName x))
eqLit (MachChar n) = Op (Literal (CharLit n))
, not (isDeadBinder b)
]
+javaIfThenElse r cmp tExpr fExpr
+{-
+ - Now what we need to do is generate code for the if/then/else.
+ - [all arguments are already check for simpleness (Var or Lit).]
+ -
+ - if (<prim> arg1 arg2 arg3 ...) {
+ - trueCode
+ - } else {
+ - falseCode
+ - }
+ -}
+ = [IfThenElse [(cmp,j_tExpr)] (Just j_fExpr)]
+ where
+ j_tExpr, j_fExpr :: Statement
+ j_tExpr = Block (javaExpr r tExpr)
+ j_fExpr = Block (javaExpr r fExpr)
+
javaBind (NonRec x rhs)
{-
x = ...rhs_x...
final Object x = new Thunk( new Code() { ...code for rhs_x... } )
-}
- = javaArg (Just name) rhs
+ = java_expr (SetVar name) rhs
where
name = case coreTypeToType rhs of
ty@(PrimType _) -> javaName x `withType` ty
- _ -> javaName x `withType` thunkType
+ _ -> javaName x `withType` codeType
javaBind (Rec prs)
{- rec { x = ...rhs_x...; y = ...rhs_y... }
stmts = [Field [] (javaName b `withType` codeType) Nothing | (b,_) <- prs] ++
[Method [Public] enterName [vmArg] [excName] (javaExpr vmRETURN r)]
- mk_inst (b,r) = var [Final] (javaInstName b)
- (mkNew (javaIdType b) [])
+ mk_inst (b,r) = var [Final] name (mkNew ty [])
+ where
+ name@(Name _ ty) = javaInstName b
- mk_thunk (b,r) = var [Final] (javaName b `withType` thunkType)
- (New thunkType [Var (javaInstName b)] Nothing)
+ mk_thunk (b,r) = var [Final] (javaName b `withType` codeType)
+ (mkNew thunkType [Var (javaInstName b)])
mk_knot (b,_) = [ ExprStatement (Assign lhs rhs)
| (b',_) <- prs,
let rhs = Var (javaName b')
]
--- We are needlessly
javaLam :: (Expr -> Statement) -> ([CoreBndr], CoreExpr) -> [Statement]
javaLam r (bndrs, body)
| null val_bndrs = javaExpr r body
val_bndrs = map javaName (filter isId bndrs)
javaApp :: (Expr -> Statement) -> CoreExpr -> [CoreExpr] -> [Statement]
-javaApp r (CoreSyn.App f a) as = javaApp r f (a:as)
-javaApp r (CoreSyn.Var f) as
- = case isDataConId_maybe f of {
- Just dc | length as == dataConRepArity dc
- -> -- Saturated constructors
- -- never returning a primitive at this point
- javaArgs as ++
- [Return (New (javaIdType f)
- (javaPops as)
- Nothing)]
- ; other -> -- Not a saturated constructor
- java_apply r (CoreSyn.Var f) as
+javaApp r (CoreSyn.App f a) as
+ | isValArg a = javaApp r f (a:as)
+ | otherwise = javaApp r f as
+javaApp r (CoreSyn.Var f) as
+ = case isDataConWorkId_maybe f of {
+ Just dc | as `lengthIs` dataConRepArity dc
+ -- NOTE: Saturated constructors never returning a primitive at this point
+ --
+ -- We push the arguments backwards, because we are using
+ -- the (ugly) semantics of the order of evaluation of arguments,
+ -- to avoid making up local names. Oh to have a namesupply...
+ --
+ -> javaArgs (reverse as) ++
+ [r (New (javaIdType f)
+ (javaPops as)
+ Nothing
+ )
+ ]
+ | otherwise ->
+ -- build a local
+ let stmts =
+ vmCOLLECT (dataConRepArity dc) this ++
+ [ vmRETURN
+ (New (javaIdType f)
+ [ vmPOP ty | (Name _ ty) <- constrToFields dc ]
+ Nothing
+ )
+ ]
+ in javaArgs (reverse as) ++ [r (newCode stmts)]
+ ; other -> java_apply r (CoreSyn.Var f) as
}
javaApp r f as = java_apply r f as
-- of pushing values (perhaps thunks) onto the stack.
javaArgs :: [CoreExpr] -> [Statement]
-javaArgs args = concat [ javaArg Nothing a | a <- args, isValArg a]
+javaArgs args = concat [ java_expr PushExpr a | a <- args, isValArg a]
javaPops :: [CoreExpr] -> [Expr]
javaPops args = [ vmPOP (primRepToType (Type.typePrimRep (CoreUtils.exprType a)))
, isValArg a
]
--- The arg's might or might not be thunkable.
+
-- The result is a list of statments that have the effect of
-- pushing onto the stack (via one of the VM.PUSH* commands)
--- the argument, perhaps thunked.
-
--- Later: this might take an argument that allows assignment
--- into a variable rather than pushing onto the stack.
-
-javaArg :: Maybe Name -> CoreExpr -> [Statement]
-javaArg _ (CoreSyn.Type t) = pprPanic "javaArg" (ppr t)
-javaArg ret e
+-- the argument, (or returning, or setting a variable)
+-- perhaps thunked.
+
+{- This is mixing two things.
+ (1) Optimizations for things like primitives, whnf calls, etc.
+ (2) If something needs a thunk constructor round it.
+ - Seperate them at some point!
+ -}
+data ExprRetStyle = SetVar Name | PushExpr | ReturnExpr
+
+java_expr :: ExprRetStyle -> CoreExpr -> [Statement]
+java_expr _ (CoreSyn.Type t) = pprPanic "java_expr" (ppr t)
+java_expr ret e
+ | isPrimCall = [push (fromJust maybePrim)]
+ -- This is a shortcut,
+ -- basic names and literals do not need a code block
+ -- to compute the value.
| isPrim primty && CoreUtils.exprIsTrivial e = javaExpr push e
- | isPrim primty =
+ | isPrim primty =
let expr = javaExpr vmRETURN e
code = access (vmWHNF (newCode expr)) (primRepToType primty)
in [push code]
else newThunk code
in [push code']
where
+ maybePrim = findFnPrim e []
+ isPrimCall = isJust maybePrim
+
push e = case ret of
- Just name -> var [Final] name e
- Nothing -> vmPUSH e
+ SetVar name -> var [Final] name e
+ PushExpr -> vmPUSH e
+ ReturnExpr -> vmRETURN e
corety = CoreUtils.exprType e
primty = Type.typePrimRep corety
- isPrim PtrRep = False
- isPrim IntRep = True
- isPrim CharRep = True
+ isPrim PtrRep = False -- only this needs updated
+ isPrim _ = True
coreTypeToType = primRepToType . Type.typePrimRep . CoreUtils.exprType
+
+renameForKeywords :: (NamedThing name) => name -> String
+renameForKeywords name
+ | str `elem` keywords = "zdk" ++ str
+ | otherwise = str
+ where
+ str = getOccString name
+
+keywords :: [String]
+keywords =
+ [ "return"
+ , "if"
+ , "then"
+ , "else"
+ , "class"
+ , "instance"
+ , "import"
+ , "throw"
+ , "try"
+ ]
+
\end{code}
%************************************************************************
ty = exprType e
var :: [Modifier] -> Name -> Expr -> Statement
-var ms field_name value = Declaration (Field ms field_name (Just value))
+var ms field_name@(Name _ ty) value
+ | exprType value == ty = Declaration (Field ms field_name (Just value))
+ | otherwise = var ms field_name (Cast ty value)
vmWHNF :: Expr -> Expr
vmWHNF e = Call varVM whnfName [e]
suffix _ = ""
primName :: PrimType -> String
-primName PrimInt = "int"
-primName PrimChar = "char"
-primName _ = error "unsupported primitive"
+primName PrimInt = "int"
+primName PrimChar = "char"
+primName PrimByte = "byte"
+primName PrimBoolean = "boolean"
+primName _ = error "unsupported primitive"
varVM :: Expr
varVM = Var vmName
vmArg :: Parameter
vmArg = Parameter [Final] vmName
+
+-- This is called with boolean compares, checking
+-- to see if we can do an obvious shortcut.
+-- If there is, we return a (GOO) expression for doing this,
+
+-- So if, we have case (#< x y) of { True -> e1; False -> e2 },
+-- we will call findCmpFn with (#< x y), this return Just (Op x "<" y)
+
+findCmpPrim :: CoreExpr -> [Expr] -> Maybe Expr
+findCmpPrim (CoreSyn.App f a) as =
+ case a of
+ CoreSyn.Var v -> findCmpPrim f (javaVar v:as)
+ CoreSyn.Lit l -> findCmpPrim f (javaLit l:as)
+ _ -> Nothing
+findCmpPrim (CoreSyn.Var p) as =
+ case isPrimOpId_maybe p of
+ Just prim -> find_cmp_prim prim as
+ Nothing -> Nothing
+findCmpPrim _ as = Nothing
+
+find_cmp_prim cmpPrim args@[a,b] =
+ case cmpPrim of
+ IntGtOp -> fn ">"
+ IntGeOp -> fn ">="
+ IntEqOp -> fn "=="
+ IntNeOp -> fn "/="
+ IntLtOp -> fn "<"
+ IntLeOp -> fn "<="
+ _ -> Nothing
+ where
+ fn op = Just (Op a op b)
+find_cmp_prim _ _ = Nothing
+
+findFnPrim :: CoreExpr -> [Expr] -> Maybe Expr
+findFnPrim (CoreSyn.App f a) as =
+ case a of
+ CoreSyn.Var v -> findFnPrim f (javaVar v:as)
+ CoreSyn.Lit l -> findFnPrim f (javaLit l:as)
+ _ -> Nothing
+findFnPrim (CoreSyn.Var p) as =
+ case isPrimOpId_maybe p of
+ Just prim -> find_fn_prim prim as
+ Nothing -> Nothing
+findFnPrim _ as = Nothing
+
+find_fn_prim cmpPrim args@[a,b] =
+ case cmpPrim of
+ IntAddOp -> fn "+"
+ IntSubOp -> fn "-"
+ IntMulOp -> fn "*"
+ _ -> Nothing
+ where
+ fn op = Just (Op a op b)
+find_fn_prim _ _ = Nothing
\end{code}
%************************************************************************
exprType (Cast t _) = t
exprType (New t _ _) = t
exprType (Call _ (Name _ t) _) = t
+exprType (Access _ (Name _ t)) = t
+exprType (Raise t _) = error "do not know the type of raise!"
+exprType (Op _ op _) | op `elem` ["==","/=","<","<=","=>",">"]
+ = PrimType PrimBoolean
+exprType (Op x op _) | op `elem` ["+","-","*"]
+ = exprType x
exprType expr = error ("can't figure out an expression type: " ++ show expr)
litType (IntLit i) = PrimType PrimInt
litType (CharLit i) = PrimType PrimChar
-litType (StringLit i) = error "<string?>"
+litType (StringLit i) = stringType -- later, might use char array?
\end{code}
%************************************************************************
-- using the same string as the Id.
javaName :: Id -> Name
javaName n
- | isGlobalName (idName n) = error "useing javaName on global"
+ | isExternalName (idName n) = error "useing javaName on global"
| otherwise = Name (getOccString n)
(primRepToType (idPrimRep n))
--- TypeName's are always global. This would typically return something
+-- TypeName's are almost always global. This would typically return something
-- like Test.foo or Test.Foozdc or PrelBase.foldr.
+-- Local might use locally bound types, (which do not have '.' in them).
javaIdTypeName :: Id -> TypeName
-javaIdTypeName n = (moduleString (nameModule n') ++ "." ++ getOccString n')
+javaIdTypeName n
+ | isInternalName n' = renameForKeywords n'
+ | otherwise = moduleString (nameModule n') ++ "." ++ renameForKeywords n'
where
n' = getName n
+-- There is no such thing as a local type constructor.
+
javaTyConTypeName :: TyCon -> TypeName
-javaTyConTypeName n = (moduleString (nameModule n') ++ "." ++ getOccString n')
+javaTyConTypeName n = (moduleString (nameModule n') ++ "." ++ renameForKeywords n')
where
n' = getName n
-- would return the name "Test.Foo".
javaConstrWkrName :: DataCon -> TypeName
-javaConstrWkrName = javaIdTypeName . dataConId
+javaConstrWkrName = javaIdTypeName . dataConWorkId
-- Makes x_inst for Rec decls
+-- They are *never* is primitive
+-- and always have local (type) names.
javaInstName :: Id -> Name
-javaInstName n = Name (getOccString n ++ "_inst")
- (primRepToType (idPrimRep n))
+javaInstName n = Name (renameForKeywords n ++ "zdi_inst")
+ (Type (renameForKeywords n))
\end{code}
%************************************************************************
chartype :: Type
chartype = PrimType PrimChar
+bytetype :: Type
+bytetype = PrimType PrimByte
+
-- This lets you get inside a possible "Value" type,
-- to access the internal unboxed object.
access :: Expr -> Type -> Expr
access expr other = expr
accessPrim expr PrimInt = Call expr (Name "intValue" inttype) []
-accessPrim expr PrimChar = Call expr (Name "intValue" chartype) []
+accessPrim expr PrimChar = Call expr (Name "charValue" chartype) []
+accessPrim expr PrimByte = Call expr (Name "byteValue" bytetype) []
+accessPrim expr other = pprPanic "accessPrim" (text (show other))
-- This is where we map from typename to types,
-- allowing to match possible primitive types.
primRepToType PtrRep = objectType
primRepToType IntRep = inttype
primRepToType CharRep = chartype
+primRepToType Int8Rep = bytetype
+primRepToType AddrRep = objectType
+primRepToType other = pprPanic "primRepToType" (ppr other)
-- The function that makes the constructor name
javaConstrWkrType :: DataCon -> Type
when lifting.
\begin{code}
-{-
type Bound = [Name]
type Frees = [Name]
combineEnv :: Env -> [Name] -> Env
combineEnv (Env bound env) new = Env (bound `combine` new) env
-addTypeMapping :: Name -> Name -> [Name] -> Env -> Env
-addTypeMapping origName newName frees (Env bound env)
+addTypeMapping :: TypeName -> TypeName -> [Name] -> Env -> Env
+addTypeMapping origName newName frees (Env bound env)
= Env bound ((origName,(newName,frees)) : env)
-- This a list of bound vars (with types)
--- and a mapping from types (?) to (result * [arg]) pairs
-data Env = Env Bound [(Name,(Name,[Name]))]
+-- and a mapping from old class name
+-- to inner class name (with a list of frees that need passed
+-- to the inner class.)
+
+data Env = Env Bound [(TypeName,(TypeName,[Name]))]
newtype LifterM a =
LifterM { unLifterM ::
- Name ->
- Int -> ( a -- *
+ TypeName -> -- this class name
+ Int -> -- uniq supply
+ ( a -- *
, Frees -- frees
, [Decl] -- lifted classes
, Int -- The uniqs
, s)
)
-access :: Env -> Name -> LifterM ()
-access env@(Env bound _) name
+liftAccess :: Env -> Name -> LifterM ()
+liftAccess env@(Env bound _) name
| name `elem` bound = LifterM (\ n s -> ((),[name],[],s))
| otherwise = return ()
-scopedName :: Name -> LifterM a -> LifterM a
+scopedName :: TypeName -> LifterM a -> LifterM a
scopedName name (LifterM m) =
LifterM (\ _ s ->
case m name 1 of
(a,frees,lifted,_) -> (a,frees,lifted,s)
)
-genAnonInnerClassName :: LifterM Name
+genAnonInnerClassName :: LifterM TypeName
genAnonInnerClassName = LifterM (\ n s ->
( n ++ "$" ++ show s
, []
)
)
-genInnerClassName :: Name -> LifterM Name
+genInnerClassName :: TypeName -> LifterM TypeName
genInnerClassName name = LifterM (\ n s ->
( n ++ "$" ++ name
, []
liftDecl = \ top env decl ->
case decl of
{ Import n -> return (Import n)
- ; Field mfs t n e ->
+ ; Field mfs n e ->
do { e <- liftMaybeExpr env e
- ; return (Field mfs (liftType env t) n e)
+ ; return (Field mfs (liftName env n) e)
}
; Constructor mfs n as ss ->
do { let newBound = getBoundAtParameters as
; (ss,_) <- liftStatements (combineEnv env newBound) ss
; return (Constructor mfs n (liftParameters env as) ss)
}
- ; Method mfs t n as ts ss ->
+ ; Method mfs n as ts ss ->
do { let newBound = getBoundAtParameters as
; (ss,_) <- liftStatements (combineEnv env newBound) ss
- ; return (Method mfs (liftType env t) n (liftParameters env as) ts ss)
+ ; return (Method mfs (liftName env n) (liftParameters env as) ts ss)
}
; Comment s -> return (Comment s)
; Interface mfs n is ms -> error "interfaces not supported"
getBoundAtDecls :: [Decl] -> Bound
getBoundAtDecls = foldr combine [] . map getBoundAtDecl
--- TODO
getBoundAtDecl :: Decl -> Bound
-getBoundAtDecl (Field _ _ n _) = [n]
-getBoundAtDecl _ = []
+getBoundAtDecl (Field _ n _) = [n]
+getBoundAtDecl _ = []
getBoundAtParameters :: [Parameter] -> Bound
getBoundAtParameters = foldr combine [] . map getBoundAtParameter
-- TODO
getBoundAtParameter :: Parameter -> Bound
-getBoundAtParameter (Parameter _ _ n) = [n]
+getBoundAtParameter (Parameter _ n) = [n]
+
liftStatement :: Env -> Statement -> LifterM (Statement,Env)
liftStatement = \ env stmt ->
; ExprStatement e -> do { e <- liftExpr env e
; return (ExprStatement e,env)
}
- ; Declaration decl@(Field mfs t n e) ->
+ ; Declaration decl@(Field mfs n e) ->
do { e <- liftMaybeExpr env e
- ; return ( Declaration (Field mfs t n e)
+ ; return ( Declaration (Field mfs (liftName env n) e)
, env `combineEnv` getBoundAtDecl decl
)
}
; return (s:ss,env)
}
-
liftExpr :: Env -> Expr -> LifterM Expr
liftExpr = \ env expr ->
case expr of
- { Var n t -> do { access env n
- ; return (Var n t)
- }
- ; Literal l _ -> return expr
+ { Var n -> do { liftAccess env n
+ ; return (Var (liftName env n))
+ }
+ ; Literal l -> return expr
; Cast t e -> do { e <- liftExpr env e
; return (Cast (liftType env t) e)
}
; InstanceOf e t -> do { e <- liftExpr env e
; return (InstanceOf e (liftType env t))
}
+ ; Raise n es -> do { es <- liftExprs env es
+ ; return (Raise n es)
+ }
; Call e n es -> do { e <- liftExpr env e
; es <- mapM (liftExpr env) es
; return (Call e n es)
; New n es ds -> new env n es ds
}
-liftParameter env (Parameter ms t n) = Parameter ms (liftType env t) n
+liftParameter env (Parameter ms n) = Parameter ms (liftName env n)
liftParameters env = map (liftParameter env)
+liftName env (Name n t) = Name n (liftType env t)
+
liftExprs :: Env -> [Expr] -> LifterM [Expr]
liftExprs = mapM . liftExpr
+
liftMaybeExpr :: Env -> (Maybe Expr) -> LifterM (Maybe Expr)
liftMaybeExpr env Nothing = return Nothing
liftMaybeExpr env (Just stmt) = do { stmt <- liftExpr env stmt
}
+
new :: Env -> Type -> [Expr] -> Maybe [Decl] -> LifterM Expr
new env@(Env _ pairs) typ args Nothing =
do { args <- liftExprs env args
- ; return (listNew env typ args)
+ ; return (liftNew env typ args)
}
new env typ [] (Just inner) =
-- anon. inner class
do { innerName <- genAnonInnerClassName
; frees <- liftClass env innerName inner [] [unType typ]
; return (New (Type (innerName))
- [ Var name (Type "<arg>") | name <- frees ] Nothing)
+ (map Var frees)
+ Nothing)
}
where unType (Type name) = name
unType _ = error "incorrect type style"
-
new env typ _ (Just inner) = error "cant handle inner class with args"
-liftClass :: Env -> Name -> [Decl] -> [Name] -> [Name] -> LifterM [ Name ]
+
+liftClass :: Env -> TypeName -> [Decl] -> [TypeName] -> [TypeName] -> LifterM [ Name ]
liftClass env@(Env bound _) innerName inner xs is =
do { let newBound = getBoundAtDecls inner
; (inner,frees) <-
getFrees (liftDecls False (env `combineEnv` newBound) inner)
- ; let trueFrees = filter (\ xs -> xs /= "VM") (both frees bound)
- ; let freeDefs = [ Field [Final] objectType n Nothing | n <- trueFrees ]
- ; let cons = mkCons innerName [(name,objectType) | name <- trueFrees ]
+ ; let trueFrees = filter (\ (Name xs _) -> xs /= "VM") (both frees bound)
+ ; let freeDefs = [ Field [Final] n Nothing | n <- trueFrees ]
+ ; let cons = mkCons innerName trueFrees
; let innerClass = Class [] innerName xs is (freeDefs ++ [cons] ++ inner)
; rememberClass innerClass
; return trueFrees
= case lookup name env of
Nothing -> New typ exprs Nothing
Just (nm,args) | null exprs
- -> New (Type nm) (map (\ v -> Var v (Type "<arg>")) args) Nothing
+ -> New (Type nm) (map Var args) Nothing
_ -> error "pre-lifted constructor with arguments"
-listNew _ typ exprs = New typ exprs Nothing
-
--}
\end{code}
projects / ghc-hetmet.git / blobdiff