Updates conforming to the new sampling syntax (must use 'global' for …

…global variables.
leepike · Dec 5, 2010 · cbd2fc8 · cbd2fc8
1 parent 9c98f7f
commit cbd2fc8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Language/Copilot/Examples/LTLExamples.hs b/Language/Copilot/Examples/LTLExamples.hs
@@ -75,9 +75,9 @@ testRules = do
   let v2 = varB "v2"
   let v3 = varI16 "v3"
   let v4 = varB "v4"
-  let ext = extI8 "ext" 5 
+  let ex = extI8 (global "ex") 5 
   v1 .=    (not true) || v2
-  v2 .=    [True, False] ++ [True] ++ v3 < cast ext
+  v2 .=    [True, False] ++ [True] ++ v3 < cast ex
   v3 .=    0 + drop 3 6
   v4 `ltl` always 5 v1
 
diff --git a/Language/Copilot/Examples/PTLTLExamples.hs b/Language/Copilot/Examples/PTLTLExamples.hs
@@ -73,14 +73,14 @@ tSince = do
 -- interface $ setE (emptySM {bMap = fromList [("e1", [True,True ..]), ("e2", [False,False ..])]}) $ interpretOpts tSinExt 20
 tSinExt :: Streams 
 tSinExt = do
-  let e1 = extB "e1" 2
-  let e2 = extB "e2" 3
+  let e1 = extB (global "e1") 2
+  let e2 = extB (global "e2") 3
   z `ptltl` (e1 `since` e2)
 
 tSinExt2 :: Streams 
 tSinExt2 = do
-  let e1 = extB "e1" 2
-  let e2 = extB "e2" 2
+  let e1 = extB (global "e1") 2
+  let e2 = extB (global "e2") 2
   let a = varB "a"
   let s = varB "s"
   let d = varB "d"
@@ -98,9 +98,9 @@ tSinExt2 = do
 engine :: Streams
 engine = do
   -- external vars
-  let engineTemp = extW8 "engineTemp" 1
-  let engineOff  = extB "engineOff" 1
-  let coolerOn   = extB "coolerOn" 1
+  let engineTemp = extW8 (global "engineTemp") 1
+  let engineOff  = extB (global "engineOff") 1
+  let coolerOn   = extB (global "coolerOn") 1
   -- Copilot vars
   let cnt        = varW8 "cnt"
   let temp       = varB "temp"
@@ -122,5 +122,5 @@ engineRun =
                             , ("coolerOn", replicate 9 False P.++ repeat True)
                             ]
                   , w8Map = fromList [("engineTemp", [99,100..])]
-                  }) baseOpts
+                  })