From 2e99bcfc5e3e06f41ce400538a294ca6b76b62fd Mon Sep 17 00:00:00 2001
From: Neil Brown <neil@twistedsquare.com>
Date: Thu, 19 Mar 2009 15:45:49 +0000
Subject: [PATCH] Added the mobilisation of process parameters, but I think I
 need to clone, not dereference

---
 transformations/ImplicitMobility.hs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/transformations/ImplicitMobility.hs b/transformations/ImplicitMobility.hs
index 21db161..e80d2d3 100644
--- a/transformations/ImplicitMobility.hs
+++ b/transformations/ImplicitMobility.hs
@@ -240,6 +240,16 @@ mobiliseArrays = pass "Make all arrays mobile" [] [] recurse
                   defineName name_sizes nd
                   return $ A.Spec m (A.Specification m' n newSpec) scope'
 
+    doStructured (A.Spec m (A.Specification m' n (A.Proc m'' sm fs body)) scope)
+      = do scope' <- recurse scope
+           body' <- recurse body
+           fs' <- mapM processFormal fs
+           let newSpecF = A.Proc m'' sm fs'
+           modifyName n (\nd -> nd {A.ndSpecType =
+             let A.Proc _ _ _ stub = A.ndSpecType nd in newSpecF stub})
+           return $ A.Spec m (A.Specification m' n (newSpecF body')) scope'
+
+
     -- Must also mobilise channels of arrays, and arrays of channels of arrays:
     doStructured s@(A.Spec m (A.Specification m' n st) scope)
       = do mtf <- typeOfSpec' st
@@ -250,11 +260,15 @@ mobiliseArrays = pass "Make all arrays mobile" [] [] recurse
                   return $ A.Spec m (A.Specification m' n newSpec) scope'
              Nothing -> descend s
 
-    -- TODO should also mobilise the channels in formal parameters
-
     doStructured s = descend s
 
-    
+    processFormal :: A.Formal -> PassM A.Formal
+    processFormal f@(A.Formal am t n)
+      = case mobiliseArrayInside (t, A.Declaration (A.nameMeta n)) of
+          Just decl@(A.Declaration _ t') ->
+            do modifyName n $ \nd -> nd {A.ndSpecType = decl}
+               return $ A.Formal am t' n
+          Nothing -> return f 
 
     mobiliseArrayInside :: (A.Type, A.Type -> A.SpecType) -> Maybe A.SpecType
     mobiliseArrayInside (A.Chan attr t@(A.Array {}), f)
@@ -267,6 +281,8 @@ mobiliseArrays = pass "Make all arrays mobile" [] [] recurse
       = Just $ f $ A.Array ds $ A.ChanEnd attr dir $ A.Mobile t
     mobiliseArrayInside _ = Nothing
 
+-- TODO I think I want to clone, not dereference
+
 class Dereferenceable a where
   deref :: Meta -> a -> Maybe a