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

Handle unsubscriptable type contexts

Browse Source
This commit is contained in:
Adam Sampson 2007-04-30 01:48:30 +00:00
parent 76865debc7
commit 439cedb494
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fco2/Parse.hs
View File

@ -471,7 +471,7 @@ pushSubscriptTypeContext :: (PSM m, Die m) => m ()
pushSubscriptTypeContext
= do ps <- get
case psTypeContext ps of
(Just t):_ ->
(Just t@(A.Array _ _)):_ ->
do subT <- trivialSubscriptType t
pushTypeContext $ Just subT
_ -> pushTypeContext Nothing

4
fco2/Types.hs
View File

@ -99,7 +99,7 @@ subscriptType (A.SubscriptFor m count) t
= sliceType m (makeConstant emptyMeta 0) count t
subscriptType (A.SubscriptField m tag) t = typeOfRecordField m t tag
subscriptType (A.Subscript m sub) t = plainSubscriptType m sub t
subscriptType _ _ = die "unsubscriptable type"
subscriptType _ t = die $ "unsubscriptable type: " ++ show t
-- | Just remove the first dimension from an array type -- like doing
-- subscriptType with constant 0 as a subscript, but without the checking.
@ -108,7 +108,7 @@ subscriptType _ _ = die "unsubscriptable type"
trivialSubscriptType :: (Die m) => A.Type -> m A.Type
trivialSubscriptType (A.Array [d] t) = return t
trivialSubscriptType (A.Array (d:ds) t) = return $ A.Array ds t
trivialSubscriptType _ = die "not plain array type"
trivialSubscriptType t = die $ "not plain array type: " ++ show t
typeOfVariable :: (PSM m, Die m) => A.Variable -> m A.Type
typeOfVariable (A.Variable m n) = typeOfName n