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

Fixed assignment of arrays to work when dimensions are missing (helps with the initialisers for mobile allocations)

Browse Source
This commit is contained in:
Neil Brown 2009-04-09 17:09:50 +00:00
parent 98ffb74505
commit 2308c6571c
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backends/GenerateC.hs
View File

@ -1678,24 +1678,28 @@ cgenAssign m [v] (A.ExpressionList _ [e])
call genVariable vrhs A.Original call genVariable vrhs A.Original
tell ["=NULL;"] tell ["=NULL;"]
_ -> call genMissing $ "Mobile assignment from " ++ show e _ -> call genMissing $ "Mobile assignment from " ++ show e
(A.Array ds innerT, _, _) | isPOD innerT && A.UnknownDimension `notElem` ds (A.Array ds innerT, _, A.Array dsrhs _) | isPOD innerT
-> do tell ["memcpy("] -> do tell ["memcpy("]
call genVariable v A.Abbrev call genVariable v A.Abbrev
tell [","] tell [","]
call genExpression e call genExpression e
tell [","] tell [","]
call genBytesIn m t (Left False) let f i = A.ExprVariable m $
A.SubscriptedVariable m
(A.Subscript m A.NoCheck $ makeConstant m i)
(A.VariableSizes m v)
ds' = map (workOutDim f) $ zip3 [0..] ds dsrhs
call genBytesIn m (A.Array ds' innerT) (Left False)
tell [");"] tell [");"]
(_, _, A.Array ds innerT) | isPOD innerT && A.UnknownDimension `notElem` ds _ -> call genMissingC $ formatCode "assignment of type % (% := %)" t v e
-> do tell ["memcpy("]
call genVariable v A.Abbrev
tell [","]
call genExpression e
tell [","]
call genBytesIn m trhs (Left False)
tell [");"]
_ -> call genMissingC $ formatCode "assignment of type %" t
where where
workOutDim :: (Int -> A.Expression) -> (Int, A.Dimension, A.Dimension) ->
A.Dimension
workOutDim _ (_, A.Dimension e, _) = A.Dimension e
workOutDim _ (_, _, A.Dimension e) = A.Dimension e
workOutDim func (i, A.UnknownDimension, A.UnknownDimension)
= A.Dimension $ func i
doAssign :: A.Variable -> A.Expression -> CGen () doAssign :: A.Variable -> A.Expression -> CGen ()
doAssign v e doAssign v e
= do call genVariable v A.Original = do call genVariable v A.Original