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

Swapped some uses of listify to fastListify, but the abbreviation checking is still very slow

Browse Source
This commit is contained in:
Neil Brown 2009-02-10 12:49:54 +00:00
parent bcd670bfd2
commit 9d44e3475c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transformations/SimplifyAbbrevs.hs
View File

@ -206,7 +206,7 @@ abbrevCheckPass
= do checkNotWritten (A.Variable m n) scope "VAL-abbreviated variable % written-to inside the scope of the abbreviation" = do checkNotWritten (A.Variable m n) scope "VAL-abbreviated variable % written-to inside the scope of the abbreviation"
sequence_ [checkNotWritten v scope sequence_ [checkNotWritten v scope
"Abbreviated variable % used inside the scope of the abbreviation" "Abbreviated variable % used inside the scope of the abbreviation"
| A.ExprVariable _ v <- listify (const True) e] | A.ExprVariable _ v <- fastListify (const True) e]
return s return s
doStructured s = return s doStructured s = return s
@ -223,21 +223,21 @@ abbrevCheckPass
checkAbbreved v@(A.Variable {}) x msg = checkNone v x msg checkAbbreved v@(A.Variable {}) x msg = checkNone v x msg
checkAbbreved v@(A.DirectedVariable {}) x msg = checkNone v x msg checkAbbreved v@(A.DirectedVariable {}) x msg = checkNone v x msg
checkAbbreved (A.SubscriptedVariable _ sub v) x msg checkAbbreved (A.SubscriptedVariable _ sub v) x msg
= sequence_ [checkNotWritten subV x msg | subV <- listify (const True) sub] = sequence_ [checkNotWritten subV x msg | subV <- fastListify (const True) sub]
checkNone :: Data a => A.Variable -> a -> String -> PassM () checkNone :: Data a => A.Variable -> a -> String -> PassM ()
-- Must use Ord instance, not Eq: -- Must use Ord instance, not Eq:
checkNone v x msg checkNone v x msg
= do ex <- isExempt v = do ex <- isExempt v
when (not ex) $ when (not ex) $
case listify ((EQ ==) . compare v) x of case fastListify ((EQ ==) . compare v) x of
[] -> return () [] -> return ()
xs -> diePC (findMeta xs) $ formatCode msg v xs -> diePC (findMeta xs) $ formatCode msg v
checkNotWritten :: Data a => A.Variable -> a -> String -> PassM () checkNotWritten :: Data a => A.Variable -> a -> String -> PassM ()
checkNotWritten v x msg checkNotWritten v x msg
= mapM_ checkAssign (listify (const True) x) = mapM_ checkAssign (fastListify (const True) x)
>> mapM_ checkInput (listify (const True) x) >> mapM_ checkInput (fastListify (const True) x)
where where
checkAssign :: A.Process -> PassM () checkAssign :: A.Process -> PassM ()
checkAssign (A.Assign m lhs _) checkAssign (A.Assign m lhs _)