diff options
| author | Alex Auvolat <alex.auvolat@ansys.com> | 2014-07-04 17:55:50 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex.auvolat@ansys.com> | 2014-07-04 17:55:50 +0200 |
| commit | 3f53be86214bb9a7873a6cf3377c49e5f84d9729 (patch) | |
| tree | 5509b5d0375ae632a7fb5e2cf74e7a4f38a2b897 /tests | |
| parent | 9628140878d0f57bbb37186b00164b80365f9b34 (diff) | |
| parent | 696d07415d52b092c9c69a9b1042a8bc9cd51a90 (diff) | |
| download | scade-analyzer-3f53be86214bb9a7873a6cf3377c49e5f84d9729.tar.gz scade-analyzer-3f53be86214bb9a7873a6cf3377c49e5f84d9729.zip | |
Merge branch 'e-last'
Conflicts:
abstract/abs_interp.ml
tests/source/counters.scade
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/source/NestedControl.scade | 8 | ||||
| -rwxr-xr-x | tests/source/counters.scade | 11 | ||||
| -rw-r--r-- | tests/source/test5.scade | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/tests/source/NestedControl.scade b/tests/source/NestedControl.scade index 2551eb6..af4fdab 100644 --- a/tests/source/NestedControl.scade +++ b/tests/source/NestedControl.scade @@ -1,13 +1,13 @@ node root(In : int; C : bool) returns (Out, Out1 : int) var last_Out, last_Out1: int; - isp, isn: bool; + disj, disj2: bool; let last_Out = 0 -> pre Out; last_Out1 = 0 -> pre Out1; - isp = In > 0; - isn = In < 0; - assume C_in_not_null: (not C) or isp or isn; + disj = In > 0; + disj2 = In < 0; + assume C_in_not_null: (not C) or disj or disj2; automaton SM1 initial state State1 diff --git a/tests/source/counters.scade b/tests/source/counters.scade index 3266ec9..334bca1 100755 --- a/tests/source/counters.scade +++ b/tests/source/counters.scade @@ -1,4 +1,15 @@ +/* + x = 10 | 9 | 8 | 7 | 6 | 5 | ... | 0 | 1 | 2 | ... | 10 | ... + y = 0 | 1 | 2 | 3 | 4 | 5 | ... | 10 | 9 | 8 | ... | 0 | ... + b1 = t | f | f | f | f | f | ... | f | f | f | ... | t | ... + b2 = t | f | f | f | f | f | ... | f | f | f | ... | t | ... + + eq* = t | t | t | t | t | t | ... | t | t | t | ... | t | ... +*/ + + +-- type t2 = subrange [0,10] of int; const bound: int = 1000; diff --git a/tests/source/test5.scade b/tests/source/test5.scade index 1de390d..566acf0 100644 --- a/tests/source/test5.scade +++ b/tests/source/test5.scade @@ -1,8 +1,8 @@ -node test(i: int) returns(probe a, b, c: int; exit: bool) +node test(i: int) returns(probe a, probe b, probe c: int; exit: bool) let b = 0 -> pre a; a = if b > 4 then 0 else b + 1; - c = 0; + c = i; exit = i >= 10; tel |