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

Make SimplifyExprs compute the type of the variable it declares.

Browse Source 
This lets you say things like:
  VAL []INT xs IS [i = 0 FOR 20 | i]:
and have it figure out that the type of xs is really [20]INT.

This also cleans up the code a very small amount.
This commit is contained in:
Adam Sampson 2008-03-17 18:33:04 +00:00
parent 2a17d24ded
commit b21f020862
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
transformations/SimplifyExprs.hs
View File

@ -182,20 +182,39 @@ transformConstr = doGeneric `ext1M` doStructured
where
doGeneric :: Data t => t -> PassM t
doGeneric = makeGeneric transformConstr
-- This takes a constructor expression:
-- VAL type name IS [i = rep | expr]:
-- ...
-- and produces this:
-- type name:
-- PROCTHEN
-- INT indexvar:
-- SEQ
-- indexvar := 0
-- SEQ i = rep
-- SEQ
-- name[indexvar] := expr
-- indexvar := indexvar + 1
-- ...
doStructured :: Data a => A.Structured a -> PassM (A.Structured a)
doStructured (A.Spec m (A.Specification m' n (A.IsExpr _ _ t (A.ExprConstr m'' (A.RepConstr _ rep exp)))) scope)
= do indexVarSpec@(A.Specification _ indexVar _) <- makeNonceVariable "array_constr_index" m'' A.Int A.VariableName A.Original
doStructured (A.Spec m (A.Specification m' n (A.IsExpr _ _ _ expr@(A.ExprConstr m'' (A.RepConstr _ rep exp)))) scope)
= do indexVarSpec@(A.Specification _ indexName _) <- makeNonceVariable "array_constr_index" m'' A.Int A.VariableName A.Original
let indexVar = A.Variable m'' indexName
scope' <- doGeneric scope
-- Recompute the type, in order to get the array dimension into it.
t <- typeOfExpression expr
return $ A.Spec m (A.Specification m' n (A.Declaration m' t)) $ A.ProcThen m''
(A.Seq m'' $ A.Spec m'' (indexVarSpec) $ A.Several m'' [
A.Only m'' $ A.Assign m'' [A.Variable m'' indexVar] $ A.ExpressionList m'' [A.Literal m'' A.Int $ A.IntLiteral m'' "0"],
A.Rep m'' rep $ A.Only m'' $ A.Seq m'' $ A.Several m''
[A.Only m'' $ A.Assign m''
[A.SubscriptedVariable m'' (A.Subscript m'' A.NoCheck $ A.ExprVariable m'' $ A.Variable m'' indexVar) $ A.Variable m'' n]
(A.Seq m'' $ A.Spec m'' indexVarSpec $ A.Several m'' [
A.Only m'' $ A.Assign m'' [indexVar] $ A.ExpressionList m'' [A.Literal m'' A.Int $ A.IntLiteral m'' "0"],
A.Rep m'' rep $ A.Only m'' $ A.Seq m'' $ A.Several m''
[ A.Only m'' $ A.Assign m''
[A.SubscriptedVariable m'' (A.Subscript m'' A.NoCheck $ A.ExprVariable m'' indexVar) $ A.Variable m'' n]
$ A.ExpressionList m'' [exp]
,A.Only m'' $ A.Assign m'' [A.Variable m'' indexVar] $ A.ExpressionList m'' [A.Dyadic m'' A.Plus
(A.ExprVariable m'' $ A.Variable m'' indexVar)
, A.Only m'' $ A.Assign m'' [indexVar] $ A.ExpressionList m'' [A.Dyadic m'' A.Plus
(A.ExprVariable m'' indexVar)
(A.Literal m'' A.Int $ A.IntLiteral m'' "1")]
]
])