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

Changed the C genOverArray function to pass the test, and removed the now-redundant C++ version

Browse Source
This commit is contained in:
Neil Brown 2007-10-03 23:18:53 +00:00
parent 2b1603629f
commit f3e15b6f78
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backends/GenerateC.hs
View File

@ -117,6 +117,7 @@ data GenOps = GenOps {
genOutput :: GenOps -> A.Variable -> [A.OutputItem] -> CGen (), genOutput :: GenOps -> A.Variable -> [A.OutputItem] -> CGen (),
genOutputCase :: GenOps -> A.Variable -> A.Name -> [A.OutputItem] -> CGen (), genOutputCase :: GenOps -> A.Variable -> A.Name -> [A.OutputItem] -> CGen (),
genOutputItem :: GenOps -> A.Variable -> A.OutputItem -> CGen (), genOutputItem :: GenOps -> A.Variable -> A.OutputItem -> CGen (),
-- | Generates a loop that maps over every element in a (potentially multi-dimensional) array
genOverArray :: GenOps -> Meta -> A.Variable -> (SubscripterFunction -> Maybe (CGen ())) -> CGen (), genOverArray :: GenOps -> Meta -> A.Variable -> (SubscripterFunction -> Maybe (CGen ())) -> CGen (),
genPar :: GenOps -> A.ParMode -> A.Structured -> CGen (), genPar :: GenOps -> A.ParMode -> A.Structured -> CGen (),
genProcCall :: GenOps -> A.Name -> [A.Actual] -> CGen (), genProcCall :: GenOps -> A.Name -> [A.Actual] -> CGen (),
@ -306,18 +307,19 @@ cgenOverArray ops m var func
let arg = (\var -> foldl (\v s -> A.SubscriptedVariable m s v) var [A.Subscript m $ A.ExprVariable m i | i <- indices]) let arg = (\var -> foldl (\v s -> A.SubscriptedVariable m s v) var [A.Subscript m $ A.ExprVariable m i | i <- indices])
case func arg of case func arg of
Just p -> Just p ->
do sequence_ [do tell ["for (int "] do sequence_ [do tell ["for(int "]
call genVariable ops i call genVariable ops i
tell [" = 0; "] tell ["=0;"]
call genVariable ops i call genVariable ops i
tell [" < "] tell ["<"]
call genVariable ops var call genVariable ops var
tell ["_sizes[", show v, "]; "] call genSizeSuffix ops (show v)
tell [";"]
call genVariable ops i call genVariable ops i
tell ["++) {\n"] tell ["++){"]
| (v :: Integer, i) <- zip [0..] indices] | (v :: Integer, i) <- zip [0..] indices]
p p
sequence_ [tell ["}\n"] | _ <- indices] sequence_ [tell ["}"] | _ <- indices]
Nothing -> return () Nothing -> return ()
-- | Generate code for one of the Structured types. -- | Generate code for one of the Structured types.

28
backends/GenerateCPPCSP.hs
View File

@ -113,7 +113,6 @@ cppgenOps = cgenOps {
genOutput = cppgenOutput, genOutput = cppgenOutput,
genOutputCase = cppgenOutputCase, genOutputCase = cppgenOutputCase,
genOutputItem = cppgenOutputItem, genOutputItem = cppgenOutputItem,
genOverArray = cppgenOverArray,
genPar = cppgenPar, genPar = cppgenPar,
genProcCall = cppgenProcCall, genProcCall = cppgenProcCall,
genSizeSuffix = cppgenSizeSuffix, genSizeSuffix = cppgenSizeSuffix,
@ -1173,33 +1172,6 @@ cppgenArraySubscript ops checkValid v es
else call genExpression ops e else call genExpression ops e
--}}} --}}}
-- | Map an operation over every item of an occam array.
--Changed from GenerateC because it uses the array sizes of Blitz++
cppgenOverArray :: GenOps -> Meta -> A.Variable -> (SubscripterFunction -> Maybe (CGen ())) -> CGen ()
cppgenOverArray ops m var func
= do A.Array ds _ <- typeOfVariable var
specs <- sequence [makeNonceVariable "i" m A.Int A.VariableName A.Original | _ <- ds]
let indices = [A.Variable m n | A.Specification _ n _ <- specs]
let arg = (\var -> foldl (\v s -> A.SubscriptedVariable m s v) var [A.Subscript m $ A.ExprVariable m i | i <- indices])
case func arg of
Just p ->
do sequence_ [do tell ["for (int "]
call genVariable ops i
tell [" = 0; "]
call genVariable ops i
tell [" < "]
call genVariable ops var
tell [".extent(", show v, "); "]
call genVariable ops i
tell ["++) {\n"]
| (v :: Integer, i) <- zip [0..] indices]
p
sequence_ [tell ["}\n"] | _ <- indices]
Nothing -> return ()
-- | Changed to remove array size: -- | Changed to remove array size:
cppgenUnfoldedExpression :: GenOps -> A.Expression -> CGen () cppgenUnfoldedExpression :: GenOps -> A.Expression -> CGen ()
cppgenUnfoldedExpression ops (A.Literal _ t lr) cppgenUnfoldedExpression ops (A.Literal _ t lr)