From 3c070f035c9888d0dab4c0f2ff0b5199d0cedd78 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Sat, 8 Mar 2008 00:09:28 +0000 Subject: [PATCH] Removed the code for initialising members - it is unneeded, and will no longer work until the ensuing _sizes declaration --- backends/GenerateC.hs | 3 --- backends/GenerateCPPCSP.hs | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/backends/GenerateC.hs b/backends/GenerateC.hs index 0bd0260..de386af 100644 --- a/backends/GenerateC.hs +++ b/backends/GenerateC.hs @@ -1229,9 +1229,6 @@ cdeclareInit m t@(A.Array ds t') var _ sequence_ $ intersperse (tell ["*"]) [case dim of A.Dimension d -> tell [show d] | dim <- ds] tell [");"] _ -> return () - fdeclareInit <- fget declareInit - init <- return (\sub -> fdeclareInit m t' (sub var) Nothing) - call genOverArray m var init cdeclareInit m rt@(A.Record _) var _ = Just $ do fs <- recordFields m rt sequence_ [initField t (A.SubscriptedVariable m (A.SubscriptField m n) var) diff --git a/backends/GenerateCPPCSP.hs b/backends/GenerateCPPCSP.hs index c8e501e..d3e878d 100644 --- a/backends/GenerateCPPCSP.hs +++ b/backends/GenerateCPPCSP.hs @@ -515,10 +515,7 @@ cppgenProcCall n as -- | Changed because we initialise channels and arrays differently in C++ cppdeclareInit :: Meta -> A.Type -> A.Variable -> Maybe A.Expression -> Maybe (CGen ()) cppdeclareInit m t@(A.Array ds t') var _ - = Just $ do fdeclareInit <- fget declareInit - init <- return (\sub -> fdeclareInit m t' (sub var) Nothing) - call genOverArray m var init - case t' of + = Just $ do case t' of A.Chan A.DirUnknown _ _ -> do tell ["tockInitChanArray("] call genVariableUnchecked var