suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for uniquifying function arguments to the Rain passes

Browse Source
This commit is contained in:
Neil Brown 2008-03-22 18:34:07 +00:00
parent 81c342156d
commit ae142a94e1
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
frontends/RainPasses.hs
View File

@ -121,25 +121,15 @@ uniquifyAndResolveVars = everywhereM (mk1M uniquifyAndResolveVars')
A.ndNameType = A.ProcName, A.ndType = newProc, A.ndNameType = A.ProcName, A.ndType = newProc,
A.ndAbbrevMode = A.Original, A.ndPlacement = A.Unplaced} A.ndAbbrevMode = A.Original, A.ndPlacement = A.Unplaced}
return $ A.Spec m (A.Specification m' n newProc) scope return $ A.Spec m (A.Specification m' n newProc) scope
where -- Functions:
--This function is like applying mapM to doFormals', but we need to let each doFormals' call in turn uniquifyAndResolveVars' (A.Spec m (A.Specification m' n
--transform the scope of the formals. This could possibly be done by using a StateT monad with the scope, (A.Function m'' funcMode retTypes params funcBody)) scope)
--but this method works just as well: = do (params', funcBody') <- doFormals params funcBody
doFormals :: Data t => [A.Formal] -> t -> PassM ([A.Formal],t) let newFunc = (A.Function m'' funcMode retTypes params' funcBody')
doFormals [] s = return ([],s) defineName n A.NameDef {A.ndMeta = m', A.ndName = A.nameName n, A.ndOrigName = A.nameName n,
doFormals (f:fs) s = do (f',s') <- doFormals' f s A.ndNameType = A.FunctionName, A.ndType = newFunc,
(fs',s'') <- doFormals fs s' A.ndAbbrevMode = A.Original, A.ndPlacement = A.Unplaced}
return ((f':fs'),s'') return $ A.Spec m (A.Specification m' n newFunc) scope
doFormals' :: Data t => A.Formal -> t -> PassM (A.Formal,t)
doFormals' (A.Formal am t n) scope
= do n' <- makeNonce $ A.nameName n
let newName = (n {A.nameName = n'})
let m = A.nameMeta n
defineName newName A.NameDef {A.ndMeta = m, A.ndName = n', A.ndOrigName = A.nameName n,
A.ndNameType = A.VariableName, A.ndType = (A.Declaration m t),
A.ndAbbrevMode = am, A.ndPlacement = A.Unplaced}
let scope' = everywhere (mkT $ replaceNameName (A.nameName n) n') scope
return (A.Formal am t newName, scope')
-- replicator names have their types recorded later, but are -- replicator names have their types recorded later, but are
-- uniquified and resolved here -- uniquified and resolved here
@ -150,6 +140,25 @@ uniquifyAndResolveVars = everywhereM (mk1M uniquifyAndResolveVars')
--Other: --Other:
uniquifyAndResolveVars' s = return s uniquifyAndResolveVars' s = return s
--This function is like applying mapM to doFormals', but we need to let each doFormals' call in turn
--transform the scope of the formals. This could possibly be done by using a StateT monad with the scope,
--but this method works just as well:
doFormals :: Data t => [A.Formal] -> t -> PassM ([A.Formal],t)
doFormals [] s = return ([],s)
doFormals (f:fs) s = do (f',s') <- doFormals' f s
(fs',s'') <- doFormals fs s'
return ((f':fs'),s'')
doFormals' :: Data t => A.Formal -> t -> PassM (A.Formal,t)
doFormals' (A.Formal am t n) scope
= do n' <- makeNonce $ A.nameName n
let newName = (n {A.nameName = n'})
let m = A.nameMeta n
defineName newName A.NameDef {A.ndMeta = m, A.ndName = n', A.ndOrigName = A.nameName n,
A.ndNameType = A.VariableName, A.ndType = (A.Declaration m t),
A.ndAbbrevMode = am, A.ndPlacement = A.Unplaced}
let scope' = everywhere (mkT $ replaceNameName (A.nameName n) n') scope
return (A.Formal am t newName, scope')
-- | Helper function for a few of the passes. Replaces 'A.nameName' of a 'A.Name' if it matches a given 'String'. -- | Helper function for a few of the passes. Replaces 'A.nameName' of a 'A.Name' if it matches a given 'String'.
replaceNameName :: replaceNameName ::
String -- ^ The variable name to be replaced. String -- ^ The variable name to be replaced.