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

Added a check that the names being scoped out match the names that were scoped in, which helps find bugs in the parser

Browse Source
This commit is contained in:
Neil Brown 2009-04-03 21:03:19 +00:00
parent 45db9cdd27
commit 4a36d578c0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontends/ParseOccam.hs
View File

@ -370,7 +370,7 @@ handleSpecs specs inner specMarker
(ss, after) <- specs
ss' <- mapM scopeInSpec ss
v <- inner
mapM scopeOutSpec ss'
mapM scopeOutSpec (reverse ss')
after
return $ foldl (\e s -> specMarker m s e) v ss'
@ -425,7 +425,10 @@ scopeOut :: A.Name -> OccParser ()
scopeOut n@(A.Name m _)
= do st <- get
case csLocalNames st of
(_:rest) -> put $ st { csLocalNames = rest }
((_, (old, _)):rest)
| old == n -> put $ st { csLocalNames = rest }
| otherwise -> dieInternal (Just m, "scoping out not in order; "
++ " tried to scope out: " ++ A.nameName n ++ " but found: " ++ A.nameName old)
_ -> dieInternal (Just m, "scoping out name when stack is empty")
scopeInRep :: A.Name -> OccParser A.Name
@ -468,7 +471,7 @@ scopeInFormals :: [NameFormal] -> OccParser [A.Formal]
scopeInFormals fs = mapM scopeInFormal fs
scopeOutFormals :: [A.Formal] -> OccParser ()
scopeOutFormals fs = sequence_ [scopeOut n | (A.Formal am t n) <- fs]
scopeOutFormals fs = sequence_ [scopeOut n | (A.Formal am t n) <- reverse fs]
--}}}