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

More Polyplate merging in SimplifyAbbrevs

Browse Source
This commit is contained in:
Neil Brown 2009-02-11 13:30:54 +00:00
parent 0d5299b10f
commit b6b4188b7c
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
transformations/SimplifyAbbrevs.hs
View File

@ -213,8 +213,20 @@ abbrevCheckPass
record b v = modify (\(m:ms) -> (Map.insertWith (||) (Var v) b m : ms)) record b v = modify (\(m:ms) -> (Map.insertWith (||) (Var v) b m : ms))
doStructured :: Data a => A.Structured a -> StateT [Map.Map Var Bool] PassM nameIsNonce :: A.Name -> StateT [Map.Map Var Bool] PassM Bool
(A.Structured a) nameIsNonce n
= do names <- lift getCompState >>* csNames
case fmap A.ndNameSource $ Map.lookup (A.nameName n) names of
Just A.NameNonce -> return True
_ -> return False
-- Judging by the cgtests (cgtest18, line 232), we should turn off usage checking
-- on an abbreviation if either the RHS *or* the LHS is exempt by a PERMITALIASEs
-- pragma
doStructured :: (PolyplateM (A.Structured t) () AbbrevCheckOps AbbrevCheckM
,PolyplateM (A.Structured t) AbbrevCheckOps () AbbrevCheckM, Data t) =>
A.Structured t -> AbbrevCheckM (A.Structured t)
doStructured s@(A.Spec _ (A.Specification _ n (A.Is _ A.Abbrev _ (A.ActualVariable v))) scope) doStructured s@(A.Spec _ (A.Specification _ n (A.Is _ A.Abbrev _ (A.ActualVariable v))) scope)
= do nonce <- nameIsNonce n = do nonce <- nameIsNonce n
ex <- isNameExempt n ex <- isNameExempt n
@ -235,11 +247,15 @@ abbrevCheckPass
pop pop
return s return s
doStructured s@(A.Spec _ (A.Specification m n (A.Is _ A.ValAbbrev _ (A.ActualExpression e))) scope) doStructured s@(A.Spec _ (A.Specification m n (A.Is _ A.ValAbbrev _ (A.ActualExpression e))) scope)
= do pushRecurse scope = do nonce <- nameIsNonce n
ex <- isNameExempt n
if nonce || ex
then descend s >> return ()
else do pushRecurse scope
checkNotWritten (A.Variable m n) "VAL-abbreviated variable % written-to inside the scope of the abbreviation" checkNotWritten (A.Variable m n) "VAL-abbreviated variable % written-to inside the scope of the abbreviation"
sequence_ [checkNotWritten v sequence_ [checkNotWritten v
"Abbreviated variable % used inside the scope of the abbreviation" "Abbreviated variable % used inside the scope of the abbreviation"
| A.ExprVariable _ v <- fastListify (const True) e] | A.ExprVariable _ v <- listifyDepth (const True) e]
pop pop
return s return s
doStructured s = descend s doStructured s = descend s