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

Fixed the C++CSP backend's use of channels (this fixes occam but probably breaks Rain, but I can come back to it later)

Browse Source
This commit is contained in:
Neil Brown 2008-11-13 21:00:56 +00:00
parent 377233b4b0
commit 9be287f157
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
backends/GenerateCPPCSP.hs
View File

@ -305,17 +305,7 @@ cppgenInputItem c dest
(A.InVariable m v) ->
do ct <- astTypeOf c
t <- astTypeOf v
case (byteArrayChan ct,t) of
(True,_)-> recvBytes v (call genBytesIn m t (Right v))
(False,A.Array {}) -> do tell ["tockRecvArray("]
chan'
tell [","]
call genVariable v
tell [");"]
(False,_) -> do chan'
tell [">>"]
genNonPoint v
tell [";"]
recvBytes v (call genBytesIn m t (Right v))
where
chan' = genCPPCSPChannelInput c
recvBytes :: A.Variable -> CGen () -> CGen ()
@ -334,24 +324,15 @@ cppgenOutputItem chan item
(A.OutExpression _ (A.ExprVariable _ sv)) ->
do t <- astTypeOf chan
tsv <- astTypeOf sv
case (byteArrayChan t,tsv) of
(True,_) -> sendBytes sv
(False,A.Array {}) -> do tell ["tockSendArray("]
chan'
tell [","]
call genVariable sv
tell [");"]
(False,_) -> do chan'
tell ["<<"]
genNonPoint sv
tell [";"]
sendBytes sv
where
chan' = genCPPCSPChannelOutput chan
sendBytes v = do chan'
tell ["<<tockSendableArrayOfBytes("]
sendBytes v = do tell ["tockSendArrayOfBytes("]
chan'
tell [",tockSendableArrayOfBytes("]
genPoint v
tell [");"]
tell ["));"]
byteArrayChan :: A.Type -> Bool
byteArrayChan (A.Chan _ _ (A.UserProtocol _)) = True