diff --git a/src/plugins/e-acsl/src/code_generator/assert.ml b/src/plugins/e-acsl/src/code_generator/assert.ml index 636da0de6b8037b04f407b588f42a3d32b8d1164..d07e01cf3a6d3486f9599df53e459e5886caa24d 100644 --- a/src/plugins/e-acsl/src/code_generator/assert.ml +++ b/src/plugins/e-acsl/src/code_generator/assert.ml @@ -130,8 +130,5 @@ let runtime_check_with_msg ~adata ~loc msg ~pred_kind kind kf env e = let runtime_check ~adata ~pred_kind kind kf env e p = let loc = p.pred_loc in - let msg = - Kernel.Unicode.without_unicode - (Format.asprintf "%a@?" Printer.pp_predicate) p - in + let msg = Format.asprintf "%a@?" Printer.pp_predicate p in runtime_check_with_msg ~adata ~loc msg ~pred_kind kind kf env e diff --git a/src/plugins/e-acsl/tests/arith/oracle/arith.res.oracle b/src/plugins/e-acsl/tests/arith/oracle/arith.res.oracle index 08773711f3037fb6b3bc861371f0aacffca2fe99..6d71c8b0808f4afc54575c67318615522e20566c 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/arith.res.oracle +++ b/src/plugins/e-acsl/tests/arith/oracle/arith.res.oracle @@ -5,8 +5,8 @@ [eva:alarm] tests/arith/arith.i:34: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/arith.i:34: Warning: - signed overflow. assert -2147483648 ≤ 1 + __gen_e_acsl__7; + signed overflow. assert -2147483648 <= 1 + __gen_e_acsl__7; [eva:alarm] tests/arith/arith.i:34: Warning: - signed overflow. assert 1 + __gen_e_acsl__7 ≤ 2147483647; + signed overflow. assert 1 + __gen_e_acsl__7 <= 2147483647; [eva:alarm] tests/arith/arith.i:34: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. diff --git a/src/plugins/e-acsl/tests/arith/oracle/extended_quantifiers.res.oracle b/src/plugins/e-acsl/tests/arith/oracle/extended_quantifiers.res.oracle index e8c1201d2fab96550a0a4713cbf0033d66af1405..1bfcda57f88121bab5cb0aea76496d93fdafc400 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/extended_quantifiers.res.oracle +++ b/src/plugins/e-acsl/tests/arith/oracle/extended_quantifiers.res.oracle @@ -1,18 +1,18 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/arith/extended_quantifiers.c:11: Warning: - signed overflow. assert 2 * __gen_e_acsl_k ≤ 2147483647; + signed overflow. assert 2 * __gen_e_acsl_k <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:11: Warning: signed overflow. - assert __gen_e_acsl_accumulator + __gen_e_acsl_lambda ≤ 2147483647; + assert __gen_e_acsl_accumulator + __gen_e_acsl_lambda <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:11: Warning: - signed overflow. assert __gen_e_acsl_k + __gen_e_acsl_one ≤ 2147483647; + signed overflow. assert __gen_e_acsl_k + __gen_e_acsl_one <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:11: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:11: Warning: assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:12: Warning: - signed overflow. assert __gen_e_acsl_k_2 + __gen_e_acsl_one_2 ≤ 2147483647; + signed overflow. assert __gen_e_acsl_k_2 + __gen_e_acsl_one_2 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:12: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:12: Warning: @@ -25,7 +25,7 @@ assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:15: Warning: signed overflow. - assert __gen_e_acsl_accumulator_5 + __gen_e_acsl_lambda_5 ≤ 2147483647; + assert __gen_e_acsl_accumulator_5 + __gen_e_acsl_lambda_5 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:15: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:15: Warning: @@ -37,60 +37,60 @@ [eva:alarm] tests/arith/extended_quantifiers.c:18: Warning: signed overflow. assert - -9223372036854775808 ≤ __gen_e_acsl_accumulator_7 + __gen_e_acsl_lambda_7; + -9223372036854775808 <= __gen_e_acsl_accumulator_7 + __gen_e_acsl_lambda_7; [eva:alarm] tests/arith/extended_quantifiers.c:18: Warning: - signed overflow. assert __gen_e_acsl_k_7 + __gen_e_acsl_one_7 ≤ 2147483647; + signed overflow. assert __gen_e_acsl_k_7 + __gen_e_acsl_one_7 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:17: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:17: Warning: assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:20: Warning: - signed overflow. assert __gen_e_acsl_k_8 + __gen_e_acsl_one_8 ≤ 2147483647; + signed overflow. assert __gen_e_acsl_k_8 + __gen_e_acsl_one_8 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:20: Warning: signed overflow. - assert __gen_e_acsl_accumulator_8 + __gen_e_acsl_lambda_8 ≤ 2147483647; + assert __gen_e_acsl_accumulator_8 + __gen_e_acsl_lambda_8 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:20: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:20: Warning: assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:21: Warning: signed overflow. - assert __gen_e_acsl_accumulator_9 + __gen_e_acsl_lambda_9 ≤ 2147483647; + assert __gen_e_acsl_accumulator_9 + __gen_e_acsl_lambda_9 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:21: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:21: Warning: assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:25: Warning: signed overflow. - assert __gen_e_acsl_k_10 + __gen_e_acsl_one_10 ≤ 2147483647; + assert __gen_e_acsl_k_10 + __gen_e_acsl_one_10 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:25: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:25: Warning: assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:26: Warning: signed overflow. - assert __gen_e_acsl_k_11 + __gen_e_acsl_one_11 ≤ 2147483647; + assert __gen_e_acsl_k_11 + __gen_e_acsl_one_11 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:26: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:26: Warning: assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:27: Warning: signed overflow. - assert __gen_e_acsl_k_12 + __gen_e_acsl_one_12 ≤ 2147483647; + assert __gen_e_acsl_k_12 + __gen_e_acsl_one_12 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:27: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:27: Warning: assertion got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:28: Warning: - signed overflow. assert 2 * __gen_e_acsl_k_13 ≤ 2147483647; + signed overflow. assert 2 * __gen_e_acsl_k_13 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:28: Warning: signed overflow. - assert __gen_e_acsl_k_13 + __gen_e_acsl_one_13 ≤ 2147483647; + assert __gen_e_acsl_k_13 + __gen_e_acsl_one_13 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:29: Warning: - signed overflow. assert 2 * __gen_e_acsl_k_14 ≤ 2147483647; + signed overflow. assert 2 * __gen_e_acsl_k_14 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:29: Warning: signed overflow. - assert __gen_e_acsl_k_14 + __gen_e_acsl_one_14 ≤ 2147483647; + assert __gen_e_acsl_k_14 + __gen_e_acsl_one_14 <= 2147483647; [eva:alarm] tests/arith/extended_quantifiers.c:28: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/extended_quantifiers.c:28: Warning: diff --git a/src/plugins/e-acsl/tests/arith/oracle/functions_rec.res.oracle b/src/plugins/e-acsl/tests/arith/oracle/functions_rec.res.oracle index c2c703a86c9eb38d948028c4a56227cdf248c991..e387fe07ffd1f6f2934c6571e4f1d7f867808d87 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/functions_rec.res.oracle +++ b/src/plugins/e-acsl/tests/arith/oracle/functions_rec.res.oracle @@ -49,16 +49,15 @@ [eva:alarm] tests/arith/functions_rec.c:13: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/arith/functions_rec.c:13: Warning: - division by zero. assert __gen_e_acsl_f2_9 ≢ 0; + division by zero. assert __gen_e_acsl_f2_9 != 0; [eva:alarm] tests/arith/functions_rec.c:13: Warning: - signed overflow. - assert -2147483648 ≤ __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7; + signed overflow. assert -2147483648 <= __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7; [eva:alarm] tests/arith/functions_rec.c:13: Warning: - signed overflow. assert __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7 ≤ 2147483647; + signed overflow. assert __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7 <= 2147483647; [eva:alarm] tests/arith/functions_rec.c:13: Warning: signed overflow. assert - (int)(__gen_e_acsl_f2_5 * __gen_e_acsl_f2_7) / __gen_e_acsl_f2_9 ≤ + (int)(__gen_e_acsl_f2_5 * __gen_e_acsl_f2_7) / __gen_e_acsl_f2_9 <= 2147483647; [eva:alarm] tests/arith/functions_rec.c:13: Warning: accessing uninitialized left-value. @@ -67,30 +66,30 @@ accessing uninitialized left-value. assert \initialized((__e_acsl_mpz_struct *)__gen_e_acsl_sub_8); [eva:alarm] tests/arith/functions_rec.c:13: Warning: - division by zero. assert __gen_e_acsl_f2_14 ≢ 0; + division by zero. assert __gen_e_acsl_f2_14 != 0; [eva:alarm] tests/arith/functions_rec.c:13: Warning: signed overflow. - assert -2147483648 ≤ __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12; + assert -2147483648 <= __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12; [eva:alarm] tests/arith/functions_rec.c:13: Warning: signed overflow. - assert __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12 ≤ 2147483647; + assert __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12 <= 2147483647; [eva:alarm] tests/arith/functions_rec.c:13: Warning: signed overflow. assert - (int)(__gen_e_acsl_f2_10 * __gen_e_acsl_f2_12) / __gen_e_acsl_f2_14 ≤ + (int)(__gen_e_acsl_f2_10 * __gen_e_acsl_f2_12) / __gen_e_acsl_f2_14 <= 2147483647; [eva:alarm] tests/arith/functions_rec.c:13: Warning: - division by zero. assert __gen_e_acsl_f2_19 ≢ 0; + division by zero. assert __gen_e_acsl_f2_19 != 0; [eva:alarm] tests/arith/functions_rec.c:13: Warning: signed overflow. - assert -2147483648 ≤ __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17; + assert -2147483648 <= __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17; [eva:alarm] tests/arith/functions_rec.c:13: Warning: signed overflow. - assert __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17 ≤ 2147483647; + assert __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17 <= 2147483647; [eva:alarm] tests/arith/functions_rec.c:13: Warning: signed overflow. assert - (int)(__gen_e_acsl_f2_15 * __gen_e_acsl_f2_17) / __gen_e_acsl_f2_19 ≤ + (int)(__gen_e_acsl_f2_15 * __gen_e_acsl_f2_17) / __gen_e_acsl_f2_19 <= 2147483647; [eva:alarm] tests/arith/functions_rec.c:32: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c b/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c index 7553a951c4b52aaf9400d6577e9a93dd3e0e5d4a..32bde90e542f9e5cb2e19139c0f410078d97fdb3 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c @@ -12,24 +12,24 @@ int main(void) long z = 2L; __e_acsl_assert(-3 == x,1,"Assertion","main","-3 == x", "tests/arith/arith.i",10); - /*@ assert -3 ≡ x; */ ; + /*@ assert -3 == x; */ ; __e_acsl_assert(x == -3,1,"Assertion","main","x == -3", "tests/arith/arith.i",11); - /*@ assert x ≡ -3; */ ; + /*@ assert x == -3; */ ; __e_acsl_assert(1,1,"Assertion","main","0 != ~0","tests/arith/arith.i",12); - /*@ assert 0 ≢ ~0; */ ; + /*@ assert 0 != ~0; */ ; __e_acsl_assert(x + 1L == -2L,1,"Assertion","main","x + 1 == -2", "tests/arith/arith.i",14); - /*@ assert x + 1 ≡ -2; */ ; + /*@ assert x + 1 == -2; */ ; __e_acsl_assert(x - 1L == -4L,1,"Assertion","main","x - 1 == -4", "tests/arith/arith.i",15); - /*@ assert x - 1 ≡ -4; */ ; + /*@ assert x - 1 == -4; */ ; __e_acsl_assert(x * 3L == -9L,1,"Assertion","main","x * 3 == -9", "tests/arith/arith.i",16); - /*@ assert x * 3 ≡ -9; */ ; + /*@ assert x * 3 == -9; */ ; __e_acsl_assert(x / 3 == -1,1,"Assertion","main","x / 3 == -1", "tests/arith/arith.i",17); - /*@ assert x / 3 ≡ -1; */ ; + /*@ assert x / 3 == -1; */ ; { __e_acsl_mpz_t __gen_e_acsl_; __e_acsl_mpz_t __gen_e_acsl__2; @@ -41,7 +41,7 @@ int main(void) __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_), (__e_acsl_mpz_struct const *)(__gen_e_acsl__2)); __gmpz_init(__gen_e_acsl_div); - /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */ + /*@ assert E_ACSL: 0xffffffffffffffffffffff != 0; */ __e_acsl_assert(__gen_e_acsl_div_guard != 0,1,"Assertion","main", "0xffffffffffffffffffffff != 0","tests/arith/arith.i",18); __gmpz_tdiv_q(__gen_e_acsl_div, @@ -55,41 +55,41 @@ int main(void) __gmpz_clear(__gen_e_acsl__2); __gmpz_clear(__gen_e_acsl_div); } - /*@ assert 0xffffffffffffffffffffff / 0xffffffffffffffffffffff ≡ 1; */ ; + /*@ assert 0xffffffffffffffffffffff / 0xffffffffffffffffffffff == 1; */ ; __e_acsl_assert(x % 2 == -1,1,"Assertion","main","x % 2 == -1", "tests/arith/arith.i",19); - /*@ assert x % 2 ≡ -1; */ ; + /*@ assert x % 2 == -1; */ ; __e_acsl_assert(1,1,"Assertion","main","-3 % -2 == -1", "tests/arith/arith.i",20); - /*@ assert -3 % -2 ≡ -1; */ ; + /*@ assert -3 % -2 == -1; */ ; __e_acsl_assert(1,1,"Assertion","main","3 % -2 == 1","tests/arith/arith.i", 21); - /*@ assert 3 % -2 ≡ 1; */ ; + /*@ assert 3 % -2 == 1; */ ; __e_acsl_assert(((x * 2L + (3L + y)) - 4L) + (x - (long)y) == -10L,1, "Assertion","main", "((x * 2 + (3 + y)) - 4) + (x - y) == -10", "tests/arith/arith.i",23); - /*@ assert ((x * 2 + (3 + y)) - 4) + (x - y) ≡ -10; */ ; + /*@ assert ((x * 2 + (3 + y)) - 4) + (x - y) == -10; */ ; __e_acsl_assert(1,1,"Assertion","main","(0 == 1) == !(0 == 0)", "tests/arith/arith.i",25); - /*@ assert (0 ≡ 1) ≡ !(0 ≡ 0); */ ; + /*@ assert (0 == 1) == !(0 == 0); */ ; __e_acsl_assert(1,1,"Assertion","main","(0 <= -1) == (0 > 0)", "tests/arith/arith.i",26); - /*@ assert (0 ≤ -1) ≡ (0 > 0); */ ; + /*@ assert (0 <= -1) == (0 > 0); */ ; __e_acsl_assert(1,1,"Assertion","main","(0 >= -1) == (0 <= 0)", "tests/arith/arith.i",27); - /*@ assert (0 ≥ -1) ≡ (0 ≤ 0); */ ; + /*@ assert (0 >= -1) == (0 <= 0); */ ; __e_acsl_assert(1,1,"Assertion","main","(0 != 1) == !(0 != 0)", "tests/arith/arith.i",28); - /*@ assert (0 ≢ 1) ≡ !(0 ≢ 0); */ ; + /*@ assert (0 != 1) == !(0 != 0); */ ; __e_acsl_assert(1,1,"Assertion","main","(0 != 0) == !(1 != 0)", "tests/arith/arith.i",30); - /*@ assert (0 ≢ 0) ≡ !(1 ≢ 0); */ ; + /*@ assert (0 != 0) == !(1 != 0); */ ; __e_acsl_assert(y != 0,1,"RTE","main","division_by_zero: y != 0", "tests/arith/arith.i",31); __e_acsl_assert(4 / y == 2,1,"Assertion","main","4 / y == 2", "tests/arith/arith.i",31); - /*@ assert 4 / y ≡ 2; */ ; + /*@ assert 4 / y == 2; */ ; { __e_acsl_mpz_t __gen_e_acsl_z; __e_acsl_mpz_t __gen_e_acsl__4; @@ -110,15 +110,15 @@ int main(void) __gen_e_acsl_div_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__5), (__e_acsl_mpz_struct const *)(__gen_e_acsl__6)); __gmpz_init(__gen_e_acsl_div_2); - /*@ assert E_ACSL: y - 123456789123456789 ≢ 0; */ + /*@ assert E_ACSL: y - 123456789123456789 != 0; */ __e_acsl_assert(__gen_e_acsl_div_guard_2 != 0,1,"Assertion","main", "y - 123456789123456789 != 0","tests/arith/arith.i",34); __gmpz_tdiv_q(__gen_e_acsl_div_2, (__e_acsl_mpz_struct const *)(__gen_e_acsl_add), (__e_acsl_mpz_struct const *)(__gen_e_acsl__5)); __gen_e_acsl__7 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_div_2)); - /*@ assert Eva: signed_overflow: -2147483648 ≤ 1 + __gen_e_acsl__7; */ - /*@ assert Eva: signed_overflow: 1 + __gen_e_acsl__7 ≤ 2147483647; */ + /*@ assert Eva: signed_overflow: -2147483648 <= 1 + __gen_e_acsl__7; */ + /*@ assert Eva: signed_overflow: 1 + __gen_e_acsl__7 <= 2147483647; */ __e_acsl_assert(1 + __gen_e_acsl__7 == 1,1,"Assertion","main", "1 + (z + 1) / (y - 123456789123456789) == 1", "tests/arith/arith.i",34); @@ -129,10 +129,10 @@ int main(void) __gmpz_clear(__gen_e_acsl__6); __gmpz_clear(__gen_e_acsl_div_2); } - /*@ assert 1 + (z + 1) / (y - 123456789123456789) ≡ 1; */ ; + /*@ assert 1 + (z + 1) / (y - 123456789123456789) == 1; */ ; __e_acsl_assert(1L - x == - ((long)x) + 1L,1,"Assertion","main", "1 - x == -x + 1","tests/arith/arith.i",36); - /*@ assert 1 - x ≡ -x + 1; */ ; + /*@ assert 1 - x == -x + 1; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_array.c b/src/plugins/e-acsl/tests/arith/oracle/gen_array.c index fd738aa7b4b03d0f062ee3a3e6d84032b9fb135e..d3f2b781441ba5b8d9c448acecace1bb85eda95f 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_array.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_array.c @@ -34,7 +34,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne,1,"Assertion","arrays","a != b", "tests/arith/array.i",21); } - /*@ assert a ≢ b; */ ; + /*@ assert a != b; */ ; { int __gen_e_acsl_eq; __gen_e_acsl_eq = 1; @@ -53,7 +53,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_eq,1,"Assertion","arrays","a == c", "tests/arith/array.i",22); } - /*@ assert a ≡ c; */ ; + /*@ assert a == c; */ ; { int __gen_e_acsl_ne_2; __gen_e_acsl_ne_2 = 0; @@ -72,7 +72,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne_2,1,"Assertion","arrays","a != d", "tests/arith/array.i",23); } - /*@ assert a ≢ d; */ ; + /*@ assert a != d; */ ; int *e = a; int *f = b; __e_acsl_store_block((void *)(& f),(size_t)8); @@ -83,19 +83,19 @@ void arrays(void) int *h = a; __e_acsl_assert(e != f,1,"Assertion","arrays","e != f", "tests/arith/array.i",30); - /*@ assert e ≢ f; */ ; + /*@ assert e != f; */ ; __e_acsl_assert(e != g,1,"Assertion","arrays","e != g", "tests/arith/array.i",31); - /*@ assert e ≢ g; */ ; + /*@ assert e != g; */ ; __e_acsl_assert(e == h,1,"Assertion","arrays","e == h", "tests/arith/array.i",32); - /*@ assert e ≡ h; */ ; + /*@ assert e == h; */ ; __e_acsl_assert(e == a,1,"Assertion","arrays","e == (int *)a", "tests/arith/array.i",36); - /*@ assert e ≡ (int *)a; */ ; + /*@ assert e == (int *)a; */ ; __e_acsl_assert(e != c,1,"Assertion","arrays","e != (int *)c", "tests/arith/array.i",37); - /*@ assert e ≢ (int *)c; */ ; + /*@ assert e != (int *)c; */ ; { int __gen_e_acsl_eq_2; __gen_e_acsl_eq_2 = 1; @@ -124,7 +124,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_eq_2,1,"Assertion","arrays", "a == *((int (*)[3])g)","tests/arith/array.i",40); } - /*@ assert a ≡ *((int (*)[3])g); */ ; + /*@ assert a == *((int (*)[3])g); */ ; { int __gen_e_acsl_eq_3; int __gen_e_acsl_valid_read_2; @@ -167,7 +167,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_eq_3,1,"Assertion","arrays", "a == *((int (*)[])g)","tests/arith/array.i",41); } - /*@ assert a ≡ *((int (*)[])g); */ ; + /*@ assert a == *((int (*)[])g); */ ; { int __gen_e_acsl_ne_3; __gen_e_acsl_ne_3 = 0; @@ -196,7 +196,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne_3,1,"Assertion","arrays", "a != *((int (*)[3])f)","tests/arith/array.i",42); } - /*@ assert a ≢ *((int (*)[3])f); */ ; + /*@ assert a != *((int (*)[3])f); */ ; { int __gen_e_acsl_ne_4; int __gen_e_acsl_valid_read_5; @@ -239,7 +239,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne_4,1,"Assertion","arrays", "a != *((int (*)[])f)","tests/arith/array.i",43); } - /*@ assert a ≢ *((int (*)[])f); */ ; + /*@ assert a != *((int (*)[])f); */ ; int i[6] = {1, 2, 3, 4, 5, 6}; __e_acsl_store_block((void *)(i),(size_t)24); __e_acsl_full_init((void *)(& i)); @@ -267,7 +267,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne_5,1,"Assertion","arrays","i != j", "tests/arith/array.i",49); } - /*@ assert i ≢ j; */ ; + /*@ assert i != j; */ ; { int __gen_e_acsl_ne_6; __gen_e_acsl_ne_6 = 0; @@ -286,7 +286,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne_6,1,"Assertion","arrays","i != k", "tests/arith/array.i",50); } - /*@ assert i ≢ k; */ ; + /*@ assert i != k; */ ; { int __gen_e_acsl_ne_7; __gen_e_acsl_ne_7 = 0; @@ -305,7 +305,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne_7,1,"Assertion","arrays","j != k", "tests/arith/array.i",51); } - /*@ assert j ≢ k; */ ; + /*@ assert j != k; */ ; int *l = & i[3]; __e_acsl_store_block((void *)(& l),(size_t)8); __e_acsl_full_init((void *)(& l)); @@ -352,7 +352,7 @@ void arrays(void) "*((int (*)[3])l) != *((int (*)[3])m)", "tests/arith/array.i",55); } - /*@ assert *((int (*)[3])l) ≢ *((int (*)[3])m); */ ; + /*@ assert *((int (*)[3])l) != *((int (*)[3])m); */ ; { int __gen_e_acsl_eq_4; __gen_e_acsl_eq_4 = 1; @@ -390,7 +390,7 @@ void arrays(void) "*((int (*)[3])l) == *((int (*)[3])n)", "tests/arith/array.i",56); } - /*@ assert *((int (*)[3])l) ≡ *((int (*)[3])n); */ ; + /*@ assert *((int (*)[3])l) == *((int (*)[3])n); */ ; { int __gen_e_acsl_ne_9; __gen_e_acsl_ne_9 = 0; @@ -413,7 +413,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_ne_9,1,"Assertion","arrays", "(int [3])i != (int [3])k","tests/arith/array.i",59); } - /*@ assert (int [3])i ≢ (int [3])k; */ ; + /*@ assert (int [3])i != (int [3])k; */ ; { int __gen_e_acsl_eq_5; __gen_e_acsl_eq_5 = 1; @@ -436,7 +436,7 @@ void arrays(void) __e_acsl_assert(__gen_e_acsl_eq_5,1,"Assertion","arrays", "(int [3])j == (int [3])k","tests/arith/array.i",60); } - /*@ assert (int [3])j ≡ (int [3])k; */ ; + /*@ assert (int [3])j == (int [3])k; */ ; { int __gen_e_acsl_ne_10; __gen_e_acsl_ne_10 = 0; @@ -474,7 +474,7 @@ void arrays(void) "*((int (*)[2])l) != *((int (*)[2])m)", "tests/arith/array.i",61); } - /*@ assert *((int (*)[2])l) ≢ *((int (*)[2])m); */ ; + /*@ assert *((int (*)[2])l) != *((int (*)[2])m); */ ; { int __gen_e_acsl_eq_6; __gen_e_acsl_eq_6 = 1; @@ -512,7 +512,7 @@ void arrays(void) "*((int (*)[2])l) == *((int (*)[2])n)", "tests/arith/array.i",62); } - /*@ assert *((int (*)[2])l) ≡ *((int (*)[2])n); */ ; + /*@ assert *((int (*)[2])l) == *((int (*)[2])n); */ ; __e_acsl_delete_block((void *)(& n)); __e_acsl_delete_block((void *)(& m)); __e_acsl_delete_block((void *)(& l)); @@ -551,10 +551,10 @@ int main(void) } __e_acsl_assert(T1[0] == T2[0],1,"Assertion","main","T1[0] == T2[0]", "tests/arith/array.i",110); - /*@ assert T1[0] ≡ T2[0]; */ ; + /*@ assert T1[0] == T2[0]; */ ; __e_acsl_assert(T1[1] != T2[1],1,"Assertion","main","T1[1] != T2[1]", "tests/arith/array.i",111); - /*@ assert T1[1] ≢ T2[1]; */ ; + /*@ assert T1[1] != T2[1]; */ ; arrays(); vlas(3); __retres = 0; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_at.c b/src/plugins/e-acsl/tests/arith/oracle/gen_at.c index 3f1cdbd82498918ba38a0ea29a2adb92c0169da4..94dd9ebba6144043ba620aa9f0c2db4d07cf90b2 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_at.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_at.c @@ -5,7 +5,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; int A = 0; -/*@ ensures \at(A,Post) ≡ 3; */ +/*@ ensures \at(A,Post) == 3; */ void __gen_e_acsl_f(void); void f(void) @@ -24,16 +24,16 @@ void f(void) } __e_acsl_assert(__gen_e_acsl_at == 0,1,"Assertion","f","\\at(A,Pre) == 0", "tests/arith/at.i",12); - /*@ assert \at(A,Pre) ≡ 0; */ ; + /*@ assert \at(A,Pre) == 0; */ ; __e_acsl_assert(__gen_e_acsl_at_2 == 1,1,"Assertion","f","\\at(A,F) == 1", "tests/arith/at.i",13); - /*@ assert \at(A,F) ≡ 1; */ ; + /*@ assert \at(A,F) == 1; */ ; __e_acsl_assert(A == 2,1,"Assertion","f","\\at(A,Here) == 2", "tests/arith/at.i",14); - /*@ assert \at(A,Here) ≡ 2; */ ; + /*@ assert \at(A,Here) == 2; */ ; __e_acsl_assert(__gen_e_acsl_at_4 == 0,1,"Assertion","f", "\\at(\\at(A,Pre),F) == 0","tests/arith/at.i",15); - /*@ assert \at(\at(A,Pre),F) ≡ 0; */ ; + /*@ assert \at(\at(A,Pre),F) == 0; */ ; A = 3; return; } @@ -94,9 +94,9 @@ void g(int *p, int *q) __e_acsl_assert(__gen_e_acsl_at_2 == 2,1,"Assertion","g", "\\at(*(p + \\at(*q,__invalid_label)),L2) == 2", "tests/arith/at.i",29); - /*@ assert \at(*(p + \at(*q,__invalid_label)),L2) ≡ 2; */ ; + /*@ assert \at(*(p + \at(*q,__invalid_label)),L2) == 2; */ ; L3: - /*@ assert \at(*(p + \at(*q,__invalid_label)),Here) ≡ 2; */ + /*@ assert \at(*(p + \at(*q,__invalid_label)),Here) == 2; */ { int __gen_e_acsl_valid_read_4; __gen_e_acsl_valid_read_4 = __e_acsl_valid_read((void *)(p + __gen_e_acsl_at_3), @@ -114,7 +114,7 @@ void g(int *p, int *q) return; } -/*@ ensures \result ≡ \old(x); */ +/*@ ensures \result == \old(x); */ int __gen_e_acsl_h(int x); int h(int x) @@ -138,7 +138,7 @@ int main(void) __e_acsl_full_init((void *)(& x)); x = __gen_e_acsl_h(0); L: - /*@ assert x ≡ 0; */ + /*@ assert x == 0; */ { __gen_e_acsl_at_3 = (long)x; __gen_e_acsl_at_2 = x + 1L; @@ -153,13 +153,13 @@ int main(void) __gen_e_acsl_f(); __e_acsl_assert(__gen_e_acsl_at == 0,1,"Assertion","main", "\\at(x,__invalid_label) == 0","tests/arith/at.i",54); - /*@ assert \at(x,__invalid_label) ≡ 0; */ ; + /*@ assert \at(x,__invalid_label) == 0; */ ; __e_acsl_assert(__gen_e_acsl_at_2 == 1L,1,"Assertion","main", "\\at(x + 1,__invalid_label) == 1","tests/arith/at.i",55); - /*@ assert \at(x + 1,__invalid_label) ≡ 1; */ ; + /*@ assert \at(x + 1,__invalid_label) == 1; */ ; __e_acsl_assert(__gen_e_acsl_at_3 + 1L == 1L,1,"Assertion","main", "\\at(x,__invalid_label) + 1 == 1","tests/arith/at.i",56); - /*@ assert \at(x,__invalid_label) + 1 ≡ 1; */ ; + /*@ assert \at(x,__invalid_label) + 1 == 1; */ ; g(t,& x); __retres = 0; __e_acsl_delete_block((void *)(t)); @@ -168,7 +168,7 @@ int main(void) return __retres; } -/*@ ensures \result ≡ \old(x); */ +/*@ ensures \result == \old(x); */ int __gen_e_acsl_h(int x) { int __gen_e_acsl_at; @@ -184,7 +184,7 @@ int __gen_e_acsl_h(int x) return __retres; } -/*@ ensures \at(A,Post) ≡ 3; */ +/*@ ensures \at(A,Post) == 3; */ void __gen_e_acsl_f(void) { int __gen_e_acsl_at; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c b/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c index 2ea404238aff80f36a69bb2a84125a597a386d27..046380e82b5747970da5d2a0ff414782d3239721 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c @@ -5,9 +5,9 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ ensures - ∀ ℤ n; - 1 < n ≤ 3 ⇒ \old(*(t + n) ≡ 12) ∧ \old(*(t + (n - 1)) > 5); - ensures \let m = 4; \old(*(t + m) ≡ -4) ∧ \old(*(t + (m - 4))) ≡ 9; + \forall integer n; + 1 < n <= 3 ==> \old(*(t + n) == 12) && \old(*(t + (n - 1)) > 5); + ensures \let m = 4; \old(*(t + m) == -4) && \old(*(t + (m - 4))) == 9; */ void __gen_e_acsl_f(int *t); @@ -68,7 +68,7 @@ void g(void) "\\exists integer w; 3 <= w < 6 && \\at(m + w == 12,Q)", "tests/arith/at_on-purely-logic-variables.c",16); } - /*@ assert ∃ ℤ w; 3 ≤ w < 6 ∧ \at(m + w ≡ 12,Q); */ ; + /*@ assert \exists integer w; 3 <= w < 6 && \at(m + w == 12,Q); */ ; free((void *)__gen_e_acsl_at); return; } @@ -217,7 +217,7 @@ int main(void) "\\let i = 3; \\at(n + i == 10,L)", "tests/arith/at_on-purely-logic-variables.c",28); } - /*@ assert \let i = 3; \at(n + i ≡ 10,L); */ ; + /*@ assert \let i = 3; \at(n + i == 10,L); */ ; { int __gen_e_acsl_exists; int __gen_e_acsl_j; @@ -248,7 +248,7 @@ int main(void) "\\exists integer j; 2 <= j < 5 && \\at(n + j == 11,L)", "tests/arith/at_on-purely-logic-variables.c",29); } - /*@ assert ∃ ℤ j; 2 ≤ j < 5 ∧ \at(n + j ≡ 11,L); */ ; + /*@ assert \exists integer j; 2 <= j < 5 && \at(n + j == 11,L); */ ; { int __gen_e_acsl_k; int __gen_e_acsl_exists_2; @@ -304,9 +304,9 @@ int main(void) } /*@ assert \let k = -7; - ∃ ℤ u; - 9 ≤ u < 21 ∧ - (∀ ℤ v; -5 < v ≤ 6 ⇒ \at((u > 0? n + k: u + v) > 0,K)); + \exists integer u; + 9 <= u < 21 && + (\forall integer v; -5 < v <= 6 ==> \at((u > 0? n + k: u + v) > 0,K)); */ ; { @@ -324,7 +324,7 @@ int main(void) "\\let i = 3; \\at(n + i,L) == 10", "tests/arith/at_on-purely-logic-variables.c",38); } - /*@ assert \let i = 3; \at(n + i,L) ≡ 10; */ ; + /*@ assert \let i = 3; \at(n + i,L) == 10; */ ; unsigned int m = (unsigned int)3; G: { @@ -371,7 +371,7 @@ int main(void) "\\exists integer k; -9 < k < 0 && \\at(m + k,G) == 0", "tests/arith/at_on-purely-logic-variables.c",42); } - /*@ assert ∃ ℤ k; -9 < k < 0 ∧ \at(m + k,G) ≡ 0; */ ; + /*@ assert \exists integer k; -9 < k < 0 && \at(m + k,G) == 0; */ ; { int __gen_e_acsl_exists_4; int __gen_e_acsl_u_3; @@ -436,9 +436,10 @@ int main(void) } /*@ assert - ∃ ℤ u; - 9 ≤ u < 21 ∧ - (∀ ℤ v; -5 < v ≤ (u < 15? u + 6: 3) ⇒ \at((n + u) + v > 0,K)); + \exists integer u; + 9 <= u < 21 && + (\forall integer v; + -5 < v <= (u < 15? u + 6: 3) ==> \at((n + u) + v > 0,K)); */ ; int t[5] = {9, 12, 12, 12, -4}; @@ -525,19 +526,19 @@ int main(void) } /*@ assert - ∃ ℤ u; - 10 ≤ u < 20 ∧ - (∃ ℤ v; - -10 < v ≤ -5 + (\let u = -2; u) ∧ - (∃ ℤ w; - 100 < w ≤ 200 ∧ - \at((((n - u) + (\let u = 42; u)) + v) + w > 0,K))); + \exists integer u; + 10 <= u < 20 && + (\exists integer v; + -10 < v <= -5 + (\let u = -2; u) && + (\exists integer w; + 100 < w <= 200 && \at((((n - u) + (\let u = 42; u)) + v) + w > 0,K))); */ ; - /*@ assert ∃ ℤ j; 2 ≤ j < 10000000000000000 ∧ \at(n + j ≡ 11,L); + /*@ + assert \exists integer j; 2 <= j < 10000000000000000 && \at(n + j == 11,L); */ ; - /*@ assert \let i = n; \at(n + i ≡ 10,L); */ ; + /*@ assert \let i = n; \at(n + i == 10,L); */ ; __retres = 0; __e_acsl_delete_block((void *)(t)); __e_acsl_delete_block((void *)(& n)); @@ -553,9 +554,9 @@ int main(void) } /*@ ensures - ∀ ℤ n; - 1 < n ≤ 3 ⇒ \old(*(t + n) ≡ 12) ∧ \old(*(t + (n - 1)) > 5); - ensures \let m = 4; \old(*(t + m) ≡ -4) ∧ \old(*(t + (m - 4))) ≡ 9; + \forall integer n; + 1 < n <= 3 ==> \old(*(t + n) == 12) && \old(*(t + (n - 1)) > 5); + ensures \let m = 4; \old(*(t + m) == -4) && \old(*(t + (m - 4))) == 9; */ void __gen_e_acsl_f(int *t) { diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c b/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c index 0f0702660796a74f1fbd1999fcb8183ab7a63c73..ef36646f06423a81c165407973bac7ae3518fe6e 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c @@ -11,25 +11,25 @@ void f_signed(int a, int b) "tests/arith/bitwise.c",14); __e_acsl_assert((long)c == a << 2L,1,"Assertion","f_signed","c == a << 2", "tests/arith/bitwise.c",14); - /*@ assert c ≡ a << 2; */ ; + /*@ assert c == a << 2; */ ; int d = b >> 2; __e_acsl_assert(0 <= b,1,"RTE","f_signed","shift: 0 <= b", "tests/arith/bitwise.c",16); __e_acsl_assert(d == b >> 2,1,"Assertion","f_signed","d == b >> 2", "tests/arith/bitwise.c",16); - /*@ assert d ≡ b >> 2; */ ; + /*@ assert d == b >> 2; */ ; int e = a | b; __e_acsl_assert((long)e == (a | (long)b),1,"Assertion","f_signed", "e == (a | b)","tests/arith/bitwise.c",18); - /*@ assert e ≡ (a | b); */ ; + /*@ assert e == (a | b); */ ; int f = a & b; __e_acsl_assert((long)f == (a & (long)b),1,"Assertion","f_signed", "f == (a & b)","tests/arith/bitwise.c",20); - /*@ assert f ≡ (a & b); */ ; + /*@ assert f == (a & b); */ ; int g = a ^ b; __e_acsl_assert((long)g == (a ^ (long)b),1,"Assertion","f_signed", "g == (a ^ b)","tests/arith/bitwise.c",22); - /*@ assert g ≡ (a ^ b); */ ; + /*@ assert g == (a ^ b); */ ; return; } @@ -38,23 +38,23 @@ void f_unsigned(unsigned int a, unsigned int b) unsigned int c = a << 2u; __e_acsl_assert((unsigned long)c == a << 2UL,1,"Assertion","f_unsigned", "c == a << 2","tests/arith/bitwise.c",28); - /*@ assert c ≡ a << 2; */ ; + /*@ assert c == a << 2; */ ; unsigned int d = b >> 2u; __e_acsl_assert(d == b >> 2U,1,"Assertion","f_unsigned","d == b >> 2", "tests/arith/bitwise.c",30); - /*@ assert d ≡ b >> 2; */ ; + /*@ assert d == b >> 2; */ ; unsigned int e = a | b; __e_acsl_assert(e == (a | b),1,"Assertion","f_unsigned","e == (a | b)", "tests/arith/bitwise.c",32); - /*@ assert e ≡ (a | b); */ ; + /*@ assert e == (a | b); */ ; unsigned int f = a & b; __e_acsl_assert(f == (a & b),1,"Assertion","f_unsigned","f == (a & b)", "tests/arith/bitwise.c",34); - /*@ assert f ≡ (a & b); */ ; + /*@ assert f == (a & b); */ ; unsigned int g = a ^ b; __e_acsl_assert(g == (a ^ b),1,"Assertion","f_unsigned","g == (a ^ b)", "tests/arith/bitwise.c",36); - /*@ assert g ≡ (a ^ b); */ ; + /*@ assert g == (a ^ b); */ ; return; } @@ -77,7 +77,7 @@ void g_signed(int a, int b) __gen_e_acsl_b_shiftl_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl_b)); /*@ assert E_ACSL: shiftl_rhs_fits_in_mp_bitcnt_t: - 0 ≤ b ≤ 18446744073709551615; + 0 <= b <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_b_shiftl_guard,1,"RTE","g_signed", "shiftl_rhs_fits_in_mp_bitcnt_t: 0 <= b <= 18446744073709551615", @@ -87,7 +87,7 @@ void g_signed(int a, int b) __gen_e_acsl_a_shiftl_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_a), (__e_acsl_mpz_struct const *)(__gen_e_acsl_)); __gmpz_init(__gen_e_acsl_shiftl); - /*@ assert E_ACSL: a ≥ 0; */ + /*@ assert E_ACSL: a >= 0; */ __e_acsl_assert(__gen_e_acsl_a_shiftl_guard >= 0,1,"RTE","g_signed", "a >= 0","tests/arith/bitwise.c",42); __gmpz_mul_2exp(__gen_e_acsl_shiftl, @@ -103,7 +103,7 @@ void g_signed(int a, int b) __gmpz_clear(__gen_e_acsl_); __gmpz_clear(__gen_e_acsl_shiftl); } - /*@ assert c ≡ a << b; */ ; + /*@ assert c == a << b; */ ; int d = a >> b; { __e_acsl_mpz_t __gen_e_acsl_d; @@ -121,7 +121,7 @@ void g_signed(int a, int b) __gen_e_acsl_b_shiftr_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl_b_2)); /*@ assert E_ACSL: shiftr_rhs_fits_in_mp_bitcnt_t: - 0 ≤ b ≤ 18446744073709551615; + 0 <= b <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_b_shiftr_guard,1,"RTE","g_signed", "shiftr_rhs_fits_in_mp_bitcnt_t: 0 <= b <= 18446744073709551615", @@ -131,7 +131,7 @@ void g_signed(int a, int b) __gen_e_acsl_a_shiftr_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_a_2), (__e_acsl_mpz_struct const *)(__gen_e_acsl__2)); __gmpz_init(__gen_e_acsl_shiftr); - /*@ assert E_ACSL: a ≥ 0; */ + /*@ assert E_ACSL: a >= 0; */ __e_acsl_assert(__gen_e_acsl_a_shiftr_guard >= 0,1,"RTE","g_signed", "a >= 0","tests/arith/bitwise.c",44); __gmpz_tdiv_q_2exp(__gen_e_acsl_shiftr, @@ -147,7 +147,7 @@ void g_signed(int a, int b) __gmpz_clear(__gen_e_acsl__2); __gmpz_clear(__gen_e_acsl_shiftr); } - /*@ assert d ≡ a >> b; */ ; + /*@ assert d == a >> b; */ ; { __e_acsl_mpz_t __gen_e_acsl__3; __e_acsl_mpz_t __gen_e_acsl__4; @@ -167,7 +167,7 @@ void g_signed(int a, int b) __gen_e_acsl_cst_shiftl_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl__4)); /*@ assert E_ACSL: shiftl_rhs_fits_in_mp_bitcnt_t: - 0 ≤ 1 ≤ 18446744073709551615; + 0 <= 1 <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_cst_shiftl_guard,1,"RTE","g_signed", "shiftl_rhs_fits_in_mp_bitcnt_t: 0 <= 1 <= 18446744073709551615", @@ -177,7 +177,7 @@ void g_signed(int a, int b) __gen_e_acsl_shiftl_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add), (__e_acsl_mpz_struct const *)(__gen_e_acsl__5)); __gmpz_init(__gen_e_acsl_shiftl_2); - /*@ assert E_ACSL: 18446744073709551615ULL + 1 ≥ 0; */ + /*@ assert E_ACSL: 18446744073709551615ULL + 1 >= 0; */ __e_acsl_assert(__gen_e_acsl_shiftl_guard >= 0,1,"RTE","g_signed", "18446744073709551615ULL + 1 >= 0", "tests/arith/bitwise.c",46); @@ -195,7 +195,7 @@ void g_signed(int a, int b) __gmpz_clear(__gen_e_acsl__5); __gmpz_clear(__gen_e_acsl_shiftl_2); } - /*@ assert (18446744073709551615ULL + 1) << 1 ≢ 0; */ ; + /*@ assert (18446744073709551615ULL + 1) << 1 != 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__6; __e_acsl_mpz_t __gen_e_acsl__7; @@ -215,7 +215,7 @@ void g_signed(int a, int b) __gen_e_acsl_cst_shiftr_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl__7)); /*@ assert E_ACSL: shiftr_rhs_fits_in_mp_bitcnt_t: - 0 ≤ 1 ≤ 18446744073709551615; + 0 <= 1 <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_cst_shiftr_guard,1,"RTE","g_signed", "shiftr_rhs_fits_in_mp_bitcnt_t: 0 <= 1 <= 18446744073709551615", @@ -225,7 +225,7 @@ void g_signed(int a, int b) __gen_e_acsl_shiftr_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2), (__e_acsl_mpz_struct const *)(__gen_e_acsl__8)); __gmpz_init(__gen_e_acsl_shiftr_2); - /*@ assert E_ACSL: 18446744073709551615ULL + 1 ≥ 0; */ + /*@ assert E_ACSL: 18446744073709551615ULL + 1 >= 0; */ __e_acsl_assert(__gen_e_acsl_shiftr_guard >= 0,1,"RTE","g_signed", "18446744073709551615ULL + 1 >= 0", "tests/arith/bitwise.c",47); @@ -242,7 +242,7 @@ void g_signed(int a, int b) __gmpz_clear(__gen_e_acsl__8); __gmpz_clear(__gen_e_acsl_shiftr_2); } - /*@ assert (18446744073709551615ULL + 1) >> 1 ≢ 0; */ ; + /*@ assert (18446744073709551615ULL + 1) >> 1 != 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__10; __e_acsl_mpz_t __gen_e_acsl__11; @@ -257,7 +257,7 @@ void g_signed(int a, int b) __gen_e_acsl_cst_shiftl_guard_2 = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl__11)); /*@ assert E_ACSL: shiftl_rhs_fits_in_mp_bitcnt_t: - 0 ≤ 65 ≤ 18446744073709551615; + 0 <= 65 <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_cst_shiftl_guard_2,1,"RTE","g_signed", "shiftl_rhs_fits_in_mp_bitcnt_t: 0 <= 65 <= 18446744073709551615", @@ -267,7 +267,7 @@ void g_signed(int a, int b) __gen_e_acsl_cst_shiftl_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__10), (__e_acsl_mpz_struct const *)(__gen_e_acsl__12)); __gmpz_init(__gen_e_acsl_shiftl_3); - /*@ assert E_ACSL: 1 ≥ 0; */ + /*@ assert E_ACSL: 1 >= 0; */ __e_acsl_assert(__gen_e_acsl_cst_shiftl_guard_3 >= 0,1,"RTE","g_signed", "1 >= 0","tests/arith/bitwise.c",48); __gmpz_mul_2exp(__gen_e_acsl_shiftl_3, @@ -282,7 +282,7 @@ void g_signed(int a, int b) __gmpz_clear(__gen_e_acsl__12); __gmpz_clear(__gen_e_acsl_shiftl_3); } - /*@ assert 1 << 65 ≢ 0; */ ; + /*@ assert 1 << 65 != 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__13; __e_acsl_mpz_t __gen_e_acsl__14; @@ -323,8 +323,8 @@ void g_signed(int a, int b) } /*@ assert - ((18446744073709551615ULL + 1) | ((-9223372036854775807LL - 1LL) - 1)) ≢ - 0; */ + ((18446744073709551615ULL + 1) | ((-9223372036854775807LL - 1LL) - 1)) != 0; + */ ; { __e_acsl_mpz_t __gen_e_acsl__17; @@ -369,7 +369,7 @@ void g_signed(int a, int b) } /*@ assert - ((18446744073709551615ULL + 1) & ((-9223372036854775807LL - 1LL) - 1)) ≢ + ((18446744073709551615ULL + 1) & ((-9223372036854775807LL - 1LL) - 1)) != ((18446744073709551615ULL + 1) ^ ((-9223372036854775807LL - 1LL) - 1)); */ ; return; @@ -394,7 +394,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_b_shiftl_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl_b)); /*@ assert E_ACSL: shiftl_rhs_fits_in_mp_bitcnt_t: - 0 ≤ b ≤ 18446744073709551615; + 0 <= b <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_b_shiftl_guard,1,"RTE","g_unsigned", "shiftl_rhs_fits_in_mp_bitcnt_t: 0 <= b <= 18446744073709551615", @@ -404,7 +404,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_a_shiftl_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_a), (__e_acsl_mpz_struct const *)(__gen_e_acsl_)); __gmpz_init(__gen_e_acsl_shiftl); - /*@ assert E_ACSL: a ≥ 0; */ + /*@ assert E_ACSL: a >= 0; */ __e_acsl_assert(__gen_e_acsl_a_shiftl_guard >= 0,1,"RTE","g_unsigned", "a >= 0","tests/arith/bitwise.c",57); __gmpz_mul_2exp(__gen_e_acsl_shiftl, @@ -420,7 +420,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gmpz_clear(__gen_e_acsl_); __gmpz_clear(__gen_e_acsl_shiftl); } - /*@ assert c ≡ a << b; */ ; + /*@ assert c == a << b; */ ; unsigned int d = a >> b; { __e_acsl_mpz_t __gen_e_acsl_d; @@ -438,7 +438,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_b_shiftr_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl_b_2)); /*@ assert E_ACSL: shiftr_rhs_fits_in_mp_bitcnt_t: - 0 ≤ b ≤ 18446744073709551615; + 0 <= b <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_b_shiftr_guard,1,"RTE","g_unsigned", "shiftr_rhs_fits_in_mp_bitcnt_t: 0 <= b <= 18446744073709551615", @@ -448,7 +448,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_a_shiftr_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_a_2), (__e_acsl_mpz_struct const *)(__gen_e_acsl__2)); __gmpz_init(__gen_e_acsl_shiftr); - /*@ assert E_ACSL: a ≥ 0; */ + /*@ assert E_ACSL: a >= 0; */ __e_acsl_assert(__gen_e_acsl_a_shiftr_guard >= 0,1,"RTE","g_unsigned", "a >= 0","tests/arith/bitwise.c",59); __gmpz_tdiv_q_2exp(__gen_e_acsl_shiftr, @@ -464,7 +464,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gmpz_clear(__gen_e_acsl__2); __gmpz_clear(__gen_e_acsl_shiftr); } - /*@ assert d ≡ a >> b; */ ; + /*@ assert d == a >> b; */ ; { __e_acsl_mpz_t __gen_e_acsl__3; __e_acsl_mpz_t __gen_e_acsl__4; @@ -484,7 +484,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_cst_shiftl_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl__4)); /*@ assert E_ACSL: shiftl_rhs_fits_in_mp_bitcnt_t: - 0 ≤ 1u ≤ 18446744073709551615; + 0 <= 1u <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_cst_shiftl_guard,1,"RTE","g_unsigned", "shiftl_rhs_fits_in_mp_bitcnt_t: 0 <= 1u <= 18446744073709551615", @@ -494,7 +494,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_shiftl_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add), (__e_acsl_mpz_struct const *)(__gen_e_acsl__5)); __gmpz_init(__gen_e_acsl_shiftl_2); - /*@ assert E_ACSL: 18446744073709551615ULL + 1u ≥ 0; */ + /*@ assert E_ACSL: 18446744073709551615ULL + 1u >= 0; */ __e_acsl_assert(__gen_e_acsl_shiftl_guard >= 0,1,"RTE","g_unsigned", "18446744073709551615ULL + 1u >= 0", "tests/arith/bitwise.c",61); @@ -512,7 +512,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gmpz_clear(__gen_e_acsl__5); __gmpz_clear(__gen_e_acsl_shiftl_2); } - /*@ assert (18446744073709551615ULL + 1u) << 1u ≢ 0; */ ; + /*@ assert (18446744073709551615ULL + 1u) << 1u != 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__6; __e_acsl_mpz_t __gen_e_acsl__7; @@ -532,7 +532,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_cst_shiftr_guard = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl__7)); /*@ assert E_ACSL: shiftr_rhs_fits_in_mp_bitcnt_t: - 0 ≤ 1u ≤ 18446744073709551615; + 0 <= 1u <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_cst_shiftr_guard,1,"RTE","g_unsigned", "shiftr_rhs_fits_in_mp_bitcnt_t: 0 <= 1u <= 18446744073709551615", @@ -542,7 +542,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_shiftr_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_add_2), (__e_acsl_mpz_struct const *)(__gen_e_acsl__8)); __gmpz_init(__gen_e_acsl_shiftr_2); - /*@ assert E_ACSL: 18446744073709551615ULL + 1u ≥ 0; */ + /*@ assert E_ACSL: 18446744073709551615ULL + 1u >= 0; */ __e_acsl_assert(__gen_e_acsl_shiftr_guard >= 0,1,"RTE","g_unsigned", "18446744073709551615ULL + 1u >= 0", "tests/arith/bitwise.c",62); @@ -559,7 +559,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gmpz_clear(__gen_e_acsl__8); __gmpz_clear(__gen_e_acsl_shiftr_2); } - /*@ assert (18446744073709551615ULL + 1u) >> 1u ≢ 0; */ ; + /*@ assert (18446744073709551615ULL + 1u) >> 1u != 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__10; __e_acsl_mpz_t __gen_e_acsl__11; @@ -574,7 +574,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_cst_shiftl_guard_2 = __gmpz_fits_ulong_p((__e_acsl_mpz_struct const *)(__gen_e_acsl__11)); /*@ assert E_ACSL: shiftl_rhs_fits_in_mp_bitcnt_t: - 0 ≤ 65u ≤ 18446744073709551615; + 0 <= 65u <= 18446744073709551615; */ __e_acsl_assert(__gen_e_acsl_cst_shiftl_guard_2,1,"RTE","g_unsigned", "shiftl_rhs_fits_in_mp_bitcnt_t: 0 <= 65u <= 18446744073709551615", @@ -584,7 +584,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gen_e_acsl_cst_shiftl_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__10), (__e_acsl_mpz_struct const *)(__gen_e_acsl__12)); __gmpz_init(__gen_e_acsl_shiftl_3); - /*@ assert E_ACSL: 1u ≥ 0; */ + /*@ assert E_ACSL: 1u >= 0; */ __e_acsl_assert(__gen_e_acsl_cst_shiftl_guard_3 >= 0,1,"RTE", "g_unsigned","1u >= 0","tests/arith/bitwise.c",63); __gmpz_mul_2exp(__gen_e_acsl_shiftl_3, @@ -599,7 +599,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gmpz_clear(__gen_e_acsl__12); __gmpz_clear(__gen_e_acsl_shiftl_3); } - /*@ assert 1u << 65u ≢ 0; */ ; + /*@ assert 1u << 65u != 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__13; __e_acsl_mpz_t __gen_e_acsl__14; @@ -629,7 +629,7 @@ void g_unsigned(unsigned int a, unsigned int b) __gmpz_clear(__gen_e_acsl_bor); __gmpz_clear(__gen_e_acsl__15); } - /*@ assert ((18446744073709551615ULL + 1u) | 1u) ≢ 0; */ ; + /*@ assert ((18446744073709551615ULL + 1u) | 1u) != 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__16; __e_acsl_mpz_t __gen_e_acsl__17; @@ -664,7 +664,7 @@ void g_unsigned(unsigned int a, unsigned int b) } /*@ assert - ((18446744073709551615ULL + 1u) & 1u) ≢ + ((18446744073709551615ULL + 1u) & 1u) != ((18446744073709551615ULL + 1u) ^ 1u); */ ; return; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c b/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c index c90b243c08b820282bfe99606fabc72eac11e6ac..41c8e9b4676232625688cd6c1c745c94a4640df3 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c @@ -11,26 +11,26 @@ int main(void) int y = 0; __e_acsl_assert((int)x == y,1,"Assertion","main","(int)x == y", "tests/arith/cast.i",9); - /*@ assert (int)x ≡ y; */ ; + /*@ assert (int)x == y; */ ; __e_acsl_assert(x == (long)y,1,"Assertion","main","x == (long)y", "tests/arith/cast.i",10); - /*@ assert x ≡ (long)y; */ ; + /*@ assert x == (long)y; */ ; __e_acsl_assert(y == 0,1,"Assertion","main","y == (int)0", "tests/arith/cast.i",12); - /*@ assert y ≡ (int)0; */ ; + /*@ assert y == (int)0; */ ; __e_acsl_assert((unsigned int)y == 0U,1,"Assertion","main", "(unsigned int)y == (unsigned int)0","tests/arith/cast.i", 13); - /*@ assert (unsigned int)y ≡ (unsigned int)0; */ ; + /*@ assert (unsigned int)y == (unsigned int)0; */ ; __e_acsl_assert(y != -1,1,"Assertion","main","y != (int)0xfffffffffffffff", "tests/arith/cast.i",16); - /*@ assert y ≢ (int)0xfffffffffffffff; */ ; + /*@ assert y != (int)0xfffffffffffffff; */ ; __e_acsl_assert((unsigned int)y != 4294967295U,1,"Assertion","main", "(unsigned int)y != (unsigned int)0xfffffffffffffff", "tests/arith/cast.i",17); - /*@ assert (unsigned int)y ≢ (unsigned int)0xfffffffffffffff; */ ; + /*@ assert (unsigned int)y != (unsigned int)0xfffffffffffffff; */ ; int t[2] = {0, 1}; - /*@ assert (float)x ≡ t[(int)0.1]; */ ; + /*@ assert (float)x == t[(int)0.1]; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c b/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c index 54bd5b922db1f35431245daea4cb02c20ae03002..4d8477ede08cc48981c87c785f3558576f854be0 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c @@ -17,14 +17,14 @@ int main(void) /*@ assert y > x; */ ; __e_acsl_assert(x <= 0,1,"Assertion","main","x <= 0", "tests/arith/comparison.i",9); - /*@ assert x ≤ 0; */ ; + /*@ assert x <= 0; */ ; __e_acsl_assert(y >= 1,1,"Assertion","main","y >= 1", "tests/arith/comparison.i",10); - /*@ assert y ≥ 1; */ ; + /*@ assert y >= 1; */ ; char *s = (char *)"toto"; __e_acsl_assert(s == s,1,"Assertion","main","s == s", "tests/arith/comparison.i",12); - /*@ assert s ≡ s; */ ; + /*@ assert s == s; */ ; __e_acsl_assert(1,1,"Assertion","main","5 < 18","tests/arith/comparison.i", 15); /*@ assert 5 < 18; */ ; @@ -33,16 +33,16 @@ int main(void) /*@ assert 32 > 3; */ ; __e_acsl_assert(1,1,"Assertion","main","12 <= 13", "tests/arith/comparison.i",17); - /*@ assert 12 ≤ 13; */ ; + /*@ assert 12 <= 13; */ ; __e_acsl_assert(1,1,"Assertion","main","123 >= 12", "tests/arith/comparison.i",18); - /*@ assert 123 ≥ 12; */ ; + /*@ assert 123 >= 12; */ ; __e_acsl_assert(1,1,"Assertion","main","0xff == 0xff", "tests/arith/comparison.i",19); - /*@ assert 0xff ≡ 0xff; */ ; + /*@ assert 0xff == 0xff; */ ; __e_acsl_assert(1,1,"Assertion","main","1 != 2","tests/arith/comparison.i", 20); - /*@ assert 1 ≢ 2; */ ; + /*@ assert 1 != 2; */ ; __e_acsl_assert(1,1,"Assertion","main","-5 < 18", "tests/arith/comparison.i",22); /*@ assert -5 < 18; */ ; @@ -51,16 +51,16 @@ int main(void) /*@ assert 32 > -3; */ ; __e_acsl_assert(1,1,"Assertion","main","-12 <= 13", "tests/arith/comparison.i",24); - /*@ assert -12 ≤ 13; */ ; + /*@ assert -12 <= 13; */ ; __e_acsl_assert(1,1,"Assertion","main","123 >= -12", "tests/arith/comparison.i",25); - /*@ assert 123 ≥ -12; */ ; + /*@ assert 123 >= -12; */ ; __e_acsl_assert(1,1,"Assertion","main","-0xff == -0xff", "tests/arith/comparison.i",26); - /*@ assert -0xff ≡ -0xff; */ ; + /*@ assert -0xff == -0xff; */ ; __e_acsl_assert(1,1,"Assertion","main","1 != -2", "tests/arith/comparison.i",27); - /*@ assert 1 ≢ -2; */ ; + /*@ assert 1 != -2; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c b/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c index da4ae76d9a2dc941cd22be41c7151f8fe73144aa..f7f8e47b19f1319120bd2b3966d5f7cb925680ad 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c @@ -24,17 +24,16 @@ int main(void) __gen_e_acsl_cond = __gen_e_acsl_k > 10; if (__gen_e_acsl_cond) break; else { - /*@ assert Eva: signed_overflow: 2 * __gen_e_acsl_k ≤ 2147483647; - */ + /*@ assert Eva: signed_overflow: 2 * __gen_e_acsl_k <= 2147483647; */ __gen_e_acsl_lambda = 2 * __gen_e_acsl_k; /*@ assert Eva: signed_overflow: - __gen_e_acsl_accumulator + __gen_e_acsl_lambda ≤ 2147483647; + __gen_e_acsl_accumulator + __gen_e_acsl_lambda <= 2147483647; */ __gen_e_acsl_accumulator += __gen_e_acsl_lambda; /*@ assert Eva: signed_overflow: - __gen_e_acsl_k + __gen_e_acsl_one ≤ 2147483647; + __gen_e_acsl_k + __gen_e_acsl_one <= 2147483647; */ __gen_e_acsl_k += __gen_e_acsl_one; } @@ -43,7 +42,7 @@ int main(void) "\\sum(2, 10, \\lambda integer k; 2 * k) == 108", "tests/arith/extended_quantifiers.c",11); } - /*@ assert \sum(2, 10, \lambda ℤ k; 2 * k) ≡ 108; */ ; + /*@ assert \sum(2, 10, \lambda integer k; 2 * k) == 108; */ ; { int __gen_e_acsl_k_2; int __gen_e_acsl_one_2; @@ -73,7 +72,7 @@ int main(void) (__e_acsl_mpz_struct const *)(__gen_e_acsl_lambda_2)); /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_2 + __gen_e_acsl_one_2 ≤ 2147483647; + __gen_e_acsl_k_2 + __gen_e_acsl_one_2 <= 2147483647; */ __gen_e_acsl_k_2 += __gen_e_acsl_one_2; } @@ -88,7 +87,8 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator_2); __gmpz_clear(__gen_e_acsl__2); } - /*@ assert \sum(2, 35, \lambda ℤ k; 18446744073709551615ULL) ≢ 0; */ ; + /*@ assert \sum(2, 35, \lambda integer k; 18446744073709551615ULL) != 0; */ + ; { int __gen_e_acsl_k_3; int __gen_e_acsl_one_3; @@ -113,7 +113,7 @@ int main(void) "\\sum(10, 2, \\lambda integer k; k) == 0", "tests/arith/extended_quantifiers.c",13); } - /*@ assert \sum(10, 2, \lambda ℤ k; k) ≡ 0; */ ; + /*@ assert \sum(10, 2, \lambda integer k; k) == 0; */ ; { __e_acsl_mpz_t __gen_e_acsl_x; __e_acsl_mpz_t __gen_e_acsl_mul; @@ -167,7 +167,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator_4); __gmpz_clear(__gen_e_acsl__4); } - /*@ assert \sum(x * x, 2, \lambda ℤ k; k) ≡ 0; */ ; + /*@ assert \sum(x * x, 2, \lambda integer k; k) == 0; */ ; { __e_acsl_mpz_t __gen_e_acsl__5; __e_acsl_mpz_t __gen_e_acsl__6; @@ -192,7 +192,7 @@ int main(void) __gen_e_acsl_lambda_5 = 1; /*@ assert Eva: signed_overflow: - __gen_e_acsl_accumulator_5 + __gen_e_acsl_lambda_5 ≤ + __gen_e_acsl_accumulator_5 + __gen_e_acsl_lambda_5 <= 2147483647; */ __gen_e_acsl_accumulator_5 += __gen_e_acsl_lambda_5; @@ -212,8 +212,8 @@ int main(void) /*@ assert \sum(18446744073709551615ULL - 5, 18446744073709551615ULL, - \lambda ℤ k; 1) - ≡ 6; */ + \lambda integer k; 1) + == 6; */ ; { unsigned int __gen_e_acsl_k_6; @@ -240,7 +240,8 @@ int main(void) "\\sum(2147483647, 2147483647, \\lambda integer k; k) + 1 > 2147483647", "tests/arith/extended_quantifiers.c",16); } - /*@ assert \sum(2147483647, 2147483647, \lambda ℤ k; k) + 1 > 2147483647; + /*@ + assert \sum(2147483647, 2147483647, \lambda integer k; k) + 1 > 2147483647; */ ; { @@ -263,13 +264,13 @@ int main(void) __gen_e_acsl_lambda_7 = -2147483647 - 1; /*@ assert Eva: signed_overflow: - -9223372036854775808 ≤ + -9223372036854775808 <= __gen_e_acsl_accumulator_7 + __gen_e_acsl_lambda_7; */ __gen_e_acsl_accumulator_7 += __gen_e_acsl_lambda_7; /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_7 + __gen_e_acsl_one_7 ≤ 2147483647; + __gen_e_acsl_k_7 + __gen_e_acsl_one_7 <= 2147483647; */ __gen_e_acsl_k_7 += __gen_e_acsl_one_7; } @@ -280,7 +281,7 @@ int main(void) } /*@ assert - \let x = 0 ≡ 0? 1: 10; \sum(x, 10, \lambda ℤ k; -2147483647 - 1) < 0; + \let x = 0 == 0? 1: 10; \sum(x, 10, \lambda integer k; -2147483647 - 1) < 0; */ ; { @@ -306,13 +307,13 @@ int main(void) } /*@ assert Eva: signed_overflow: - __gen_e_acsl_accumulator_8 + __gen_e_acsl_lambda_8 ≤ + __gen_e_acsl_accumulator_8 + __gen_e_acsl_lambda_8 <= 2147483647; */ __gen_e_acsl_accumulator_8 += __gen_e_acsl_lambda_8; /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_8 + __gen_e_acsl_one_8 ≤ 2147483647; + __gen_e_acsl_k_8 + __gen_e_acsl_one_8 <= 2147483647; */ __gen_e_acsl_k_8 += __gen_e_acsl_one_8; } @@ -321,7 +322,7 @@ int main(void) "\\numof(2, 10, \\lambda integer k; k - 2 >= 0) == 9", "tests/arith/extended_quantifiers.c",20); } - /*@ assert \numof(2, 10, \lambda ℤ k; k - 2 ≥ 0) ≡ 9; */ ; + /*@ assert \numof(2, 10, \lambda integer k; k - 2 >= 0) == 9; */ ; { unsigned long __gen_e_acsl_k_9; unsigned long __gen_e_acsl_one_9; @@ -345,7 +346,7 @@ int main(void) } /*@ assert Eva: signed_overflow: - __gen_e_acsl_accumulator_9 + __gen_e_acsl_lambda_9 ≤ + __gen_e_acsl_accumulator_9 + __gen_e_acsl_lambda_9 <= 2147483647; */ __gen_e_acsl_accumulator_9 += __gen_e_acsl_lambda_9; @@ -358,7 +359,8 @@ int main(void) } /*@ assert - \numof(4294967295U - 5, 4294967295U, \lambda ℤ k; k % 2 ≡ 1) ≡ 3; */ + \numof(4294967295U - 5, 4294967295U, \lambda integer k; k % 2 == 1) == 3; + */ ; { int __gen_e_acsl_k_10; @@ -383,7 +385,7 @@ int main(void) (__e_acsl_mpz_struct const *)(__gen_e_acsl_lambda_10)); /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_10 + __gen_e_acsl_one_10 ≤ 2147483647; + __gen_e_acsl_k_10 + __gen_e_acsl_one_10 <= 2147483647; */ __gen_e_acsl_k_10 += __gen_e_acsl_one_10; } @@ -398,7 +400,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator_10); __gmpz_clear(__gen_e_acsl__7); } - /*@ assert \product(1, 100, \lambda ℤ k; k) ≥ 3628800; */ ; + /*@ assert \product(1, 100, \lambda integer k; k) >= 3628800; */ ; { int __gen_e_acsl_k_11; int __gen_e_acsl_one_11; @@ -418,7 +420,7 @@ int main(void) __gen_e_acsl_accumulator_11 *= __gen_e_acsl_lambda_11; /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_11 + __gen_e_acsl_one_11 ≤ 2147483647; + __gen_e_acsl_k_11 + __gen_e_acsl_one_11 <= 2147483647; */ __gen_e_acsl_k_11 += __gen_e_acsl_one_11; } @@ -428,7 +430,7 @@ int main(void) "\\product(1, 10, \\lambda integer k; k) == 3628800", "tests/arith/extended_quantifiers.c",26); } - /*@ assert \product(1, 10, \lambda ℤ k; k) ≡ 3628800; */ ; + /*@ assert \product(1, 10, \lambda integer k; k) == 3628800; */ ; { int __gen_e_acsl_k_12; int __gen_e_acsl_one_12; @@ -452,7 +454,7 @@ int main(void) (__e_acsl_mpz_struct const *)(__gen_e_acsl_lambda_12)); /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_12 + __gen_e_acsl_one_12 ≤ 2147483647; + __gen_e_acsl_k_12 + __gen_e_acsl_one_12 <= 2147483647; */ __gen_e_acsl_k_12 += __gen_e_acsl_one_12; } @@ -467,7 +469,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator_12); __gmpz_clear(__gen_e_acsl__8); } - /*@ assert \product(-10, 10, \lambda ℤ k; k) ≡ 0; */ ; + /*@ assert \product(-10, 10, \lambda integer k; k) == 0; */ ; { int __gen_e_acsl_k_13; int __gen_e_acsl_one_13; @@ -492,7 +494,7 @@ int main(void) { __e_acsl_mpz_t __gen_e_acsl__9; /*@ assert - Eva: signed_overflow: 2 * __gen_e_acsl_k_13 ≤ 2147483647; + Eva: signed_overflow: 2 * __gen_e_acsl_k_13 <= 2147483647; */ __gmpz_init_set_si(__gen_e_acsl__9,(long)(2 * __gen_e_acsl_k_13)); __gmpz_set(__gen_e_acsl_lambda_13, @@ -504,7 +506,7 @@ int main(void) (__e_acsl_mpz_struct const *)(__gen_e_acsl_lambda_13)); /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_13 + __gen_e_acsl_one_13 ≤ 2147483647; + __gen_e_acsl_k_13 + __gen_e_acsl_one_13 <= 2147483647; */ __gen_e_acsl_k_13 += __gen_e_acsl_one_13; } @@ -521,7 +523,7 @@ int main(void) { __e_acsl_mpz_t __gen_e_acsl__10; /*@ assert - Eva: signed_overflow: 2 * __gen_e_acsl_k_14 ≤ 2147483647; + Eva: signed_overflow: 2 * __gen_e_acsl_k_14 <= 2147483647; */ __gmpz_init_set_si(__gen_e_acsl__10,(long)(2 * __gen_e_acsl_k_14)); __gmpz_set(__gen_e_acsl_lambda_14, @@ -533,7 +535,7 @@ int main(void) (__e_acsl_mpz_struct const *)(__gen_e_acsl_lambda_14)); /*@ assert Eva: signed_overflow: - __gen_e_acsl_k_14 + __gen_e_acsl_one_14 ≤ 2147483647; + __gen_e_acsl_k_14 + __gen_e_acsl_one_14 <= 2147483647; */ __gen_e_acsl_k_14 += __gen_e_acsl_one_14; } @@ -550,8 +552,8 @@ int main(void) } /*@ assert - \product(-20, -1, \lambda ℤ k; 2 * k) ≡ - \product(1, 20, \lambda ℤ k; 2 * k); */ + \product(-20, -1, \lambda integer k; 2 * k) == + \product(1, 20, \lambda integer k; 2 * k); */ ; __retres = 0; return __retres; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c b/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c index bd14370f572710c15132e2d91dabb069a4ff9fc3..f586877d4cfc6521766aad327bcf6a227163c803 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c @@ -13,7 +13,7 @@ typedef struct mystruct mystruct; */ int __gen_e_acsl_p1(int x, int y); -/*@ predicate p2(ℤ x, ℤ y) = x + y > 0; +/*@ predicate p2(integer x, integer y) = x + y > 0; */ int __gen_e_acsl_p2(int x, int y); @@ -22,7 +22,7 @@ int __gen_e_acsl_p2_5(int x, long y); int __gen_e_acsl_p2_3(int x, __e_acsl_mpz_struct * y); -/*@ logic ℤ f1(ℤ x, ℤ y) = x + y; +/*@ logic integer f1(integer x, integer y) = x + y; */ long __gen_e_acsl_f1(int x, int y); @@ -53,11 +53,11 @@ int __gen_e_acsl_g(int x); */ mystruct __gen_e_acsl_t1(mystruct m); -/*@ logic ℤ t2(mystruct m) = m.k + m.l; +/*@ logic integer t2(mystruct m) = m.k + m.l; */ long __gen_e_acsl_t2(mystruct m); -/*@ predicate k_pred(ℤ x) = x > 0; +/*@ predicate k_pred(integer x) = x > 0; */ int __gen_e_acsl_k_pred(int x); @@ -71,15 +71,15 @@ void k(int x) } int glob = 5; -/*@ predicate never_called(int x) = x ≡ x; +/*@ predicate never_called(int x) = x == x; */ /*@ logic double f2(double x) = (double)(1 / x); */ double __gen_e_acsl_f2(double x); -/*@ predicate p_notyet{L}(ℤ x) = x > 0; +/*@ predicate p_notyet{L}(integer x) = x > 0; */ -/*@ logic ℤ f_notyet{L}(ℤ x) = x; +/*@ logic integer f_notyet{L}(integer x) = x; */ int main(void) @@ -120,7 +120,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_f1_2 == 3L,1,"Assertion","main", "f1(x, y) == 3","tests/arith/functions.c",48); } - /*@ assert f1(x, y) ≡ 3; */ ; + /*@ assert f1(x, y) == 3; */ ; { long __gen_e_acsl_f1_4; int __gen_e_acsl_p2_6; @@ -170,7 +170,7 @@ int main(void) } /*@ assert - f1(99999999999999999999999999999, 99999999999999999999999999999) ≡ + f1(99999999999999999999999999999, 99999999999999999999999999999) == 199999999999999999999999999998; */ ; { @@ -179,7 +179,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_g_2 == x,1,"Assertion","main","g(x) == x", "tests/arith/functions.c",56); } - /*@ assert g(x) ≡ x; */ ; + /*@ assert g(x) == x; */ ; char c = (char)'c'; { int __gen_e_acsl_h_char_2; @@ -187,7 +187,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_h_char_2 == (int)c,1,"Assertion","main", "h_char(c) == c","tests/arith/functions.c",59); } - /*@ assert h_char(c) ≡ c; */ ; + /*@ assert h_char(c) == c; */ ; short s = (short)1; { int __gen_e_acsl_h_short_2; @@ -195,7 +195,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_h_short_2 == (int)s,1,"Assertion","main", "h_short(s) == s","tests/arith/functions.c",61); } - /*@ assert h_short(s) ≡ s; */ ; + /*@ assert h_short(s) == s; */ ; m.k = 8; m.l = 9; { @@ -206,7 +206,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_t2_2 == 17L,1,"Assertion","main", "t2(t1(m)) == 17","tests/arith/functions.c",66); } - /*@ assert t2(t1(m)) ≡ 17; */ ; + /*@ assert t2(t1(m)) == 17; */ ; __gen_e_acsl_k(9); double d = 2.0; { diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c b/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c index 42f39839d7871600dd9480a187537ec73c875f27..756d298f7e4e79d9c6c1820fddbf38343e474f30 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c @@ -4,7 +4,7 @@ #include "stdio.h" extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ logic ℤ f1(ℤ n) = n ≤ 0? 0: f1(n - 1) + n; +/*@ logic integer f1(integer n) = n <= 0? 0: f1(n - 1) + n; */ void __gen_e_acsl_f1(__e_acsl_mpz_t *__retres_arg, int n); @@ -13,7 +13,8 @@ void __gen_e_acsl_f1_2(__e_acsl_mpz_t *__retres_arg, long n); void __gen_e_acsl_f1_3(__e_acsl_mpz_t *__retres_arg, __e_acsl_mpz_struct * n); -/*@ logic ℤ f2(ℤ n) = n < 0? 1: (f2(n - 1) * f2(n - 2)) / f2(n - 3); +/*@ +logic integer f2(integer n) = n < 0? 1: (f2(n - 1) * f2(n - 2)) / f2(n - 3); */ int __gen_e_acsl_f2(int n); @@ -22,7 +23,7 @@ int __gen_e_acsl_f2_2(long n); int __gen_e_acsl_f2_3(__e_acsl_mpz_struct * n); -/*@ logic ℤ g(ℤ n) = 0; +/*@ logic integer g(integer n) = 0; */ int __gen_e_acsl_g(int n); @@ -31,7 +32,7 @@ int __gen_e_acsl_g_3(long n); int __gen_e_acsl_g_5(__e_acsl_mpz_struct * n); -/*@ logic ℤ f3(ℤ n) = n > 0? g(n) * f3(n - 1) - 5: g(n + 1); +/*@ logic integer f3(integer n) = n > 0? g(n) * f3(n - 1) - 5: g(n + 1); */ int __gen_e_acsl_f3(int n); @@ -41,7 +42,7 @@ int __gen_e_acsl_f3_2(long n); int __gen_e_acsl_f3_3(__e_acsl_mpz_struct * n); /*@ -logic ℤ f4(ℤ n) = +logic integer f4(integer n) = n < 100? f4(n + 1): (n < 0x7fffffffffffffffL? 0x7fffffffffffffffL: 6); */ @@ -51,7 +52,7 @@ unsigned long __gen_e_acsl_f4_2(long n); unsigned long __gen_e_acsl_f4_3(__e_acsl_mpz_struct * n); -/*@ logic ℤ f5(ℤ n) = n ≥ 0? 0: f5(n + 1) + n; +/*@ logic integer f5(integer n) = n >= 0? 0: f5(n + 1) + n; */ void __gen_e_acsl_f5(__e_acsl_mpz_t *__retres_arg, int n); @@ -76,7 +77,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_f1_8); __gmpz_clear(__gen_e_acsl__7); } - /*@ assert f1(0) ≡ 0; */ ; + /*@ assert f1(0) == 0; */ ; { __e_acsl_mpz_t __gen_e_acsl_f1_10; __e_acsl_mpz_t __gen_e_acsl__8; @@ -90,7 +91,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_f1_10); __gmpz_clear(__gen_e_acsl__8); } - /*@ assert f1(1) ≡ 1; */ ; + /*@ assert f1(1) == 1; */ ; { __e_acsl_mpz_t __gen_e_acsl_f1_12; __e_acsl_mpz_t __gen_e_acsl__9; @@ -104,21 +105,21 @@ int main(void) __gmpz_clear(__gen_e_acsl_f1_12); __gmpz_clear(__gen_e_acsl__9); } - /*@ assert f1(100) ≡ 5050; */ ; + /*@ assert f1(100) == 5050; */ ; { int __gen_e_acsl_f2_20; __gen_e_acsl_f2_20 = __gen_e_acsl_f2(7); __e_acsl_assert(__gen_e_acsl_f2_20 == 1,1,"Assertion","main", "f2(7) == 1","tests/arith/functions_rec.c",32); } - /*@ assert f2(7) ≡ 1; */ ; + /*@ assert f2(7) == 1; */ ; { int __gen_e_acsl_f3_8; __gen_e_acsl_f3_8 = __gen_e_acsl_f3(6); __e_acsl_assert(__gen_e_acsl_f3_8 == -5,1,"Assertion","main", "f3(6) == -5","tests/arith/functions_rec.c",34); } - /*@ assert f3(6) ≡ -5; */ ; + /*@ assert f3(6) == -5; */ ; { unsigned long __gen_e_acsl_f4_8; __gen_e_acsl_f4_8 = __gen_e_acsl_f4(9); @@ -139,7 +140,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_f5_8); __gmpz_clear(__gen_e_acsl__32); } - /*@ assert f5(0) ≡ 0; */ ; + /*@ assert f5(0) == 0; */ ; { long __gen_e_acsl_n_9; __e_acsl_mpz_t __gen_e_acsl_f5_10; @@ -156,7 +157,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_f5_10); __gmpz_clear(__gen_e_acsl__33); } - /*@ assert \let n = 0 ≡ 0? 0x7fffffffffffffffL: -1; f5(n) ≡ 0; */ ; + /*@ assert \let n = 0 == 0? 0x7fffffffffffffffL: -1; f5(n) == 0; */ ; __retres = 0; return __retres; } @@ -310,19 +311,19 @@ int __gen_e_acsl_f2(int n) __e_acsl_assert(__gen_e_acsl_f2_19 != 0,1,"RTE","f2", "division_by_zero: __gen_e_acsl_f2_19 != 0", "tests/arith/functions_rec.c",13); - /*@ assert Eva: division_by_zero: __gen_e_acsl_f2_19 ≢ 0; */ + /*@ assert Eva: division_by_zero: __gen_e_acsl_f2_19 != 0; */ /*@ assert Eva: signed_overflow: - -2147483648 ≤ __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17; + -2147483648 <= __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17; */ /*@ assert Eva: signed_overflow: - __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17 ≤ 2147483647; + __gen_e_acsl_f2_15 * __gen_e_acsl_f2_17 <= 2147483647; */ /*@ assert Eva: signed_overflow: (int)(__gen_e_acsl_f2_15 * __gen_e_acsl_f2_17) / __gen_e_acsl_f2_19 - ≤ 2147483647; + <= 2147483647; */ __gen_e_acsl_if_6 = (__gen_e_acsl_f2_15 * __gen_e_acsl_f2_17) / __gen_e_acsl_f2_19; } @@ -380,19 +381,19 @@ int __gen_e_acsl_f2_2(long n) __e_acsl_assert(__gen_e_acsl_f2_14 != 0,1,"RTE","f2_2", "division_by_zero: __gen_e_acsl_f2_14 != 0", "tests/arith/functions_rec.c",13); - /*@ assert Eva: division_by_zero: __gen_e_acsl_f2_14 ≢ 0; */ + /*@ assert Eva: division_by_zero: __gen_e_acsl_f2_14 != 0; */ /*@ assert Eva: signed_overflow: - -2147483648 ≤ __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12; + -2147483648 <= __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12; */ /*@ assert Eva: signed_overflow: - __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12 ≤ 2147483647; + __gen_e_acsl_f2_10 * __gen_e_acsl_f2_12 <= 2147483647; */ /*@ assert Eva: signed_overflow: (int)(__gen_e_acsl_f2_10 * __gen_e_acsl_f2_12) / __gen_e_acsl_f2_14 - ≤ 2147483647; + <= 2147483647; */ __gen_e_acsl_if_5 = (__gen_e_acsl_f2_10 * __gen_e_acsl_f2_12) / __gen_e_acsl_f2_14; __gmpz_clear(__gen_e_acsl_n_3); @@ -457,19 +458,19 @@ int __gen_e_acsl_f2_3(__e_acsl_mpz_struct * n) __e_acsl_assert(__gen_e_acsl_f2_9 != 0,1,"RTE","f2_3", "division_by_zero: __gen_e_acsl_f2_9 != 0", "tests/arith/functions_rec.c",13); - /*@ assert Eva: division_by_zero: __gen_e_acsl_f2_9 ≢ 0; */ + /*@ assert Eva: division_by_zero: __gen_e_acsl_f2_9 != 0; */ /*@ assert Eva: signed_overflow: - -2147483648 ≤ __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7; + -2147483648 <= __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7; */ /*@ assert Eva: signed_overflow: - __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7 ≤ 2147483647; + __gen_e_acsl_f2_5 * __gen_e_acsl_f2_7 <= 2147483647; */ /*@ assert Eva: signed_overflow: - (int)(__gen_e_acsl_f2_5 * __gen_e_acsl_f2_7) / __gen_e_acsl_f2_9 - ≤ 2147483647; + (int)(__gen_e_acsl_f2_5 * __gen_e_acsl_f2_7) / __gen_e_acsl_f2_9 <= + 2147483647; */ __gen_e_acsl_if_4 = (__gen_e_acsl_f2_5 * __gen_e_acsl_f2_7) / __gen_e_acsl_f2_9; __gmpz_clear(__gen_e_acsl__12); diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c b/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c index bdfdae9e75ef7dcf2fb3e2a6e5ac1fdec59fd652..7b16839d040c8eb3a85188271312d6b80939d2f6 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c @@ -10,16 +10,16 @@ int main(void) int x; __e_acsl_assert(1,1,"Assertion","main","0 == 0", "tests/arith/integer_constant.i",6); - /*@ assert 0 ≡ 0; */ ; + /*@ assert 0 == 0; */ ; x = 0; x ++; __e_acsl_assert(1,1,"Assertion","main","0 != 1", "tests/arith/integer_constant.i",8); - /*@ assert 0 ≢ 1; */ ; + /*@ assert 0 != 1; */ ; __e_acsl_assert(1,1,"Assertion","main", "1152921504606846975 == 0xfffffffffffffff", "tests/arith/integer_constant.i",9); - /*@ assert 1152921504606846975 ≡ 0xfffffffffffffff; */ ; + /*@ assert 1152921504606846975 == 0xfffffffffffffff; */ ; { __e_acsl_mpz_t __gen_e_acsl_; int __gen_e_acsl_eq; @@ -34,7 +34,7 @@ int main(void) } /*@ assert - 0xffffffffffffffffffffffffffffffff ≡ 0xffffffffffffffffffffffffffffffff; + 0xffffffffffffffffffffffffffffffff == 0xffffffffffffffffffffffffffffffff; */ ; __retres = 0; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_let.c b/src/plugins/e-acsl/tests/arith/oracle/gen_let.c index f1d72daba9f0904a47d80254bdaf919b2a494d4e..9180f46a839b6bd491714ac5365551c11a2eed1a 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_let.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_let.c @@ -24,7 +24,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_u >= 0L,1,"Assertion","main", "\\let u = n * n; u >= 0","tests/arith/let.c",7); } - /*@ assert \let u = n * n; u ≥ 0; */ ; + /*@ assert \let u = n * n; u >= 0; */ ; { long __gen_e_acsl_u_2; long __gen_e_acsl_v; @@ -41,7 +41,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_u_3 + 1 == 2,1,"Assertion","main", "(\\let u = 1; u) + 1 == 2","tests/arith/let.c",13); } - /*@ assert (\let u = 1; u) + 1 ≡ 2; */ ; + /*@ assert (\let u = 1; u) + 1 == 2; */ ; { int __gen_e_acsl_u_4; int __gen_e_acsl_v_2; @@ -51,7 +51,7 @@ int main(void) "\\let u = 1; (\\let v = u + 1; v) == 2", "tests/arith/let.c",15); } - /*@ assert \let u = 1; (\let v = u + 1; v) ≡ 2; */ ; + /*@ assert \let u = 1; (\let v = u + 1; v) == 2; */ ; { int __gen_e_acsl_u_5; int __gen_e_acsl_u_6; @@ -61,7 +61,7 @@ int main(void) "\\let u = 1; (\\let u = u + 1; u) == 2", "tests/arith/let.c",19); } - /*@ assert \let u = 1; (\let u = u + 1; u) ≡ 2; */ ; + /*@ assert \let u = 1; (\let u = u + 1; u) == 2; */ ; long m = 0x7fffffffffffffffL; { long __gen_e_acsl_u_7; @@ -102,7 +102,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_u_10 == f,1,"Assertion","main", "\\let u = f; u == f","tests/arith/let.c",30); } - /*@ assert \let u = f; u ≡ f; */ ; + /*@ assert \let u = f; u == f; */ ; int t[4] = {1, 2, 3, 4}; { int * /*[4]*/ __gen_e_acsl_u_11; @@ -110,14 +110,14 @@ int main(void) __e_acsl_assert(1,1,"Assertion","main","\\let u = &t[1]; 1 == 1", "tests/arith/let.c",34); } - /*@ assert \let u = &t[1]; 1 ≡ 1; */ ; + /*@ assert \let u = &t[1]; 1 == 1; */ ; { int * /*[4]*/ __gen_e_acsl_u_12; __gen_e_acsl_u_12 = & t[1]; __e_acsl_assert(1,1,"Assertion","main","(\\let u = &t[1]; 1) == 1", "tests/arith/let.c",36); } - /*@ assert (\let u = &t[1]; 1) ≡ 1; */ ; + /*@ assert (\let u = &t[1]; 1) == 1; */ ; struct __anonstruct_r_1 r = {.x = 1, .y = 2}; __e_acsl_store_block((void *)(& r),(size_t)8); __e_acsl_full_init((void *)(& r)); @@ -128,7 +128,7 @@ int main(void) "Assertion","main","\\let u = r; u.x + u.y == 3", "tests/arith/let.c",41); } - /*@ assert \let u = r; u.x + u.y ≡ 3; */ ; + /*@ assert \let u = r; u.x + u.y == 3; */ ; s.x = 5; { union __anonunion_s_2 __gen_e_acsl_u_14; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c b/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c index 90b0651a11521588af3b3799ee98b8a02010c5a5..6f3290336eac24210f1d8d7e331ac6299a758936 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c @@ -54,7 +54,7 @@ int main(void) __gen_e_acsl_mod_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_), (__e_acsl_mpz_struct const *)(__gen_e_acsl__3)); __gmpz_init(__gen_e_acsl_mod); - /*@ assert E_ACSL: 2 ≢ 0; */ + /*@ assert E_ACSL: 2 != 0; */ __e_acsl_assert(__gen_e_acsl_mod_guard != 0,1,"Assertion","main", "2 != 0","tests/arith/longlong.i",19); __gmpz_tdiv_r(__gen_e_acsl_mod, @@ -71,7 +71,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__3); __gmpz_clear(__gen_e_acsl_mod); } - /*@ assert (2 * x + 1) % 2 ≡ 1; */ ; + /*@ assert (2 * x + 1) % 2 == 1; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_not.c b/src/plugins/e-acsl/tests/arith/oracle/gen_not.c index a553f45a4423e9f96ccaef8deae944e4361dc3c3..fe599166c636f3597ec9e2ad9be4434b10fb5969 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_not.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_not.c @@ -9,11 +9,11 @@ int main(void) int __retres; int x = 0; __e_acsl_assert(x == 0,1,"Assertion","main","x == 0","tests/arith/not.i",6); - /*@ assert x ≡ 0; */ ; + /*@ assert x == 0; */ ; if (x) { __e_acsl_assert(x != 0,1,"Assertion","main","x != 0","tests/arith/not.i", 8); - /*@ assert x ≢ 0; */ ; + /*@ assert x != 0; */ ; } __retres = 0; return __retres; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c b/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c index 762933f8fed7f20ae90e68b8b016ae87026769b0..b7c622755d4e0f393740f1d0daba0230b3639321 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c @@ -5,20 +5,24 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ -predicate p1(ℤ i, ℤ j, ℤ k) = - 0 ≤ i < 10 ∧ 1 < j ≤ 11 ∧ 2 ≤ k ≤ 12; +predicate p1(integer i, integer j, integer k) = + 0 <= i < 10 && 1 < j <= 11 && 2 <= k <= 12; */ int __gen_e_acsl_p1(int i, int j, int k); -/*@ predicate p2(ℤ i, ℤ j, ℤ k) = 0 ≤ i ≤ j < k ≤ 10; +/*@ predicate p2(integer i, integer j, integer k) = 0 <= i <= j < k <= 10; */ int __gen_e_acsl_p2(int i, int j, int k); -/*@ predicate p3(ℤ i, ℤ j, ℤ k) = 0 ≤ i < j ≤ 10 ∧ 1 < k < 11; +/*@ +predicate p3(integer i, integer j, integer k) = + 0 <= i < j <= 10 && 1 < k < 11; */ int __gen_e_acsl_p3(int i, int j, int k); -/*@ predicate p4(ℤ i, ℤ j, ℤ k) = 0 ≤ i ≤ k ≤ 10 ∧ 1 ≤ j < k; +/*@ +predicate p4(integer i, integer j, integer k) = + 0 <= i <= k <= 10 && 1 <= j < k; */ int __gen_e_acsl_p4(int i, int j, int k); @@ -51,7 +55,7 @@ int main(void) "\\forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1", "tests/arith/quantif.i",16); } - /*@ assert ∀ ℤ x; 0 ≤ x ≤ 1 ⇒ x ≡ 0 ∨ x ≡ 1; */ ; + /*@ assert \forall integer x; 0 <= x <= 1 ==> x == 0 || x == 1; */ ; { int __gen_e_acsl_forall_2; int __gen_e_acsl_x_2; @@ -71,7 +75,7 @@ int main(void) "\\forall integer x; 0 < x <= 1 ==> x == 1", "tests/arith/quantif.i",17); } - /*@ assert ∀ ℤ x; 0 < x ≤ 1 ⇒ x ≡ 1; */ ; + /*@ assert \forall integer x; 0 < x <= 1 ==> x == 1; */ ; { int __gen_e_acsl_forall_3; int __gen_e_acsl_x_3; @@ -91,7 +95,7 @@ int main(void) "\\forall integer x; 0 <= x < 1 ==> x == 0", "tests/arith/quantif.i",18); } - /*@ assert ∀ ℤ x; 0 ≤ x < 1 ⇒ x ≡ 0; */ ; + /*@ assert \forall integer x; 0 <= x < 1 ==> x == 0; */ ; { int __gen_e_acsl_forall_4; int __gen_e_acsl_x_4; @@ -126,8 +130,8 @@ int main(void) } /*@ assert - ∀ ℤ x, ℤ y, ℤ z; - 0 ≤ x < 2 ∧ 0 ≤ y < 5 ∧ 0 ≤ z ≤ y ⇒ x + z ≤ y + 1; + \forall integer x, integer y, integer z; + 0 <= x < 2 && 0 <= y < 5 && 0 <= z <= y ==> x + z <= y + 1; */ ; { @@ -149,7 +153,7 @@ int main(void) "\\exists int x; 0 <= x < 10 && x == 5", "tests/arith/quantif.i",27); } - /*@ assert ∃ int x; 0 ≤ x < 10 ∧ x ≡ 5; */ ; + /*@ assert \exists int x; 0 <= x < 10 && x == 5; */ ; { int __gen_e_acsl_forall_5; int __gen_e_acsl_x_6; @@ -192,9 +196,9 @@ int main(void) } /*@ assert - ∀ int x; - 0 ≤ x < 10 ⇒ - x % 2 ≡ 0 ⇒ (∃ ℤ y; 0 ≤ y ≤ x / 2 ∧ x ≡ 2 * y); + \forall int x; + 0 <= x < 10 ==> + x % 2 == 0 ==> (\exists integer y; 0 <= y <= x / 2 && x == 2 * y); */ ; { @@ -226,7 +230,7 @@ int main(void) "\\forall integer i; 0 <= i < 10 ==> \\valid(&buf[i])", "tests/arith/quantif.i",37); } - /*@ assert ∀ ℤ i; 0 ≤ i < 10 ⇒ \valid(&buf[i]); */ ; + /*@ assert \forall integer i; 0 <= i < 10 ==> \valid(&buf[i]); */ ; { int __gen_e_acsl_forall_7; int __gen_e_acsl_i_2; @@ -252,7 +256,7 @@ int main(void) "\\forall char i; 0 <= i < 10 ==> \\valid(&buf[i])", "tests/arith/quantif.i",38); } - /*@ assert ∀ char i; 0 ≤ i < 10 ⇒ \valid(&buf[i]); */ ; + /*@ assert \forall char i; 0 <= i < 10 ==> \valid(&buf[i]); */ ; { int __gen_e_acsl_forall_8; unsigned long __gen_e_acsl_i_3; @@ -278,7 +282,7 @@ int main(void) "\\forall integer i; 0 <= i < len ==> \\valid(&buf[i])", "tests/arith/quantif.i",39); } - /*@ assert ∀ ℤ i; 0 ≤ i < len ⇒ \valid(&buf[i]); */ ; + /*@ assert \forall integer i; 0 <= i < len ==> \valid(&buf[i]); */ ; { int __gen_e_acsl_forall_9; __e_acsl_mpz_t __gen_e_acsl_i_4; @@ -334,17 +338,17 @@ int main(void) "tests/arith/quantif.i",40); __gmpz_clear(__gen_e_acsl_i_4); } - /*@ assert ∀ ℤ i; 0 ≤ i ≤ len ⇒ \valid(&buf[i]); */ ; + /*@ assert \forall integer i; 0 <= i <= len ==> \valid(&buf[i]); */ ; __e_acsl_delete_block((void *)(buf)); } __e_acsl_assert(1,1,"Assertion","main", "\\forall integer x; 0 < x < 1 ==> \\false", "tests/arith/quantif.i",44); - /*@ assert ∀ ℤ x; 0 < x < 1 ⇒ \false; */ ; + /*@ assert \forall integer x; 0 < x < 1 ==> \false; */ ; __e_acsl_assert(! 0,1,"Assertion","main", "!(\\exists char c; 10 <= c < 10 && c == 10)", "tests/arith/quantif.i",45); - /*@ assert ¬(∃ char c; 10 ≤ c < 10 ∧ c ≡ 10); */ ; + /*@ assert !(\exists char c; 10 <= c < 10 && c == 10); */ ; { int __gen_e_acsl_u; __gen_e_acsl_u = 5; @@ -353,8 +357,8 @@ int main(void) "tests/arith/quantif.i",47); } /*@ - assert \let u = 5; ∀ ℤ x, ℤ y; 0 ≤ x < 2 ∧ 4 < y < u ⇒ \false; - */ + assert \let u = 5; + \forall integer x, integer y; 0 <= x < 2 && 4 < y < u ==> \false; */ ; { int __gen_e_acsl_forall_10; @@ -396,8 +400,8 @@ int main(void) /*@ assert forall_multiple_binders_1: - ∀ ℤ i, ℤ j, ℤ k; - 0 ≤ i < 10 ∧ 1 < j ≤ 11 ∧ 2 ≤ k ≤ 12 ⇒ p1(i, j, k); + \forall integer i, integer j, integer k; + 0 <= i < 10 && 1 < j <= 11 && 2 <= k <= 12 ==> p1(i, j, k); */ ; { @@ -440,7 +444,8 @@ int main(void) /*@ assert forall_multiple_binders_2: - ∀ ℤ i, ℤ j, ℤ k; 0 ≤ i ≤ j < k ≤ 10 ⇒ p2(i, j, k); + \forall integer i, integer j, integer k; + 0 <= i <= j < k <= 10 ==> p2(i, j, k); */ ; { @@ -483,8 +488,8 @@ int main(void) /*@ assert forall_multiple_binders_3: - ∀ ℤ i, ℤ j, ℤ k; - 0 ≤ i < j ≤ 10 ∧ 1 < k < 11 ⇒ p3(i, j, k); + \forall integer i, integer j, integer k; + 0 <= i < j <= 10 && 1 < k < 11 ==> p3(i, j, k); */ ; { @@ -527,8 +532,8 @@ int main(void) /*@ assert forall_multiple_binders_4: - ∀ ℤ i, ℤ j, ℤ k; - 0 ≤ i < 10 ⇒ 1 < j ≤ 11 ⇒ 2 ≤ k ≤ 12 ⇒ p1(i, j, k); + \forall integer i, integer j, integer k; + 0 <= i < 10 ==> 1 < j <= 11 ==> 2 <= k <= 12 ==> p1(i, j, k); */ ; { @@ -571,8 +576,8 @@ int main(void) /*@ assert forall_unordered_binders: - ∀ ℤ i, ℤ j, ℤ k; - 0 ≤ i ≤ k ≤ 10 ∧ 1 ≤ j < k ⇒ p4(i, j, k); + \forall integer i, integer j, integer k; + 0 <= i <= k <= 10 && 1 <= j < k ==> p4(i, j, k); */ ; { @@ -615,8 +620,8 @@ int main(void) /*@ assert exists_multiple_binders_1: - ∃ ℤ i, ℤ j, ℤ k; - 0 ≤ i < 10 ∧ 1 < j ≤ 11 ∧ 2 ≤ k ≤ 12 ∧ p1(i, j, k); + \exists integer i, integer j, integer k; + 0 <= i < 10 && 1 < j <= 11 && 2 <= k <= 12 && p1(i, j, k); */ ; { @@ -659,7 +664,8 @@ int main(void) /*@ assert exists_multiple_binders_2: - ∃ ℤ i, ℤ j, ℤ k; 0 ≤ i ≤ j < k ≤ 10 ∧ p2(i, j, k); + \exists integer i, integer j, integer k; + 0 <= i <= j < k <= 10 && p2(i, j, k); */ ; { @@ -702,8 +708,8 @@ int main(void) /*@ assert exists_multiple_binders_3: - ∃ ℤ i, ℤ j, ℤ k; - 0 ≤ i < j ≤ 10 ∧ 1 < k < 11 ∧ p3(i, j, k); + \exists integer i, integer j, integer k; + 0 <= i < j <= 10 && 1 < k < 11 && p3(i, j, k); */ ; { @@ -746,64 +752,71 @@ int main(void) /*@ assert exists_unordered_binders: - ∃ ℤ i, ℤ j, ℤ k; - 0 ≤ i ≤ k ≤ 10 ∧ 1 ≤ j < k ∧ p4(i, j, k); + \exists integer i, integer j, integer k; + 0 <= i <= k <= 10 && 1 <= j < k && p4(i, j, k); */ ; - /*@ assert failed_invalid_guards: ∀ ℤ i; 10 > i ≥ 0 ⇒ p1(i, 2, 2); - */ + /*@ + assert + failed_invalid_guards: \forall integer i; 10 > i >= 0 ==> p1(i, 2, 2); */ ; /*@ assert failed_unguarded_k: - ∀ ℤ i, ℤ j, ℤ k; 0 ≤ i < 10 ∧ 1 < j ≤ 11 ⇒ p1(i, j, k); + \forall integer i, integer j, integer k; + 0 <= i < 10 && 1 < j <= 11 ==> p1(i, j, k); */ ; /*@ assert - failed_non_integer: ∀ ℠i; 0 ≤ i < 10 ⇒ p1(\truncate(i), 2, 2); */ - ; - /*@ assert failed_missing_lower_bound: ∀ ℤ i; i < 10 ⇒ p1(i, 2, 2); + failed_non_integer: \forall real i; 0 <= i < 10 ==> p1(\truncate(i), 2, 2); */ ; - /*@ assert failded_missing_upper_bound: ∀ ℤ i; 0 ≤ i ⇒ p1(i, 2, 2); - */ + /*@ + assert + failed_missing_lower_bound: \forall integer i; i < 10 ==> p1(i, 2, 2); */ + ; + /*@ + assert + failded_missing_upper_bound: \forall integer i; 0 <= i ==> p1(i, 2, 2); */ ; /*@ assert - failed_invalid_upper_bound_1: ∀ ℤ i, ℤ j; 0 ≤ i < j ⇒ p1(i, j, 2); + failed_invalid_upper_bound_1: + \forall integer i, integer j; 0 <= i < j ==> p1(i, j, 2); */ ; /*@ assert failed_invalid_upper_bound_2: - ∀ ℤ i, ℤ j; i < j ∧ 0 ≤ i ⇒ p1(i, 2, 2); + \forall integer i, integer j; i < j && 0 <= i ==> p1(i, 2, 2); */ ; /*@ assert failed_extra_constraint: - ∀ ℤ i, ℤ j; 0 ≤ i < j ∧ i < 10 ∧ 3 ≤ j < 5 ⇒ p1(i, j, 2); + \forall integer i, integer j; + 0 <= i < j && i < 10 && 3 <= j < 5 ==> p1(i, j, 2); */ ; /*@ assert failed_multiple_upper_bounds: - ∀ ℤ i, ℤ j; 0 ≤ i < j < i ∧ j ≤ 10 ⇒ p1(i, j, 2); + \forall integer i, integer j; 0 <= i < j < i && j <= 10 ==> p1(i, j, 2); */ ; /*@ assert multiple_linked_upper: - ∀ ℤ i, ℤ j, ℤ k; - 0 ≤ i < k ∧ 1 ≤ j < k ∧ 2 ≤ k < 10 ⇒ p1(i, j, k); + \forall integer i, integer j, integer k; + 0 <= i < k && 1 <= j < k && 2 <= k < 10 ==> p1(i, j, k); */ ; /*@ assert multiple_guard: - ∀ ℤ i, ℤ j; - 0 ≤ i < 10 ∧ 2 ≤ i < 8 ∧ 4 ≤ j < 6 ⇒ p1(i, j, 2); + \forall integer i, integer j; + 0 <= i < 10 && 2 <= i < 8 && 4 <= j < 6 ==> p1(i, j, 2); */ ; __retres = 0; diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c b/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c index e50e4e0f0f1a4c6a8d156203d2ca0c30e8ad12c8..531374b2a3885bb4469088f833451a59fc2b348c 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c +++ b/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c @@ -45,7 +45,7 @@ int main(void) __gmpq_clear(__gen_e_acsl__3); __gmpq_clear(__gen_e_acsl_add); } - /*@ assert 3 ≡ 1.5 + 1.5; */ ; + /*@ assert 3 == 1.5 + 1.5; */ ; { __e_acsl_mpq_t __gen_e_acsl__4; int __gen_e_acsl_eq_2; @@ -57,10 +57,10 @@ int main(void) "tests/arith/rationals.c",13); __gmpq_clear(__gen_e_acsl__4); } - /*@ assert 0.1 ≡ 0.1; */ ; + /*@ assert 0.1 == 0.1; */ ; __e_acsl_assert(1,1,"Assertion","main","1.0 == 1.0", "tests/arith/rationals.c",14); - /*@ assert 1.0 ≡ 1.0; */ ; + /*@ assert 1.0 == 1.0; */ ; { __e_acsl_mpq_t __gen_e_acsl__5; double __gen_e_acsl__6; @@ -79,7 +79,7 @@ int main(void) __gmpq_clear(__gen_e_acsl__5); __gmpq_clear(__gen_e_acsl__7); } - /*@ assert (double)0.1 ≢ 0.1; */ ; + /*@ assert (double)0.1 != 0.1; */ ; { __e_acsl_mpq_t __gen_e_acsl__8; double __gen_e_acsl__9; @@ -97,7 +97,7 @@ int main(void) "tests/arith/rationals.c",16); __gmpq_clear(__gen_e_acsl__8); } - /*@ assert (float)0.1 ≢ (double)0.1; */ ; + /*@ assert (float)0.1 != (double)0.1; */ ; { __e_acsl_mpq_t __gen_e_acsl__11; double __gen_e_acsl__12; @@ -130,7 +130,7 @@ int main(void) __gmpq_clear(__gen_e_acsl_add_2); __gmpq_clear(__gen_e_acsl__15); } - /*@ assert (double)1.1 ≢ 1 + 0.1; */ ; + /*@ assert (double)1.1 != 1 + 0.1; */ ; { __e_acsl_mpq_t __gen_e_acsl__16; __e_acsl_mpq_t __gen_e_acsl__17; @@ -166,7 +166,7 @@ int main(void) __gmpq_clear(__gen_e_acsl__19); __gmpq_clear(__gen_e_acsl_sub); } - /*@ assert 1 + 0.1 ≡ 2 - 0.9; */ ; + /*@ assert 1 + 0.1 == 2 - 0.9; */ ; float x = 0.2f; float y = 0.3f; float sum = x + y; @@ -195,7 +195,7 @@ int main(void) __gmpq_clear(__gen_e_acsl_mul); __gmpq_clear(__gen_e_acsl__21); } - /*@ assert sum ≢ x * y; */ ; + /*@ assert sum != x * y; */ ; double d = 0.1; __gen_e_acsl_avg(4.3,11.7); { @@ -223,7 +223,7 @@ int main(void) __gmpq_clear(__gen_e_acsl_add_4); __gmpq_clear(__gen_e_acsl__24); } - /*@ assert 1.1d ≢ 1 + 0.1; */ ; + /*@ assert 1.1d != 1 + 0.1; */ ; short a = (short)1; short b = (short)1; { diff --git a/src/plugins/e-acsl/tests/arith/oracle/quantif.res.oracle b/src/plugins/e-acsl/tests/arith/oracle/quantif.res.oracle index b588f0c95ed7b1de91e82f1a165dd0d2426674c3..c44427528c4bcddb77678607eec2704c33bd735c 100644 --- a/src/plugins/e-acsl/tests/arith/oracle/quantif.res.oracle +++ b/src/plugins/e-acsl/tests/arith/oracle/quantif.res.oracle @@ -2,37 +2,39 @@ [e-acsl] tests/arith/quantif.i:82: Warning: invalid E-ACSL construct `invalid guard 10 > i in quantification - failed_invalid_guards: ∀ ℤ i; 10 > i ≥ 0 ⇒ p1(i, 2, 2). - Missing guard for i. Only < and ≤ are allowed to guard quantifier variables'. + failed_invalid_guards: \forall integer i; 10 > i >= 0 ==> p1(i, 2, 2). + Missing guard for i. Only < and <= are allowed to guard quantifier variables'. Ignoring annotation. [e-acsl] tests/arith/quantif.i:84: Warning: invalid E-ACSL construct `invalid guard p1(i, j, k) in quantification failed_unguarded_k: - ∀ ℤ i, ℤ j, ℤ k; 0 ≤ i < 10 ∧ 1 < j ≤ 11 ⇒ p1(i, j, k). + \forall integer i, integer j, integer k; + 0 <= i < 10 && 1 < j <= 11 ==> p1(i, j, k). Missing guard for k. '. Ignoring annotation. [e-acsl] tests/arith/quantif.i:86: Warning: E-ACSL construct `non integer variable i in quantification - failed_non_integer: ∀ ℠i; 0 ≤ i < 10 ⇒ p1(\truncate(i), 2, 2)' + failed_non_integer: \forall real i; 0 <= i < 10 ==> p1(\truncate(i), 2, 2)' is not yet supported. Ignoring annotation. [e-acsl] tests/arith/quantif.i:88: Warning: invalid E-ACSL construct `missing lower bound for i in quantification - failed_missing_lower_bound: ∀ ℤ i; i < 10 ⇒ p1(i, 2, 2)'. + failed_missing_lower_bound: \forall integer i; i < 10 ==> p1(i, 2, 2)'. Ignoring annotation. [e-acsl] tests/arith/quantif.i:90: Warning: invalid E-ACSL construct `invalid guard p1(i, 2, 2) in quantification - failded_missing_upper_bound: ∀ ℤ i; 0 ≤ i ⇒ p1(i, 2, 2). + failded_missing_upper_bound: \forall integer i; 0 <= i ==> p1(i, 2, 2). Missing upper bound for i. '. Ignoring annotation. [e-acsl] tests/arith/quantif.i:92: Warning: invalid E-ACSL construct `invalid guard p1(i, j, 2) in quantification - failed_invalid_upper_bound_1: ∀ ℤ i, ℤ j; 0 ≤ i < j ⇒ p1(i, j, 2). + failed_invalid_upper_bound_1: + \forall integer i, integer j; 0 <= i < j ==> p1(i, j, 2). Missing upper bound for j. '. Ignoring annotation. [e-acsl] tests/arith/quantif.i:94: Warning: @@ -40,33 +42,34 @@ `missing lower bound for i when processing the linked upper bound i < j in quantification failed_invalid_upper_bound_2: - ∀ ℤ i, ℤ j; i < j ∧ 0 ≤ i ⇒ p1(i, 2, 2)'. + \forall integer i, integer j; i < j && 0 <= i ==> p1(i, 2, 2)'. Ignoring annotation. [e-acsl] tests/arith/quantif.i:96: Warning: invalid E-ACSL construct - `found existing lower bound i < j when processing 3 ≤ j in quantification + `found existing lower bound i < j when processing 3 <= j in quantification failed_extra_constraint: - ∀ ℤ i, ℤ j; 0 ≤ i < j ∧ i < 10 ∧ 3 ≤ j < 5 ⇒ p1(i, j, 2)'. + \forall integer i, integer j; + 0 <= i < j && i < 10 && 3 <= j < 5 ==> p1(i, j, 2)'. Ignoring annotation. [e-acsl] tests/arith/quantif.i:98: Warning: invalid E-ACSL construct - `found existing lower bound 0 ≤ i when processing j < i in quantification + `found existing lower bound 0 <= i when processing j < i in quantification failed_multiple_upper_bounds: - ∀ ℤ i, ℤ j; 0 ≤ i < j < i ∧ j ≤ 10 ⇒ p1(i, j, 2)'. + \forall integer i, integer j; 0 <= i < j < i && j <= 10 ==> p1(i, j, 2)'. Ignoring annotation. [e-acsl] tests/arith/quantif.i:100: Warning: invalid E-ACSL construct `found existing lower bound i < k when processing j < k in quantification multiple_linked_upper: - ∀ ℤ i, ℤ j, ℤ k; - 0 ≤ i < k ∧ 1 ≤ j < k ∧ 2 ≤ k < 10 ⇒ p1(i, j, k)'. + \forall integer i, integer j, integer k; + 0 <= i < k && 1 <= j < k && 2 <= k < 10 ==> p1(i, j, k)'. Ignoring annotation. [e-acsl] tests/arith/quantif.i:102: Warning: invalid E-ACSL construct - `invalid constraint 2 ≤ i, both operands are constants or already bounded in quantification + `invalid constraint 2 <= i, both operands are constants or already bounded in quantification multiple_guard: - ∀ ℤ i, ℤ j; - 0 ≤ i < 10 ∧ 2 ≤ i < 8 ∧ 4 ≤ j < 6 ⇒ p1(i, j, 2)'. + \forall integer i, integer j; + 0 <= i < 10 && 2 <= i < 8 && 4 <= j < 6 ==> p1(i, j, 2)'. Ignoring annotation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/arith/quantif.i:22: Warning: assertion got status unknown. diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts1740.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts1740.res.oracle index 120779645cf314b1e6e1d9272bf454d1899ca0f5..803e48f98be602e9dde2698ef5c219a759c3e395 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/bts1740.res.oracle +++ b/src/plugins/e-acsl/tests/bts/oracle/bts1740.res.oracle @@ -3,5 +3,4 @@ [eva:locals-escaping] tests/bts/bts1740.i:12: Warning: locals {a} escaping the scope of a block of main through p [eva:alarm] tests/bts/bts1740.i:16: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&p); + accessing left-value that contains escaping addresses. assert !\dangling(&p); diff --git a/src/plugins/e-acsl/tests/bts/oracle/bts2231.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/bts2231.res.oracle index 1ea3c8ae98490869fa6b0957443425e07dde6807..b2c8d13528f2c22f7c9a83f3f308c0176dde5e09 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/bts2231.res.oracle +++ b/src/plugins/e-acsl/tests/bts/oracle/bts2231.res.oracle @@ -1,6 +1,6 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/bts/bts2231.i:8: Warning: - signed overflow. assert -9223372036854775808 ≤ __gen_e_acsl__2 - 1; + signed overflow. assert -9223372036854775808 <= __gen_e_acsl__2 - 1; [eva:alarm] tests/bts/bts2231.i:8: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c index aa6edd56fa7dddc19ec5c7a78c4ffe0f97881415..9259e3c192529d2d0372fdeccb8d6b323c56734e 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c @@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; behavior OverEstimate_Motoring: assumes \true; ensures - *\old(Mtmax_out) ≢ + *\old(Mtmax_out) != *\old(Mtmax_in) + (5 - ((5 / 80) * *\old(Mwmax)) * 0.4); */ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out); @@ -37,9 +37,9 @@ void foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out) behavior UnderEstimate_Motoring: assumes \true; ensures - *\old(Mtmin_out) ≡ *\old(Mtmin_in) < 0.85 * *\old(Mwmin)? - *\old(Mtmin_in) ≢ 0.: - 0.85 * *\old(Mwmin) ≢ 0.; + *\old(Mtmin_out) == *\old(Mtmin_in) < 0.85 * *\old(Mwmin)? + *\old(Mtmin_in) != 0.: + 0.85 * *\old(Mwmin) != 0.; */ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out); @@ -85,9 +85,9 @@ int main(void) behavior UnderEstimate_Motoring: assumes \true; ensures - *\old(Mtmin_out) ≡ *\old(Mtmin_in) < 0.85 * *\old(Mwmin)? - *\old(Mtmin_in) ≢ 0.: - 0.85 * *\old(Mwmin) ≢ 0.; + *\old(Mtmin_out) == *\old(Mtmin_in) < 0.85 * *\old(Mwmin)? + *\old(Mtmin_in) != 0.: + 0.85 * *\old(Mwmin) != 0.; */ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out) { @@ -231,7 +231,7 @@ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out) behavior OverEstimate_Motoring: assumes \true; ensures - *\old(Mtmax_out) ≢ + *\old(Mtmax_out) != *\old(Mtmax_in) + (5 - ((5 / 80) * *\old(Mwmax)) * 0.4); */ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out) diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c index 9755e8cd106f5a74c39689df65735c50ff024ad0..eb0578cc7b393b10668913ec85a9681e874f8d6c 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c @@ -5,8 +5,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ behavior yes: - assumes ∀ int i; 0 < i < n ⇒ *(t + (i - 1)) ≤ *(t + i); - ensures \result ≡ 1; + assumes \forall int i; 0 < i < n ==> *(t + (i - 1)) <= *(t + i); + ensures \result == 1; */ int __gen_e_acsl_sorted(int *t, int n); @@ -40,7 +40,7 @@ int main(void) int n = __gen_e_acsl_sorted(t,7); __e_acsl_assert(n == 1,1,"Assertion","main","n == 1","tests/bts/bts1324.i", 23); - /*@ assert n ≡ 1; */ ; + /*@ assert n == 1; */ ; __retres = 0; __e_acsl_delete_block((void *)(t)); __e_acsl_memory_clean(); @@ -48,8 +48,8 @@ int main(void) } /*@ behavior yes: - assumes ∀ int i; 0 < i < n ⇒ *(t + (i - 1)) ≤ *(t + i); - ensures \result ≡ 1; + assumes \forall int i; 0 < i < n ==> *(t + (i - 1)) <= *(t + i); + ensures \result == 1; */ int __gen_e_acsl_sorted(int *t, int n) { diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c index 68220ac9996606c8d648333cf04fb942bb7d1e31..f7dd9ecc895b5546f5e12878be98f905dbdb7e1b 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c @@ -6,7 +6,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; typedef int ArrayInt[5]; /*@ ensures - *\old(AverageAccel) ≡ + *\old(AverageAccel) == (((((*\old(Accel))[4] + (*\old(Accel))[3]) + (*\old(Accel))[2]) + (*\old(Accel))[1]) + (*\old(Accel))[0]) @@ -44,7 +44,7 @@ int main(void) } /*@ ensures - *\old(AverageAccel) ≡ + *\old(AverageAccel) == (((((*\old(Accel))[4] + (*\old(Accel))[3]) + (*\old(Accel))[2]) + (*\old(Accel))[1]) + (*\old(Accel))[0]) diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c index 3b092ae6734c01a72b86c39495bbafe588b7b386..36c3d4cb41c77bbb577625ae3685b76023e56343 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c @@ -7,15 +7,17 @@ char *__gen_e_acsl_literal_string_2; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ behavior exists: - assumes ∃ ℤ i; 0 ≤ i < (int)n ∧ (int)*((char *)buf + i) ≡ c; + assumes + \exists integer i; 0 <= i < (int)n && (int)*((char *)buf + i) == c; ensures - ∀ int j; - 0 ≤ j < (int)\offset((char *)\result) ⇒ - (int)*((char *)\old(buf) + j) ≢ \old(c); + \forall int j; + 0 <= j < (int)\offset((char *)\result) ==> + (int)*((char *)\old(buf) + j) != \old(c); behavior not_exists: - assumes ∀ ℤ k; 0 ≤ k < (int)n ⇒ (int)*((char *)buf + k) ≢ c; - ensures \result ≡ (void *)0; + assumes + \forall integer k; 0 <= k < (int)n ==> (int)*((char *)buf + k) != c; + ensures \result == (void *)0; */ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n); @@ -51,15 +53,17 @@ void *memchr(void const *buf, int c, size_t n) } /*@ behavior exists: - assumes ∃ ℤ i; 0 ≤ i < (int)n ∧ (int)*((char *)buf + i) ≡ c; + assumes + \exists integer i; 0 <= i < (int)n && (int)*((char *)buf + i) == c; ensures - ∀ int j; - 0 ≤ j < (int)\offset((char *)\result) ⇒ - (int)*((char *)\old(buf) + j) ≢ \old(c); + \forall int j; + 0 <= j < (int)\offset((char *)\result) ==> + (int)*((char *)\old(buf) + j) != \old(c); behavior not_exists: - assumes ∀ ℤ k; 0 ≤ k < (int)n ⇒ (int)*((char *)buf + k) ≢ c; - ensures \result ≡ (void *)0; + assumes + \forall integer k; 0 <= k < (int)n ==> (int)*((char *)buf + k) != c; + ensures \result == (void *)0; */ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n) { diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c index e22850aba10b0f49c53415da9b086424d516621d..62d4de64918b8a65839483b20f1e2db60a4f33bf 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c @@ -27,7 +27,7 @@ int main(void) int x = __gen_e_acsl_fact(5); __e_acsl_assert(x == 120,1,"Assertion","main","x == 120", "tests/bts/bts1395.i",15); - /*@ assert x ≡ 120; */ ; + /*@ assert x == 120; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c index 35354e15a4a3ee1319c32cb1f7bf4ddc15c63cf0..1d42bb035b237d17698f34cbd2cfafd4e429ebdf 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c @@ -37,7 +37,7 @@ int main(void) "!\\initialized(&state->dataQueue[state->bitsInQueue / 8])", "tests/bts/bts1399.c",19); } - /*@ assert ¬\initialized(&state->dataQueue[state->bitsInQueue / 8]); */ ; + /*@ assert !\initialized(&state->dataQueue[state->bitsInQueue / 8]); */ ; free((void *)state); __retres = 0; __e_acsl_delete_block((void *)(& state)); diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c index f235a94655c43df645f7f898406274d5f66049dd..554b52e5c6f1d874c6e710f6f907fa83a560173f 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c @@ -8,9 +8,9 @@ int global_i; int *global_i_ptr = & global_i; int global_i = 0; -/*@ requires global_i ≡ 0; +/*@ requires global_i == 0; requires \valid(global_i_ptr); - requires global_i_ptr ≡ &global_i; + requires global_i_ptr == &global_i; */ void __gen_e_acsl_loop(void); @@ -19,9 +19,9 @@ void loop(void) return; } -/*@ requires global_i ≡ 0; +/*@ requires global_i == 0; requires \valid(global_i_ptr); - requires global_i_ptr ≡ &global_i; + requires global_i_ptr == &global_i; */ void __gen_e_acsl_loop(void) { diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c index 71d5655e76f7283ef6b7fbb843c8725b835c3358..f644512ea8a8a8e999c733dba0796ce2f897e4f7 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c @@ -37,7 +37,7 @@ int main(void) __e_acsl_delete_block((void *)(& a)); } L: - /*@ assert ¬\valid(p); */ + /*@ assert !\valid(p); */ { int __gen_e_acsl_initialized_2; int __gen_e_acsl_and_2; @@ -45,7 +45,7 @@ int main(void) sizeof(int *)); if (__gen_e_acsl_initialized_2) { int __gen_e_acsl_valid_2; - /*@ assert Eva: dangling_pointer: ¬\dangling(&p); */ + /*@ assert Eva: dangling_pointer: !\dangling(&p); */ __gen_e_acsl_valid_2 = __e_acsl_valid((void *)p,sizeof(int),(void *)p, (void *)(& p)); __gen_e_acsl_and_2 = __gen_e_acsl_valid_2; diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c index 68b811cf123a0c069ef8392ef08d26b80b9ed603..f68f9336e8470d5c21492e50fd6a4ec7b6d7cacb 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c @@ -146,7 +146,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","main", "!\\valid(s)","tests/bts/bts1837.i",22); } - /*@ assert ¬\valid(s); */ ; + /*@ assert !\valid(s); */ ; __e_acsl_delete_block((void *)(& s)); } } diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c index beb8f456827b957dd1ca4ea3e6612b0b11bd4349..4f8ecc4b3024f52064f9e0979dd0c63a76b29288 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c @@ -24,7 +24,7 @@ int main(void) (__e_acsl_mpz_struct const *)(__gen_e_acsl_A)); __gen_e_acsl__2 = __gmpz_get_si((__e_acsl_mpz_struct const *)(__gen_e_acsl_mul)); /*@ assert - Eva: signed_overflow: -9223372036854775808 ≤ __gen_e_acsl__2 - 1; + Eva: signed_overflow: -9223372036854775808 <= __gen_e_acsl__2 - 1; */ __gmpz_init_set_si(__gen_e_acsl__3,__gen_e_acsl__2 - 1L); __gmpz_init(__gen_e_acsl_add); @@ -44,7 +44,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_add); __gmpz_clear(__gen_e_acsl__4); } - /*@ assert A + (long)((long)(3 * A) - 1) ≡ -1; */ ; + /*@ assert A + (long)((long)(3 * A) - 1) == -1; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c index d5ae3f9c19149dec4caa469becf4312261f7bc43..bf927823852f49aa79391f400c1663762ffe9671 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c @@ -9,7 +9,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ requires valid_nstring_src: valid_read_nstring(src, n); requires room_nstring: \valid(dest + (0 .. n - 1)); requires separation: \separated(dest + (0 .. n - 1), src + (0 .. n - 1)); - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); ensures initialization: \initialized(\old(dest) + (0 .. \old(n) - 1)); assigns *(dest + (0 .. n - 1)), \result; assigns *(dest + (0 .. n - 1)) \from *(src + (0 .. n - 1)); @@ -17,13 +17,12 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; behavior complete: assumes src_fits: strlen(src) < n; - ensures equal_after_copy: strcmp(\old(dest), \old(src)) ≡ 0; + ensures equal_after_copy: strcmp(\old(dest), \old(src)) == 0; behavior partial: - assumes src_too_long: n ≤ strlen(src); + assumes src_too_long: n <= strlen(src); ensures - equal_prefix: - memcmp{Post, Post}(\old(dest), \old(src), \old(n)) ≡ 0; + equal_prefix: memcmp{Post, Post}(\old(dest), \old(src), \old(n)) == 0; */ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, size_t n); @@ -31,7 +30,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, /*@ requires valid_nstring_src: valid_read_nstring(src, n); requires room_nstring: \valid(dest + (0 .. n - 1)); requires separation: \separated(dest + (0 .. n - 1), src + (0 .. n - 1)); - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); ensures initialization: \initialized(\old(dest) + (0 .. \old(n) - 1)); assigns *(dest + (0 .. n - 1)), \result; assigns *(dest + (0 .. n - 1)) \from *(src + (0 .. n - 1)); @@ -39,13 +38,12 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, behavior complete: assumes src_fits: strlen(src) < n; - ensures equal_after_copy: strcmp(\old(dest), \old(src)) ≡ 0; + ensures equal_after_copy: strcmp(\old(dest), \old(src)) == 0; behavior partial: - assumes src_too_long: n ≤ strlen(src); + assumes src_too_long: n <= strlen(src); ensures - equal_prefix: - memcmp{Post, Post}(\old(dest), \old(src), \old(n)) ≡ 0; + equal_prefix: memcmp{Post, Post}(\old(dest), \old(src), \old(n)) == 0; */ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, size_t n) @@ -254,7 +252,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_valid_read,1,"Assertion","main", "!\\valid_read(srcbuf + i)","tests/bts/bts2252.c",17); } - /*@ assert ¬\valid_read(srcbuf + i); */ ; + /*@ assert !\valid_read(srcbuf + i); */ ; /*@ assert Eva: mem_access: \valid_read(srcbuf + i); */ if ((int)*(srcbuf + i) == (int)ch) loc = i; i ++; diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c index 60838e80f0077118a75fd3c90152cd1d6a173af9..1ac57bba0d0914758c95a73078805a91011b0e47 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c @@ -31,11 +31,11 @@ void f(void const *s, int c, unsigned long n) __gmpz_clear(__gen_e_acsl_n); __gmpz_clear(__gen_e_acsl_sub); } - /*@ assert p - (unsigned char const *)s ≡ n - n; */ ; + /*@ assert p - (unsigned char const *)s == n - n; */ ; __e_acsl_assert(p - (unsigned char const *)s == 0UL,1,"Assertion","f", "p - (unsigned char const *)s == 0","tests/bts/bts2386.c", 8); - /*@ assert p - (unsigned char const *)s ≡ 0; */ ; + /*@ assert p - (unsigned char const *)s == 0; */ ; __e_acsl_delete_block((void *)(& s)); __e_acsl_delete_block((void *)(& p)); return; diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c index 3005fdba28a0e7fde0476a544deb1cee8ad1c2aa..2511f92546f2a99ed8f6830505e99c5dd66eaeea 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c @@ -44,7 +44,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_valid,1,"Assertion","main", "!\\valid(p + (0 .. 9))","tests/bts/bts2406.c",10); } - /*@ assert ¬\valid(p + (0 .. 9)); */ ; + /*@ assert !\valid(p + (0 .. 9)); */ ; { int __gen_e_acsl_size_2; int __gen_e_acsl_if_2; diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c index e5d36213c8486363a11a0192fd2b883a5b7122c2..e322f5178e315fe3888994240e71ed046890a6d0 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c @@ -7,7 +7,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; struct X { int i ; }; -/*@ ensures *\old(item) ≡ \old(*item); */ +/*@ ensures *\old(item) == \old(*item); */ void __gen_e_acsl_f(struct X *item); void f(struct X *item) @@ -31,7 +31,7 @@ int main(void) return __retres; } -/*@ ensures *\old(item) ≡ \old(*item); */ +/*@ ensures *\old(item) == \old(*item); */ void __gen_e_acsl_f(struct X *item) { struct X __gen_e_acsl_at_2; diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c index 8d33325a01f4ce58d9de5e794582195de7b1d3f7..ae0ce8dbb92db7d9c355aa1d707650525e39d300 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c @@ -26,7 +26,7 @@ int main(int argc, char **argv) "\\exists unsigned int x; -1 < x < 5 && x == 0", "tests/bts/issue-eacsl-149.c",4); } - /*@ assert ∃ unsigned int x; -1 < x < 5 ∧ x ≡ 0; */ ; + /*@ assert \exists unsigned int x; -1 < x < 5 && x == 0; */ ; { int __gen_e_acsl_forall; int __gen_e_acsl_x_2; @@ -46,7 +46,7 @@ int main(int argc, char **argv) "!(\\forall unsigned int x; -1 < x < 5 ==> x != 0)", "tests/bts/issue-eacsl-149.c",5); } - /*@ assert ¬(∀ unsigned int x; -1 < x < 5 ⇒ x ≢ 0); */ ; + /*@ assert !(\forall unsigned int x; -1 < x < 5 ==> x != 0); */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c index f3b0980fe6050cb156957fba63de14a803b15060..d4c539f0476ed21cd1e476a20464bdb6788d8f35 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c @@ -5,8 +5,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ -logic ℤ f(ℤ n) = - n ≤ 2147483647 + 1 ∨ n ≥ 9223372036854775807L + 1? 0: f(n + 1) + n; +logic integer f(integer n) = + n <= 2147483647 + 1 || n >= 9223372036854775807L + 1? 0: f(n + 1) + n; */ void __gen_e_acsl_f(__e_acsl_mpz_t *__retres_arg, int n); @@ -31,7 +31,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_f_8); __gmpz_clear(__gen_e_acsl__10); } - /*@ assert f(0) ≡ 0; */ ; + /*@ assert f(0) == 0; */ ; { long __gen_e_acsl_n_5; __e_acsl_mpz_t __gen_e_acsl_f_10; @@ -48,7 +48,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_f_10); __gmpz_clear(__gen_e_acsl__11); } - /*@ assert \let n = 0 ≡ 0? 9223372036854775807L: -1; f(n) ≢ 0; */ ; + /*@ assert \let n = 0 == 0? 9223372036854775807L: -1; f(n) != 0; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c index 559ef66c07d1b3649d063335a8f41b015fe6f4e8..c5deea7fc4c70527058769eb46e420b154c19e48 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c @@ -9,7 +9,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; requires valid_mode: valid_read_string(mode); ensures result_null_or_valid_fd: - \result ≡ \null ∨ \subset(\result, &__fc_fopen[0 .. 16 - 1]); + \result == \null || \subset(\result, &__fc_fopen[0 .. 16 - 1]); assigns \result; assigns \result \from (indirect: *(filename + (0 .. strlen{Old}(filename)))), @@ -20,7 +20,7 @@ FILE *__gen_e_acsl_fopen(char const * restrict filename, /*@ requires valid_ptr_block: \valid((char *)ptr + (0 .. nmemb * size - 1)); requires valid_stream: \valid(stream); - ensures size_read: \result ≤ \old(nmemb); + ensures size_read: \result <= \old(nmemb); ensures initialization: \initialized((char *)\old(ptr) + (0 .. \result * \old(size) - 1)); @@ -36,7 +36,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb, /*@ requires valid_ptr_block: \valid((char *)ptr + (0 .. nmemb * size - 1)); requires valid_stream: \valid(stream); - ensures size_read: \result ≤ \old(nmemb); + ensures size_read: \result <= \old(nmemb); ensures initialization: \initialized((char *)\old(ptr) + (0 .. \result * \old(size) - 1)); @@ -274,7 +274,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb, requires valid_mode: valid_read_string(mode); ensures result_null_or_valid_fd: - \result ≡ \null ∨ \subset(\result, &__fc_fopen[0 .. 16 - 1]); + \result == \null || \subset(\result, &__fc_fopen[0 .. 16 - 1]); assigns \result; assigns \result \from (indirect: *(filename + (0 .. strlen{Old}(filename)))), diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c index c5762d971dea76d2d8ac74cdb935ff134fad1b8b..9707763012735d62ee16bfff0b82be24f14fbbbd 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c +++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c @@ -31,7 +31,7 @@ int main(void) "\\forall unsigned char c; 4 <= c <= 300 ==> 0 <= c <= 255", "tests/bts/issue69.c",6); } - /*@ assert ∀ unsigned char c; 4 ≤ c ≤ 300 ⇒ 0 ≤ c ≤ 255; */ ; + /*@ assert \forall unsigned char c; 4 <= c <= 300 ==> 0 <= c <= 255; */ ; int n = 5; { int __gen_e_acsl_m; @@ -63,7 +63,8 @@ int main(void) "\\let m = n > 0? 4: 341;\n\\forall char u; 1 < u < m ==> u > 0", "tests/bts/issue69.c",10); } - /*@ assert \let m = n > 0? 4: 341; ∀ char u; 1 < u < m ⇒ u > 0; */ ; + /*@ assert \let m = n > 0? 4: 341; \forall char u; 1 < u < m ==> u > 0; */ + ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-145.res.oracle b/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-145.res.oracle index 6136cebc45ed92fb5908b315bfd4e1c9ac6d7b2c..ddcaebecf7acbb5f9b89cfa2abd5edb2ca673557 100644 --- a/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-145.res.oracle +++ b/src/plugins/e-acsl/tests/bts/oracle/issue-eacsl-145.res.oracle @@ -6,15 +6,15 @@ [eva] Computing initial state [eva] Initial state computed [eva:initial-state] Values of globals at initialization - G ∈ {0} - __e_acsl_sound_verdict ∈ [--..--] - __e_acsl_sound_verdict ∈ [--..--] - __e_acsl_heap_allocation_size ∈ [--..--] - __e_acsl_heap_allocated_blocks ∈ [--..--] - __e_acsl_math_HUGE_VAL ∈ [-1.79769313486e+308 .. 1.79769313486e+308] - __e_acsl_math_HUGE_VALF ∈ [-3.40282346639e+38 .. 3.40282346639e+38] - __e_acsl_math_INFINITY ∈ [-1.79769313486e+308 .. 1.79769313486e+308] - __e_acsl_init ∈ [--..--] + G IN {0} + __e_acsl_sound_verdict IN [--..--] + __e_acsl_sound_verdict IN [--..--] + __e_acsl_heap_allocation_size IN [--..--] + __e_acsl_heap_allocated_blocks IN [--..--] + __e_acsl_math_HUGE_VAL IN [-1.79769313486e+308 .. 1.79769313486e+308] + __e_acsl_math_HUGE_VALF IN [-3.40282346639e+38 .. 3.40282346639e+38] + __e_acsl_math_INFINITY IN [-1.79769313486e+308 .. 1.79769313486e+308] + __e_acsl_init IN [--..--] [eva] using specification for function __e_acsl_memory_init [eva] using specification for function __e_acsl_store_block [eva] using specification for function __e_acsl_full_init diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c index 313fcf00ef198538e9a90fa4e936f8e944731937..cf48729e773dcc849da94ec7b9086b2b6dc42e7b 100644 --- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c +++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c @@ -41,36 +41,35 @@ char *__gen_e_acsl_literal_string_4; char *__gen_e_acsl_literal_string_8; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; */ void __gen_e_acsl_exit(int status); -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options); /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -112,7 +111,7 @@ void test_memory_tracking(void) "test_memory_tracking","!\\initialized(&dest[2 .. 3])", "tests/builtin/strcat.c",16); } - /*@ assert ¬\initialized(&dest[2 .. 3]); */ ; + /*@ assert !\initialized(&dest[2 .. 3]); */ ; { int __gen_e_acsl_size_3; int __gen_e_acsl_if_3; @@ -150,7 +149,7 @@ void test_memory_tracking(void) "test_memory_tracking","!\\initialized(&dest[3])", "tests/builtin/strcat.c",21); } - /*@ assert ¬\initialized(&dest[3]); */ ; + /*@ assert !\initialized(&dest[3]); */ ; __e_acsl_delete_block((void *)(src)); __e_acsl_delete_block((void *)(dest)); } @@ -192,7 +191,7 @@ void test_memory_tracking(void) "!\\initialized(&dest_0[2 .. 3])", "tests/builtin/strcat.c",28); } - /*@ assert ¬\initialized(&dest_0[2 .. 3]); */ ; + /*@ assert !\initialized(&dest_0[2 .. 3]); */ ; { int __gen_e_acsl_size_7; int __gen_e_acsl_if_7; @@ -233,7 +232,7 @@ void test_memory_tracking(void) "test_memory_tracking","!\\initialized(&dest_0[3])", "tests/builtin/strcat.c",33); } - /*@ assert ¬\initialized(&dest_0[3]); */ ; + /*@ assert !\initialized(&dest_0[3]); */ ; __e_acsl_delete_block((void *)(src_0)); __e_acsl_delete_block((void *)(dest_0)); } @@ -275,7 +274,7 @@ void test_memory_tracking(void) "!\\initialized(&dest_1[2 .. 3])", "tests/builtin/strcat.c",40); } - /*@ assert ¬\initialized(&dest_1[2 .. 3]); */ ; + /*@ assert !\initialized(&dest_1[2 .. 3]); */ ; { int __gen_e_acsl_size_11; int __gen_e_acsl_if_11; @@ -316,7 +315,7 @@ void test_memory_tracking(void) "test_memory_tracking","!\\initialized(&dest_1[3])", "tests/builtin/strcat.c",45); } - /*@ assert ¬\initialized(&dest_1[3]); */ ; + /*@ assert !\initialized(&dest_1[3]); */ ; __e_acsl_delete_block((void *)(src_1)); __e_acsl_delete_block((void *)(dest_1)); } @@ -324,8 +323,7 @@ void test_memory_tracking(void) } /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -347,22 +345,22 @@ pid_t __gen_e_acsl_fork(void) } } -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) @@ -421,7 +419,7 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) } } -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c index cb77e05860c921f2af86471a47a16fd3556fad20..05593d1ae21ed8b1135a8f6cdc8a51fb23a15dee 100644 --- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c +++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c @@ -43,43 +43,42 @@ char *__gen_e_acsl_literal_string_5; char *__gen_e_acsl_literal_string_4; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ exits status: \exit_status ≢ 0; +/*@ exits status: \exit_status != 0; ensures never_terminates: \false; assigns \exit_status \from \nothing; */ void __gen_e_acsl_abort(void); -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; */ void __gen_e_acsl_exit(int status); -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options); /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -97,7 +96,7 @@ pid_t __gen_e_acsl_fork(void); ensures allocation: \fresh{Old, Here}(\result,strlen(\old(s))); ensures result_valid_string_and_same_contents: - valid_string(\result) ∧ strcmp(\result, \old(s)) ≡ 0; + valid_string(\result) && strcmp(\result, \old(s)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: s), __fc_heap_status; assigns \result @@ -105,8 +104,8 @@ pid_t __gen_e_acsl_fork(void); (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(strlen(s)); - ensures result_null: \result ≡ \null; + assumes cannot_allocate: !is_allocable(strlen(s)); + ensures result_null: \result == \null; assigns \result; assigns \result \from \nothing; allocates \nothing; @@ -134,7 +133,7 @@ __inline static void fail_ncomp(int cond, char *fmt, int l, int r) ensures allocation: \fresh{Old, Here}(\result,strlen(\old(s))); ensures result_valid_string_and_same_contents: - valid_string(\result) ∧ strcmp(\result, \old(s)) ≡ 0; + valid_string(\result) && strcmp(\result, \old(s)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: s), __fc_heap_status; assigns \result @@ -142,8 +141,8 @@ __inline static void fail_ncomp(int cond, char *fmt, int l, int r) (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(strlen(s)); - ensures result_null: \result ≡ \null; + assumes cannot_allocate: !is_allocable(strlen(s)); + ensures result_null: \result == \null; assigns \result; assigns \result \from \nothing; allocates \nothing; @@ -169,8 +168,7 @@ char *__gen_e_acsl_strdup(char const *s) } /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -192,22 +190,22 @@ pid_t __gen_e_acsl_fork(void) } } -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) @@ -266,7 +264,7 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) } } -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; @@ -279,7 +277,7 @@ void __gen_e_acsl_exit(int status) return; } -/*@ exits status: \exit_status ≢ 0; +/*@ exits status: \exit_status != 0; ensures never_terminates: \false; assigns \exit_status \from \nothing; diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c index bb72f2bbc63f1b9bba44621ad6fa764bf561cf00..99ed0542eb37266336b739dd60a87fae5a9453fc 100644 --- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c +++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c @@ -35,36 +35,35 @@ char *__gen_e_acsl_literal_string_4; char *__gen_e_acsl_literal_string_8; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; */ void __gen_e_acsl_exit(int status); -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options); /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -82,7 +81,7 @@ pid_t __gen_e_acsl_fork(void); ensures allocation: \fresh{Old, Here}(\result,strlen(\old(s))); ensures result_valid_string_and_same_contents: - valid_string(\result) ∧ strcmp(\result, \old(s)) ≡ 0; + valid_string(\result) && strcmp(\result, \old(s)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: s), __fc_heap_status; assigns \result @@ -90,8 +89,8 @@ pid_t __gen_e_acsl_fork(void); (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(strlen(s)); - ensures result_null: \result ≡ \null; + assumes cannot_allocate: !is_allocable(strlen(s)); + ensures result_null: \result == \null; assigns \result; assigns \result \from \nothing; allocates \nothing; @@ -119,7 +118,7 @@ void test_memory_tracking(void) "test_memory_tracking","!\\initialized(&dest[0 .. 3])", "tests/builtin/strcpy.c",13); } - /*@ assert ¬\initialized(&dest[0 .. 3]); */ ; + /*@ assert !\initialized(&dest[0 .. 3]); */ ; { int __gen_e_acsl_size_2; int __gen_e_acsl_if_2; @@ -162,7 +161,7 @@ void test_memory_tracking(void) "test_memory_tracking","!\\initialized(&dest[2 .. 3])", "tests/builtin/strcpy.c",18); } - /*@ assert ¬\initialized(&dest[2 .. 3]); */ ; + /*@ assert !\initialized(&dest[2 .. 3]); */ ; __e_acsl_delete_block((void *)(src)); __e_acsl_delete_block((void *)(dest)); } @@ -187,7 +186,7 @@ void test_memory_tracking(void) "!\\initialized(&dest_0[0 .. 3])", "tests/builtin/strcpy.c",23); } - /*@ assert ¬\initialized(&dest_0[0 .. 3]); */ ; + /*@ assert !\initialized(&dest_0[0 .. 3]); */ ; { int __gen_e_acsl_size_6; int __gen_e_acsl_if_6; @@ -228,7 +227,7 @@ void test_memory_tracking(void) "!\\initialized(&dest_0[1 .. 3])", "tests/builtin/strcpy.c",28); } - /*@ assert ¬\initialized(&dest_0[1 .. 3]); */ ; + /*@ assert !\initialized(&dest_0[1 .. 3]); */ ; __e_acsl_delete_block((void *)(src_0)); __e_acsl_delete_block((void *)(dest_0)); } @@ -253,7 +252,7 @@ void test_memory_tracking(void) "!\\initialized(&dest_1[0 .. 3])", "tests/builtin/strcpy.c",33); } - /*@ assert ¬\initialized(&dest_1[0 .. 3]); */ ; + /*@ assert !\initialized(&dest_1[0 .. 3]); */ ; { int __gen_e_acsl_size_9; int __gen_e_acsl_if_9; @@ -294,7 +293,7 @@ void test_memory_tracking(void) "test_memory_tracking","!\\initialized(&dest_1[3])", "tests/builtin/strcpy.c",38); } - /*@ assert ¬\initialized(&dest_1[3]); */ ; + /*@ assert !\initialized(&dest_1[3]); */ ; __e_acsl_delete_block((void *)(src_1)); __e_acsl_delete_block((void *)(dest_1)); } @@ -313,7 +312,7 @@ void test_memory_tracking(void) ensures allocation: \fresh{Old, Here}(\result,strlen(\old(s))); ensures result_valid_string_and_same_contents: - valid_string(\result) ∧ strcmp(\result, \old(s)) ≡ 0; + valid_string(\result) && strcmp(\result, \old(s)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: s), __fc_heap_status; assigns \result @@ -321,8 +320,8 @@ void test_memory_tracking(void) (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(strlen(s)); - ensures result_null: \result ≡ \null; + assumes cannot_allocate: !is_allocable(strlen(s)); + ensures result_null: \result == \null; assigns \result; assigns \result \from \nothing; allocates \nothing; @@ -348,8 +347,7 @@ char *__gen_e_acsl_strdup(char const *s) } /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -371,22 +369,22 @@ pid_t __gen_e_acsl_fork(void) } } -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) @@ -445,7 +443,7 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) } } -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c index 5288ad885239b257ee03115041beef1d1b10e5e5..81dbbbd89b7be09360787a93fd4636e23e488f75 100644 --- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c +++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c @@ -26,43 +26,42 @@ char *__gen_e_acsl_literal_string_4; char *__gen_e_acsl_literal_string_6; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ exits status: \exit_status ≢ 0; +/*@ exits status: \exit_status != 0; ensures never_terminates: \false; assigns \exit_status \from \nothing; */ void __gen_e_acsl_abort(void); -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; */ void __gen_e_acsl_exit(int status); -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options); /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -80,7 +79,7 @@ pid_t __gen_e_acsl_fork(void); ensures allocation: \fresh{Old, Here}(\result,strlen(\old(s))); ensures result_valid_string_and_same_contents: - valid_string(\result) ∧ strcmp(\result, \old(s)) ≡ 0; + valid_string(\result) && strcmp(\result, \old(s)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: s), __fc_heap_status; assigns \result @@ -88,8 +87,8 @@ pid_t __gen_e_acsl_fork(void); (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(strlen(s)); - ensures result_null: \result ≡ \null; + assumes cannot_allocate: !is_allocable(strlen(s)); + ensures result_null: \result == \null; assigns \result; assigns \result \from \nothing; allocates \nothing; @@ -108,7 +107,7 @@ char *__gen_e_acsl_strdup(char const *s); ensures allocation: \fresh{Old, Here}(\result,strlen(\old(s))); ensures result_valid_string_and_same_contents: - valid_string(\result) ∧ strcmp(\result, \old(s)) ≡ 0; + valid_string(\result) && strcmp(\result, \old(s)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: s), __fc_heap_status; assigns \result @@ -116,8 +115,8 @@ char *__gen_e_acsl_strdup(char const *s); (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(strlen(s)); - ensures result_null: \result ≡ \null; + assumes cannot_allocate: !is_allocable(strlen(s)); + ensures result_null: \result == \null; assigns \result; assigns \result \from \nothing; allocates \nothing; @@ -143,8 +142,7 @@ char *__gen_e_acsl_strdup(char const *s) } /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -166,22 +164,22 @@ pid_t __gen_e_acsl_fork(void) } } -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) @@ -240,7 +238,7 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) } } -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; @@ -253,7 +251,7 @@ void __gen_e_acsl_exit(int status) return; } -/*@ exits status: \exit_status ≢ 0; +/*@ exits status: \exit_status != 0; ensures never_terminates: \false; assigns \exit_status \from \nothing; diff --git a/src/plugins/e-acsl/tests/constructs/acsl_check.c b/src/plugins/e-acsl/tests/constructs/acsl_check.c index 7c7659f8dda7fe7dfc3e42102563799849306fcc..28ef52feadf8f65a1292ad5be9745bbb0d0d4200 100644 --- a/src/plugins/e-acsl/tests/constructs/acsl_check.c +++ b/src/plugins/e-acsl/tests/constructs/acsl_check.c @@ -1,3 +1,6 @@ +/* run.config_dev + MACRO: ROOT_EACSL_GCC_OPTS_EXT -F -no-unicode +*/ #include <stdio.h> /*@ diff --git a/src/plugins/e-acsl/tests/constructs/oracle/acsl_check.res.oracle b/src/plugins/e-acsl/tests/constructs/oracle/acsl_check.res.oracle index cd045de605e4fc95c9335a74fdd6fda6c67ef425..309652132b4373d5ec7c0c5718078209733fa00e 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/acsl_check.res.oracle +++ b/src/plugins/e-acsl/tests/constructs/oracle/acsl_check.res.oracle @@ -1,13 +1,13 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". -[eva:alarm] tests/constructs/acsl_check.c:18: Warning: +[eva:alarm] tests/constructs/acsl_check.c:21: Warning: function __e_acsl_assert, behavior non_blocking: precondition got status invalid. -[eva:alarm] tests/constructs/acsl_check.c:18: Warning: check got status invalid. -[eva:alarm] tests/constructs/acsl_check.c:19: Warning: +[eva:alarm] tests/constructs/acsl_check.c:21: Warning: check got status invalid. +[eva:alarm] tests/constructs/acsl_check.c:22: Warning: function __gen_e_acsl_f: precondition got status invalid. -[eva:alarm] tests/constructs/acsl_check.c:4: Warning: +[eva:alarm] tests/constructs/acsl_check.c:7: Warning: function __e_acsl_assert, behavior non_blocking: precondition got status invalid. -[eva:alarm] tests/constructs/acsl_check.c:5: Warning: +[eva:alarm] tests/constructs/acsl_check.c:8: Warning: function __e_acsl_assert, behavior non_blocking: precondition got status invalid. -[eva:alarm] tests/constructs/acsl_check.c:5: Warning: +[eva:alarm] tests/constructs/acsl_check.c:8: Warning: function __gen_e_acsl_f: postcondition got status invalid. diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c index d6c33875d6093cf058a4ec369c57e8a702191643..f848fc7aca68d862891107e9b6d6ac821bcd5ad7 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c @@ -4,8 +4,8 @@ char *__gen_e_acsl_literal_string; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ check requires a ≢ 0; - check ensures \result ≢ 0; */ +/*@ check requires a != 0; + check ensures \result != 0; */ int __gen_e_acsl_f(int a); int f(int a) @@ -20,31 +20,31 @@ void g(int a, int *b) __e_acsl_store_block((void *)(& b),(size_t)8); __e_acsl_assert((long)*(b + 1) != 0L,1,"RTE","g", "division_by_zero: (long)*(b + 1) != 0", - "tests/constructs/acsl_check.c",12); + "tests/constructs/acsl_check.c",15); __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(b + 1), sizeof(int),(void *)b, (void *)(& b)); __e_acsl_assert(__gen_e_acsl_valid_read,1,"RTE","g", "mem_access: \\valid_read(b + 1)", - "tests/constructs/acsl_check.c",12); + "tests/constructs/acsl_check.c",15); __e_acsl_assert(a / (long)*(b + 1) == 0L,0,"Assertion","g", - "a / *(b + 1) == 0","tests/constructs/acsl_check.c",12); + "a / *(b + 1) == 0","tests/constructs/acsl_check.c",15); } - /*@ check a / *(b + 1) ≡ 0; */ ; + /*@ check a / *(b + 1) == 0; */ ; __e_acsl_delete_block((void *)(& b)); return; } -/*@ check requires a ≢ 0; - check ensures \result ≢ 0; */ +/*@ check requires a != 0; + check ensures \result != 0; */ int __gen_e_acsl_f(int a) { int __retres; __e_acsl_assert(a != 0,0,"Precondition","f","a != 0", - "tests/constructs/acsl_check.c",4); + "tests/constructs/acsl_check.c",7); __retres = f(a); __e_acsl_assert(__retres != 0,0,"Postcondition","f","\\result != 0", - "tests/constructs/acsl_check.c",5); + "tests/constructs/acsl_check.c",8); return __retres; } @@ -71,13 +71,13 @@ int main(void) __e_acsl_store_block((void *)(b),(size_t)12); __e_acsl_full_init((void *)(& b)); __e_acsl_assert(a == 1,0,"Assertion","main","a == 1", - "tests/constructs/acsl_check.c",18); - /*@ check a ≡ 1; */ ; + "tests/constructs/acsl_check.c",21); + /*@ check a == 1; */ ; a = __gen_e_acsl_f(a); fprintf(stderr,__gen_e_acsl_literal_string); /* fprintf_va_1 */ g(a,b); - /*@ admit a ≡ 1; */ ; - /*@ admit a ≡ 2; */ ; + /*@ admit a == 1; */ ; + /*@ admit a == 2; */ ; __e_acsl_delete_block((void *)(b)); __e_acsl_memory_clean(); return a; diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c index c9da90bf22f58c36bc929800e70643a7837c03f2..48f38465fb2c4750152af698cebb3a40079da2c8 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c @@ -13,15 +13,14 @@ int f(int x) if (! (x >= 0)) break; x -= 2; __e_acsl_assert(__gen_e_acsl_old_variant >= 0,1,"Variant","f", - "(old x) \342\211\245 0","tests/constructs/decrease.c", - 10); + "(old x) >= 0","tests/constructs/decrease.c",10); __e_acsl_assert(__gen_e_acsl_old_variant > x,1,"Variant","f", "(old x) > x","tests/constructs/decrease.c",10); } return x; } -/*@ predicate lexico(ℤ x, ℤ y) = x > y ∧ 0 ≤ x; +/*@ predicate lexico(integer x, integer y) = x > y && 0 <= x; */ int __gen_e_acsl_lexico(int x, int y); @@ -44,7 +43,7 @@ int g(int x) return x; } -/*@ requires n ≤ 12; */ +/*@ requires n <= 12; */ int __gen_e_acsl_fact(int n); int fact(int n) @@ -53,7 +52,7 @@ int fact(int n) int result = n; __e_acsl_assert(n >= 1,1,"Invariant","fact","n >= 1", "tests/constructs/decrease.c",31); - /*@ loop invariant n ≥ 1; + /*@ loop invariant n >= 1; loop variant n; */ while (1) { __gen_e_acsl_old_variant = n; @@ -63,15 +62,14 @@ int fact(int n) __e_acsl_assert(n >= 1,1,"Invariant","fact","n >= 1", "tests/constructs/decrease.c",31); __e_acsl_assert(__gen_e_acsl_old_variant >= 0,1,"Variant","fact", - "(old n) \342\211\245 0","tests/constructs/decrease.c", - 33); + "(old n) >= 0","tests/constructs/decrease.c",33); __e_acsl_assert(__gen_e_acsl_old_variant > n,1,"Variant","fact", "(old n) > n","tests/constructs/decrease.c",33); } return result; } -/*@ requires n ≤ 20; */ +/*@ requires n <= 20; */ size_t __gen_e_acsl_fact2(size_t n); size_t fact2(size_t n) @@ -85,7 +83,7 @@ size_t fact2(size_t n) __e_acsl_assert(__gen_e_acsl_and,1,"Invariant","fact2","1 <= i < n", "tests/constructs/decrease.c",44); } - /*@ loop invariant 1 ≤ i < n; + /*@ loop invariant 1 <= i < n; loop variant n - i; */ while (i < n - 1UL) { result *= n - i; @@ -124,13 +122,13 @@ int fib(int n) return_label: return __retres; } -/*@ requires n ≥ 0; +/*@ requires n >= 0; decreases n; */ int __gen_e_acsl_odd(int n); int odd(int n); -/*@ requires n ≥ 0; +/*@ requires n >= 0; decreases n; */ int __gen_e_acsl_even(int n); @@ -166,53 +164,53 @@ int main(void) int f10 = f(10); __e_acsl_assert(f10 == -2,1,"Assertion","main","f10 == -2", "tests/constructs/decrease.c",81); - /*@ assert f10 ≡ -2; */ ; + /*@ assert f10 == -2; */ ; int f7 = f(7); __e_acsl_assert(f7 == -1,1,"Assertion","main","f7 == -1", "tests/constructs/decrease.c",83); - /*@ assert f7 ≡ -1; */ ; + /*@ assert f7 == -1; */ ; int g10 = g(10); __e_acsl_assert(g10 == -2,1,"Assertion","main","g10 == -2", "tests/constructs/decrease.c",85); - /*@ assert g10 ≡ -2; */ ; + /*@ assert g10 == -2; */ ; int g7 = g(7); __e_acsl_assert(g7 == -1,1,"Assertion","main","g7 == -1", "tests/constructs/decrease.c",87); - /*@ assert g7 ≡ -1; */ ; + /*@ assert g7 == -1; */ ; int fact7 = __gen_e_acsl_fact(7); __e_acsl_assert(fact7 == 5040,1,"Assertion","main","fact7 == 5040", "tests/constructs/decrease.c",90); - /*@ assert fact7 ≡ 5040; */ ; + /*@ assert fact7 == 5040; */ ; size_t fact18 = __gen_e_acsl_fact2((unsigned long)18); __e_acsl_assert(fact18 == 6402373705728000UL,1,"Assertion","main", "fact18 == 6402373705728000UL", "tests/constructs/decrease.c",93); - /*@ assert fact18 ≡ 6402373705728000UL; */ ; + /*@ assert fact18 == 6402373705728000UL; */ ; int fib7 = __gen_e_acsl_fib(7); __e_acsl_assert(fib7 == 13,1,"Assertion","main","fib7 == 13", "tests/constructs/decrease.c",96); - /*@ assert fib7 ≡ 13; */ ; + /*@ assert fib7 == 13; */ ; int even7 = __gen_e_acsl_even(7); __e_acsl_assert(even7 == 0,1,"Assertion","main","even7 == 0", "tests/constructs/decrease.c",99); - /*@ assert even7 ≡ 0; */ ; + /*@ assert even7 == 0; */ ; int even10 = __gen_e_acsl_even(10); __e_acsl_assert(even10 == 1,1,"Assertion","main","even10 == 1", "tests/constructs/decrease.c",101); - /*@ assert even10 ≡ 1; */ ; + /*@ assert even10 == 1; */ ; int odd7 = __gen_e_acsl_odd(7); __e_acsl_assert(odd7 == 1,1,"Assertion","main","odd7 == 1", "tests/constructs/decrease.c",103); - /*@ assert odd7 ≡ 1; */ ; + /*@ assert odd7 == 1; */ ; int odd10 = __gen_e_acsl_odd(10); __e_acsl_assert(odd10 == 0,1,"Assertion","main","odd10 == 0", "tests/constructs/decrease.c",105); - /*@ assert odd10 ≡ 0; */ ; + /*@ assert odd10 == 0; */ ; __retres = 0; return __retres; } -/*@ requires n ≥ 0; +/*@ requires n >= 0; decreases n; */ int __gen_e_acsl_even(int n) { @@ -223,7 +221,7 @@ int __gen_e_acsl_even(int n) return __retres; } -/*@ requires n ≥ 0; +/*@ requires n >= 0; decreases n; */ int __gen_e_acsl_odd(int n) { @@ -242,7 +240,7 @@ int __gen_e_acsl_fib(int n) return __retres; } -/*@ requires n ≤ 20; */ +/*@ requires n <= 20; */ size_t __gen_e_acsl_fact2(size_t n) { size_t __retres; @@ -252,7 +250,7 @@ size_t __gen_e_acsl_fact2(size_t n) return __retres; } -/*@ requires n ≤ 12; */ +/*@ requires n <= 12; */ int __gen_e_acsl_fact(int n) { int __retres; diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c index c29fe752eee1eb2062ee0411e5048892ab19d443..60e999e03601c25f762b72eb5b978e7596452a5a 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c @@ -6,7 +6,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; int X = 0; int Y = 2; -/*@ ensures X ≡ 1; */ +/*@ ensures X == 1; */ void __gen_e_acsl_f(void); void f(void) @@ -15,8 +15,8 @@ void f(void) return; } -/*@ ensures X ≡ 2; - ensures Y ≡ 2; */ +/*@ ensures X == 2; + ensures Y == 2; */ void __gen_e_acsl_g(void); void g(void) @@ -25,7 +25,7 @@ void g(void) return; } -/*@ requires X ≡ 2; */ +/*@ requires X == 2; */ void __gen_e_acsl_h(void); void h(void) @@ -34,8 +34,8 @@ void h(void) return; } -/*@ requires X ≡ 3; - requires Y ≡ 2; */ +/*@ requires X == 3; + requires Y == 2; */ void __gen_e_acsl_i(void); void i(void) @@ -45,13 +45,13 @@ void i(void) } /*@ behavior b1: - requires X ≡ 5; - ensures X ≡ 3; + requires X == 5; + ensures X == 3; behavior b2: - requires X ≡ 3 + Y; - requires Y ≡ 2; - ensures X ≡ Y + 1; + requires X == 3 + Y; + requires Y == 2; + ensures X == Y + 1; */ void __gen_e_acsl_j(void); @@ -62,14 +62,14 @@ void j(void) } /*@ behavior b1: - assumes X ≡ 1; - requires X ≡ 0; + assumes X == 1; + requires X == 0; behavior b2: - assumes X ≡ 3; - assumes Y ≡ 2; - requires X ≡ 3; - requires X + Y ≡ 5; + assumes X == 3; + assumes Y == 2; + requires X == 3; + requires X + Y == 5; */ void __gen_e_acsl_k(void); @@ -79,26 +79,26 @@ void k(void) return; } -/*@ ensures X ≡ 5; */ +/*@ ensures X == 5; */ int __gen_e_acsl_l(void); int l(void) { __e_acsl_assert(Y == 2,1,"Assertion","l","Y == 2", "tests/constructs/function_contract.i",61); - /*@ assert Y ≡ 2; */ ; + /*@ assert Y == 2; */ ; return X; } /*@ behavior b1: - assumes X ≡ 7; - ensures X ≡ 95; + assumes X == 7; + ensures X == 95; behavior b2: - assumes X ≡ 5; - assumes Y ≡ 2; - ensures X ≡ 7; - ensures X ≡ \old(X) + Y; + assumes X == 5; + assumes Y == 2; + ensures X == 7; + ensures X == \old(X) + Y; */ void __gen_e_acsl_m(void); @@ -112,12 +112,12 @@ void m(void) requires X < 10; behavior b1: - assumes X ≡ 7; - ensures X ≡ 8; + assumes X == 7; + ensures X == 8; behavior b2: - assumes X ≡ 5; - ensures X ≡ 98; + assumes X == 5; + ensures X == 98; */ void __gen_e_acsl_n(void); @@ -128,27 +128,27 @@ void n(void) } /*@ requires X > -1000; - ensures X ≡ \old(Y); + ensures X == \old(Y); behavior neg: assumes Y < 0; requires Y < 1; - ensures X ≡ \old(Y); + ensures X == \old(Y); behavior pos: - assumes Y ≥ 0; + assumes Y >= 0; requires Y > -1; - ensures X ≡ \old(Y); + ensures X == \old(Y); behavior odd: - assumes Y % 2 ≡ 1; - requires Y % 2 - 1 ≡ 0; - ensures X ≡ \old(Y); + assumes Y % 2 == 1; + requires Y % 2 - 1 == 0; + ensures X == \old(Y); behavior even: - assumes Y % 2 ≡ 0; - requires Y % 2 + 1 ≡ 1; - ensures X ≡ \old(Y); + assumes Y % 2 == 0; + requires Y % 2 + 1 == 1; + ensures X == \old(Y); complete behaviors even, odd, pos, neg; complete behaviors odd, even; @@ -182,27 +182,27 @@ int main(void) } /*@ requires X > -1000; - ensures X ≡ \old(Y); + ensures X == \old(Y); behavior neg: assumes Y < 0; requires Y < 1; - ensures X ≡ \old(Y); + ensures X == \old(Y); behavior pos: - assumes Y ≥ 0; + assumes Y >= 0; requires Y > -1; - ensures X ≡ \old(Y); + ensures X == \old(Y); behavior odd: - assumes Y % 2 ≡ 1; - requires Y % 2 - 1 ≡ 0; - ensures X ≡ \old(Y); + assumes Y % 2 == 1; + requires Y % 2 - 1 == 0; + ensures X == \old(Y); behavior even: - assumes Y % 2 ≡ 0; - requires Y % 2 + 1 ≡ 1; - ensures X ≡ \old(Y); + assumes Y % 2 == 0; + requires Y % 2 + 1 == 1; + ensures X == \old(Y); complete behaviors even, odd, pos, neg; complete behaviors odd, even; @@ -332,12 +332,12 @@ void __gen_e_acsl_o(void) requires X < 10; behavior b1: - assumes X ≡ 7; - ensures X ≡ 8; + assumes X == 7; + ensures X == 8; behavior b2: - assumes X ≡ 5; - ensures X ≡ 98; + assumes X == 5; + ensures X == 98; */ void __gen_e_acsl_n(void) { @@ -373,14 +373,14 @@ void __gen_e_acsl_n(void) } /*@ behavior b1: - assumes X ≡ 7; - ensures X ≡ 95; + assumes X == 7; + ensures X == 95; behavior b2: - assumes X ≡ 5; - assumes Y ≡ 2; - ensures X ≡ 7; - ensures X ≡ \old(X) + Y; + assumes X == 5; + assumes Y == 2; + ensures X == 7; + ensures X == \old(X) + Y; */ void __gen_e_acsl_m(void) { @@ -420,7 +420,7 @@ void __gen_e_acsl_m(void) } } -/*@ ensures X ≡ 5; */ +/*@ ensures X == 5; */ int __gen_e_acsl_l(void) { int __retres; @@ -431,14 +431,14 @@ int __gen_e_acsl_l(void) } /*@ behavior b1: - assumes X ≡ 1; - requires X ≡ 0; + assumes X == 1; + requires X == 0; behavior b2: - assumes X ≡ 3; - assumes Y ≡ 2; - requires X ≡ 3; - requires X + Y ≡ 5; + assumes X == 3; + assumes Y == 2; + requires X == 3; + requires X + Y == 5; */ void __gen_e_acsl_k(void) { @@ -474,13 +474,13 @@ void __gen_e_acsl_k(void) } /*@ behavior b1: - requires X ≡ 5; - ensures X ≡ 3; + requires X == 5; + ensures X == 3; behavior b2: - requires X ≡ 3 + Y; - requires Y ≡ 2; - ensures X ≡ Y + 1; + requires X == 3 + Y; + requires Y == 2; + ensures X == Y + 1; */ void __gen_e_acsl_j(void) { @@ -528,8 +528,8 @@ void __gen_e_acsl_j(void) } } -/*@ requires X ≡ 3; - requires Y ≡ 2; */ +/*@ requires X == 3; + requires Y == 2; */ void __gen_e_acsl_i(void) { __e_acsl_assert(X == 3,1,"Precondition","i","X == 3", @@ -540,7 +540,7 @@ void __gen_e_acsl_i(void) return; } -/*@ requires X ≡ 2; */ +/*@ requires X == 2; */ void __gen_e_acsl_h(void) { __e_acsl_assert(X == 2,1,"Precondition","h","X == 2", @@ -549,8 +549,8 @@ void __gen_e_acsl_h(void) return; } -/*@ ensures X ≡ 2; - ensures Y ≡ 2; */ +/*@ ensures X == 2; + ensures Y == 2; */ void __gen_e_acsl_g(void) { g(); @@ -561,7 +561,7 @@ void __gen_e_acsl_g(void) return; } -/*@ ensures X ≡ 1; */ +/*@ ensures X == 1; */ void __gen_e_acsl_f(void) { f(); diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c index 19a1e3dfd46a540d6525445e25bfe3c1dc20d623..24ba2184a6f5781c0d8320c5b102f64208653035 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c @@ -69,7 +69,7 @@ int main(void) __e_acsl_assert(*q == G,1,"Assertion","main","*q == G", "tests/constructs/ghost.i",14); } - /*@ assert *q ≡ G; */ ; + /*@ assert *q == G; */ ; int x = 1; if (x) x ++; else { diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c index 65d2e93785cd4c110da3196e18c56fa94552d3c2..54535314092f83a27c244519b4d8b7aa0165e256 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c @@ -17,11 +17,11 @@ int main(void) __e_acsl_assert(__gen_e_acsl_and,1,"Invariant","main","0 <= i < 10", "tests/constructs/invariant.i",9); } - /*@ invariant 0 ≤ i < 10; */ ; + /*@ invariant 0 <= i < 10; */ ; x += i; __e_acsl_assert(i <= x,1,"Invariant","main","i <= x", "tests/constructs/invariant.i",11); - /*@ invariant i ≤ x; */ ; + /*@ invariant i <= x; */ ; i ++; } } diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c index f1091f95d9bb2e93247dfc7feeceefe4c63d93a8..1990a5f5c70656ce6c1c54dd6785c8e9bc944911 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c @@ -5,7 +5,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; int X = 0; -/*@ ensures X ≡ 3; */ +/*@ ensures X == 3; */ int main(void); int __gen_e_acsl_main(void) @@ -13,14 +13,14 @@ int __gen_e_acsl_main(void) int __retres; goto L1; L1: - /*@ assert X ≡ 0; */ + /*@ assert X == 0; */ __e_acsl_assert(X == 0,1,"Assertion","main","X == 0", "tests/constructs/labeled_stmt.i",10); X = 1; goto L2; L2: - /*@ requires X ≡ 1; - ensures X ≡ 2; */ + /*@ requires X == 1; + ensures X == 2; */ { __e_acsl_assert(X == 1,1,"Precondition","main","X == 1", "tests/constructs/labeled_stmt.i",13); @@ -37,7 +37,7 @@ int __gen_e_acsl_main(void) return_label: return __retres; } -/*@ ensures X ≡ 3; */ +/*@ ensures X == 3; */ int main(void) { int __retres; diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c index 99047ada7fce8801fa3da7a63e74f6ca77b965a4..ec394cc3bf1a6eb87d837058dd442387acf4f65f 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c @@ -15,7 +15,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_and,1,"Assertion","main","x == 0 && y == 1", "tests/constructs/lazy.i",9); } - /*@ assert x ≡ 0 ∧ y ≡ 1; */ ; + /*@ assert x == 0 && y == 1; */ ; { int __gen_e_acsl_and_2; if (x != 0) { @@ -27,14 +27,14 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","main", "!(x != 0 && y == 1 / 0)","tests/constructs/lazy.i",10); } - /*@ assert ¬(x ≢ 0 ∧ y ≡ 1 / 0); */ ; + /*@ assert !(x != 0 && y == 1 / 0); */ ; { int __gen_e_acsl_or; if (y == 1) __gen_e_acsl_or = 1; else __gen_e_acsl_or = x == 1; __e_acsl_assert(__gen_e_acsl_or,1,"Assertion","main","y == 1 || x == 1", "tests/constructs/lazy.i",11); } - /*@ assert y ≡ 1 ∨ x ≡ 1; */ ; + /*@ assert y == 1 || x == 1; */ ; { int __gen_e_acsl_or_2; if (x == 0) __gen_e_acsl_or_2 = 1; @@ -46,7 +46,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_or_2,1,"Assertion","main", "x == 0 || y == 1 / 0","tests/constructs/lazy.i",12); } - /*@ assert x ≡ 0 ∨ y ≡ 1 / 0; */ ; + /*@ assert x == 0 || y == 1 / 0; */ ; { int __gen_e_acsl_implies; if (! (x == 0)) __gen_e_acsl_implies = 1; @@ -54,7 +54,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_implies,1,"Assertion","main", "x == 0 ==> y == 1","tests/constructs/lazy.i",13); } - /*@ assert x ≡ 0 ⇒ y ≡ 1; */ ; + /*@ assert x == 0 ==> y == 1; */ ; { int __gen_e_acsl_implies_2; if (! (x == 1)) __gen_e_acsl_implies_2 = 1; @@ -66,28 +66,28 @@ int main(void) __e_acsl_assert(__gen_e_acsl_implies_2,1,"Assertion","main", "x == 1 ==> y == 1 / 0","tests/constructs/lazy.i",14); } - /*@ assert x ≡ 1 ⇒ y ≡ 1 / 0; */ ; + /*@ assert x == 1 ==> y == 1 / 0; */ ; { int __gen_e_acsl_if; if (x != 0) __gen_e_acsl_if = x != 0; else __gen_e_acsl_if = y != 0; __e_acsl_assert(__gen_e_acsl_if,1,"Assertion","main", "x != 0? x != 0: y != 0","tests/constructs/lazy.i",15); } - /*@ assert x ≢ 0? x ≢ 0: y ≢ 0; */ ; + /*@ assert x != 0? x != 0: y != 0; */ ; { int __gen_e_acsl_if_2; if (y != 0) __gen_e_acsl_if_2 = y != 0; else __gen_e_acsl_if_2 = x != 0; __e_acsl_assert(__gen_e_acsl_if_2,1,"Assertion","main", "y != 0? y != 0: x != 0","tests/constructs/lazy.i",16); } - /*@ assert y ≢ 0? y ≢ 0: x ≢ 0; */ ; + /*@ assert y != 0? y != 0: x != 0; */ ; { int __gen_e_acsl_if_3; if (x == 1) __gen_e_acsl_if_3 = x == 18; else __gen_e_acsl_if_3 = x == 0; __e_acsl_assert(__gen_e_acsl_if_3,1,"Assertion","main", "x == 1? x == 18: x == 0","tests/constructs/lazy.i",17); } - /*@ assert x ≡ 1? x ≡ 18: x ≡ 0; */ ; + /*@ assert x == 1? x == 18: x == 0; */ ; { int __gen_e_acsl_implies_3; int __gen_e_acsl_equiv; @@ -103,7 +103,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_equiv,1,"Assertion","main", "x == 2 <==> y == 3","tests/constructs/lazy.i",20); } - /*@ assert x ≡ 2 ⇔ y ≡ 3; */ ; + /*@ assert x == 2 <==> y == 3; */ ; { int __gen_e_acsl_implies_5; int __gen_e_acsl_equiv_2; @@ -119,7 +119,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_equiv_2,1,"Assertion","main", "x == 0 <==> y == 1","tests/constructs/lazy.i",21); } - /*@ assert x ≡ 0 ⇔ y ≡ 1; */ ; + /*@ assert x == 0 <==> y == 1; */ ; { int __gen_e_acsl_if_4; if (x != 0) __gen_e_acsl_if_4 = x; else __gen_e_acsl_if_4 = y; @@ -127,7 +127,7 @@ int main(void) "main","((x != 0? x: y) != 0) == (x == 0)", "tests/constructs/lazy.i",24); } - /*@ assert ((x ≢ 0? x: y) ≢ 0) ≡ (x ≡ 0); */ ; + /*@ assert ((x != 0? x: y) != 0) == (x == 0); */ ; { int __gen_e_acsl_and_3; int __gen_e_acsl_or_3; @@ -138,7 +138,7 @@ int main(void) "(x != 0 && y != 0) || y != 0","tests/constructs/lazy.i", 25); } - /*@ assert (x ≢ 0 ∧ y ≢ 0) ∨ y ≢ 0; */ ; + /*@ assert (x != 0 && y != 0) || y != 0; */ ; { int __gen_e_acsl_or_4; int __gen_e_acsl_and_4; @@ -149,7 +149,7 @@ int main(void) "(x != 0 || y != 0) && y == 1","tests/constructs/lazy.i", 26); } - /*@ assert (x ≢ 0 ∨ y ≢ 0) ∧ y ≡ 1; */ ; + /*@ assert (x != 0 || y != 0) && y == 1; */ ; { int __gen_e_acsl_or_5; if (x != 0) __gen_e_acsl_or_5 = 1; else __gen_e_acsl_or_5 = y != 0; @@ -157,7 +157,7 @@ int main(void) "(x != 0 || y != 0) == (y != 0)", "tests/constructs/lazy.i",27); } - /*@ assert (x ≢ 0 ∨ y ≢ 0) ≡ (y ≢ 0); */ ; + /*@ assert (x != 0 || y != 0) == (y != 0); */ ; { int __gen_e_acsl_and_5; if (x != 0) __gen_e_acsl_and_5 = y != 0; else __gen_e_acsl_and_5 = 0; @@ -165,7 +165,7 @@ int main(void) "(x != 0 && y != 0) == (x != 0)", "tests/constructs/lazy.i",28); } - /*@ assert (x ≢ 0 ∧ y ≢ 0) ≡ (x ≢ 0); */ ; + /*@ assert (x != 0 && y != 0) == (x != 0); */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c index 029e81dbde948f4cf261e8fe0736c00e13f1fa9c..31cf7c5cc6c169396be035e76f79ea2c3ab458d5 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c @@ -15,7 +15,7 @@ void simple_loop(void) __e_acsl_assert(__gen_e_acsl_and,1,"Invariant","simple_loop", "0 <= i <= 10","tests/constructs/loop.i",8); } - /*@ loop invariant 0 ≤ i ≤ 10; */ + /*@ loop invariant 0 <= i <= 10; */ while (i < 10) { sum += i; { @@ -41,7 +41,7 @@ void nested_loops(void) __e_acsl_assert(__gen_e_acsl_and,1,"Invariant","nested_loops", "0 <= i <= 4","tests/constructs/loop.i",15); } - /*@ loop invariant 0 ≤ i ≤ 4; */ + /*@ loop invariant 0 <= i <= 4; */ while (i < 4) { { int j = 0; @@ -87,10 +87,10 @@ void nested_loops(void) __e_acsl_assert(__gen_e_acsl_and_2,1,"Invariant","nested_loops", "0 <= j <= 8","tests/constructs/loop.i",17); } - /*@ loop invariant 0 ≤ j ≤ 8; + /*@ loop invariant 0 <= j <= 8; loop invariant - ∀ ℤ k, ℤ l; - 0 ≤ k < i ∧ 0 ≤ l < j ⇒ t[k][l] ≡ k * l; + \forall integer k, integer l; + 0 <= k < i && 0 <= l < j ==> t[k][l] == k * l; */ while (j < 8) { t[i][j] = i * j; @@ -162,7 +162,7 @@ void unnatural_loop(void) __e_acsl_assert(__gen_e_acsl_and,1,"Invariant","unnatural_loop", "0 <= i <= 6","tests/constructs/loop.i",26); } - /*@ loop invariant 0 ≤ i ≤ 6; */ + /*@ loop invariant 0 <= i <= 6; */ while (i < 10) { if (x == 5) break; x = i; diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c index 39cb8590d19d9d758c879547eb4b5409b448bca5..e3745226b55236a729fcaa91bc83ba42ff409f96 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c @@ -14,8 +14,8 @@ int main(void) /*@ assert x < y; */ ; __e_acsl_assert(x == 0,1,"Precondition","main","x == 0", "tests/constructs/nested_code_annot.i",8); - /*@ requires x ≡ 0; - ensures x ≥ 1; */ + /*@ requires x == 0; + ensures x >= 1; */ if (x) { __e_acsl_assert(0,1,"Assertion","main","\\false", "tests/constructs/nested_code_annot.i",12); @@ -24,16 +24,16 @@ int main(void) else { __e_acsl_assert(x == 0,1,"Precondition","main","x == 0", "tests/constructs/nested_code_annot.i",14); - /*@ requires x ≡ 0; - ensures x ≡ 1; */ + /*@ requires x == 0; + ensures x == 1; */ x ++; __e_acsl_assert(x == 1,1,"Postcondition","main","x == 1", "tests/constructs/nested_code_annot.i",15); if (x) { __e_acsl_assert(x == 1,1,"Precondition","main","x == 1", "tests/constructs/nested_code_annot.i",18); - /*@ requires x ≡ 1; - ensures x ≡ 2; */ + /*@ requires x == 1; + ensures x == 2; */ x ++; __e_acsl_assert(x == 2,1,"Postcondition","main","x == 2", "tests/constructs/nested_code_annot.i",19); diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c index 55615fb2891193cdd323ccc30fcafa30e54f960d..980e7bb293d317b519cdeb0466e3b6e26d2c1fce 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c @@ -4,7 +4,7 @@ #include "stdio.h" extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ ensures \result ≡ (int)(\old(x) - \old(x)); */ +/*@ ensures \result == (int)(\old(x) - \old(x)); */ int __gen_e_acsl_f(int x); int f(int x) @@ -14,8 +14,8 @@ int f(int x) } int Y = 1; -/*@ ensures \result ≡ \old(x); - ensures \result ≡ Y; */ +/*@ ensures \result == \old(x); + ensures \result == Y; */ int __gen_e_acsl_g(int x); int g(int x) @@ -23,7 +23,7 @@ int g(int x) return x; } -/*@ ensures \result ≡ 0; */ +/*@ ensures \result == 0; */ int __gen_e_acsl_h(void); int h(void) @@ -43,7 +43,7 @@ int main(void) return __retres; } -/*@ ensures \result ≡ 0; */ +/*@ ensures \result == 0; */ int __gen_e_acsl_h(void) { int __retres; @@ -53,8 +53,8 @@ int __gen_e_acsl_h(void) return __retres; } -/*@ ensures \result ≡ \old(x); - ensures \result ≡ Y; */ +/*@ ensures \result == \old(x); + ensures \result == Y; */ int __gen_e_acsl_g(int x) { int __gen_e_acsl_at; @@ -68,7 +68,7 @@ int __gen_e_acsl_g(int x) return __retres; } -/*@ ensures \result ≡ (int)(\old(x) - \old(x)); */ +/*@ ensures \result == (int)(\old(x) - \old(x)); */ int __gen_e_acsl_f(int x) { int __gen_e_acsl_at_2; diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c index fad68a23da5c81abb9763db0a88c4540ca598551..f29a275401485c5f21c726c97f361007878ecead 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c @@ -4,18 +4,18 @@ #include "stdio.h" extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ requires 1 % a ≡ 1; - ensures 1 % \old(b) ≡ 1; +/*@ requires 1 % a == 1; + ensures 1 % \old(b) == 1; behavior bhvr: - assumes 1 % c ≡ 1; - requires 1 % d ≡ 1; - requires 1 % f ≡ 1 ∨ 1 % g ≡ 1; - requires 1 % h ≡ 1 ∧ 1 % i ≡ 1; - requires \let var = 1; var % j ≡ 1; - requires ∀ ℤ var; 0 ≤ var < k ⇒ var % k ≡ var; - requires ∃ ℤ var; 0 ≤ var < l ∧ var % l ≡ var; - ensures 1 % \old(e) ≡ 1; + assumes 1 % c == 1; + requires 1 % d == 1; + requires 1 % f == 1 || 1 % g == 1; + requires 1 % h == 1 && 1 % i == 1; + requires \let var = 1; var % j == 1; + requires \forall integer var; 0 <= var < k ==> var % k == var; + requires \exists integer var; 0 <= var < l && var % l == var; + ensures 1 % \old(e) == 1; */ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l); @@ -34,18 +34,18 @@ int main(void) return __retres; } -/*@ requires 1 % a ≡ 1; - ensures 1 % \old(b) ≡ 1; +/*@ requires 1 % a == 1; + ensures 1 % \old(b) == 1; behavior bhvr: - assumes 1 % c ≡ 1; - requires 1 % d ≡ 1; - requires 1 % f ≡ 1 ∨ 1 % g ≡ 1; - requires 1 % h ≡ 1 ∧ 1 % i ≡ 1; - requires \let var = 1; var % j ≡ 1; - requires ∀ ℤ var; 0 ≤ var < k ⇒ var % k ≡ var; - requires ∃ ℤ var; 0 ≤ var < l ∧ var % l ≡ var; - ensures 1 % \old(e) ≡ 1; + assumes 1 % c == 1; + requires 1 % d == 1; + requires 1 % f == 1 || 1 % g == 1; + requires 1 % h == 1 && 1 % i == 1; + requires \let var = 1; var % j == 1; + requires \forall integer var; 0 <= var < k ==> var % k == var; + requires \exists integer var; 0 <= var < l && var % l == var; + ensures 1 % \old(e) == 1; */ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j, int k, int l) diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c index 7fbeb0f748b24a2cb9280a40157a05478229cd85..171e554278b5cbd41866a8327b0e0bc2ec7f2772 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c @@ -13,15 +13,15 @@ int main(void) int z; int x = 0; int y = 2; - /*@ ensures x ≡ 1; */ + /*@ ensures x == 1; */ x = 1; __e_acsl_assert(x == 1,1,"Postcondition","main","x == 1", "tests/constructs/stmt_contract.i",8); { int __gen_e_acsl_and; - /*@ ensures x ≡ 2; - ensures y ≡ 2; - ensures x ≡ 2 ∧ y ≡ 2; */ + /*@ ensures x == 2; + ensures y == 2; + ensures x == 2 && y == 2; */ x = 2; __e_acsl_assert(x == 2,1,"Postcondition","main","x == 2", "tests/constructs/stmt_contract.i",11); @@ -33,14 +33,14 @@ int main(void) } __e_acsl_assert(x == 2,1,"Precondition","main","x == 2", "tests/constructs/stmt_contract.i",17); - /*@ requires x ≡ 2; */ + /*@ requires x == 2; */ x ++; __e_acsl_assert(x == 3,1,"Precondition","main","x == 3", "tests/constructs/stmt_contract.i",20); __e_acsl_assert(y == 2,1,"Precondition","main","y == 2", "tests/constructs/stmt_contract.i",21); - /*@ requires x ≡ 3; - requires y ≡ 2; */ + /*@ requires x == 3; + requires y == 2; */ x += y; { int __gen_e_acsl_assumes_value_2; @@ -69,13 +69,13 @@ int main(void) } } /*@ behavior b1: - requires x ≡ 5; - ensures x ≡ 3; + requires x == 5; + ensures x == 3; behavior b2: - requires x ≡ 3 + y; - requires y ≡ 2; - ensures x ≡ y + 1; + requires x == 3 + y; + requires y == 2; + ensures x == y + 1; */ x = 3; __gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes @@ -120,24 +120,24 @@ int main(void) } } /*@ behavior b1: - assumes x ≡ 1; - requires x ≡ 0; + assumes x == 1; + requires x == 0; behavior b2: - assumes x ≡ 3; - assumes y ≡ 2; - requires x ≡ 3; - requires x + y ≡ 5; + assumes x == 3; + assumes y == 2; + requires x == 3; + requires x + y == 5; */ x += y; __e_acsl_contract_clean(__gen_e_acsl_contract_2); __e_acsl_assert(x == 5,1,"Precondition","main","x == 5", "tests/constructs/stmt_contract.i",43); - /*@ requires x ≡ 5; */ + /*@ requires x == 5; */ { __e_acsl_assert(y == 2,1,"Precondition","main","y == 2", "tests/constructs/stmt_contract.i",44); - /*@ requires y ≡ 2; */ + /*@ requires y == 2; */ x += y; } { @@ -163,16 +163,16 @@ int main(void) } } /*@ requires x > -1000; - ensures z ≥ 0; + ensures z >= 0; assigns x; behavior pos: - assumes x ≥ 0; - ensures z ≡ x; + assumes x >= 0; + ensures z == x; behavior neg: assumes x < 0; - ensures z ≡ -x; + ensures z == -x; complete behaviors neg, pos; disjoint behaviors neg, pos; @@ -198,8 +198,8 @@ int main(void) } __e_acsl_assert(x == 7,1,"Precondition","main","x == 7", "tests/constructs/stmt_contract.i",70); - /*@ requires x ≡ 7; - ensures x ≡ 7; */ + /*@ requires x == 7; + ensures x == 7; */ { __retres = 0; goto return_label; diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c index 45bc00f263118febfab9bc1d789ef7e9e42e4b68..18bfea8fb44a2828e85d1d38331152f04757a447 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c +++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c @@ -11,7 +11,7 @@ int main(void) uint8 x = (unsigned char)0; __e_acsl_assert((int)x == 0,1,"Assertion","main","x == 0", "tests/constructs/typedef.i",9); - /*@ assert x ≡ 0; */ ; + /*@ assert x == 0; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/constructs/oracle/rte.res.oracle b/src/plugins/e-acsl/tests/constructs/oracle/rte.res.oracle index 59a91431c62c3df5798cb861bd233db93ff56dd4..0ee463d309ed522b2c8cb86a27cc254a0e01e2d7 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle/rte.res.oracle +++ b/src/plugins/e-acsl/tests/constructs/oracle/rte.res.oracle @@ -2,12 +2,12 @@ [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/constructs/rte.i:24: Warning: function __gen_e_acsl_test, behavior bhvr: precondition \let var = 1; - var % j ≡ 1 got status unknown. + var % j == 1 got status unknown. [eva:alarm] tests/constructs/rte.i:24: Warning: - function __gen_e_acsl_test, behavior bhvr: precondition ∀ ℤ var; - 0 ≤ var < k ⇒ - var % k ≡ var got status unknown. + function __gen_e_acsl_test, behavior bhvr: precondition \forall integer var; + 0 <= var < k ==> + var % k == var got status unknown. [eva:alarm] tests/constructs/rte.i:24: Warning: - function __gen_e_acsl_test, behavior bhvr: precondition ∃ ℤ var; - 0 ≤ var < l ∧ - var % l ≡ var got status unknown. + function __gen_e_acsl_test, behavior bhvr: precondition \exists integer var; + 0 <= var < l && + var % l == var got status unknown. diff --git a/src/plugins/e-acsl/tests/constructs/oracle_dev/acsl_check.e-acsl.err.log b/src/plugins/e-acsl/tests/constructs/oracle_dev/acsl_check.e-acsl.err.log index af29dee8a4ec16fdff76c6e580985d4da89f2f58..9422fb60d46fc2065990dd8de912a1ea2005c39a 100644 --- a/src/plugins/e-acsl/tests/constructs/oracle_dev/acsl_check.e-acsl.err.log +++ b/src/plugins/e-acsl/tests/constructs/oracle_dev/acsl_check.e-acsl.err.log @@ -1,13 +1,13 @@ tests/constructs/acsl_check.c: In function 'main' -tests/constructs/acsl_check.c:18: Error: Assertion failed: +tests/constructs/acsl_check.c:21: Error: Assertion failed: The failing predicate is: a == 1. tests/constructs/acsl_check.c: In function 'f' -tests/constructs/acsl_check.c:4: Error: Precondition failed: +tests/constructs/acsl_check.c:7: Error: Precondition failed: The failing predicate is: a != 0. tests/constructs/acsl_check.c: In function 'f' -tests/constructs/acsl_check.c:5: Error: Postcondition failed: +tests/constructs/acsl_check.c:8: Error: Postcondition failed: The failing predicate is: \result != 0. SHOULD BE PRINTED IN EXECUTION LOG diff --git a/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c b/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c index 4238666d02ed9e9f3feb384735ea6246bf07c528..17387b9f2f643772a9e37cb22ff0295e951610d3 100644 --- a/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c +++ b/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c @@ -9,13 +9,13 @@ struct list { int value ; }; /*@ -logic ℤ length_aux{L}(struct list *l, ℤ n) = +logic integer length_aux{L}(struct list *l, integer n) = \at(n < 0? -1: - (l ≡ (struct list *)0? n: + (l == (struct list *)0? n: (n < 2147483647? length_aux(l->next, n + 1): -1)), L); */ -/*@ logic ℤ length{L}(struct list *l) = \at(length_aux(l, 0),L); +/*@ logic integer length{L}(struct list *l) = \at(length_aux(l, 0),L); */ int main(void) @@ -35,7 +35,7 @@ int main(void) struct list *l = & node1; __e_acsl_store_block((void *)(& l),(size_t)8); __e_acsl_full_init((void *)(& l)); - /*@ assert length(l) ≡ 3; */ ; + /*@ assert length(l) == 3; */ ; __retres = 0; __e_acsl_delete_block((void *)(& l)); __e_acsl_delete_block((void *)(& node3)); diff --git a/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c b/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c index fa774f67e47d3a677ccb4e12762e46154c3d41a3..d7ae94bb80318e027bd6d8bb338c73990061557b 100644 --- a/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c +++ b/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c @@ -5,15 +5,15 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; int A[10]; -/*@ requires ∀ ℤ i; 0 ≤ i < 9 ⇒ A[i] ≤ A[i + 1]; +/*@ requires \forall integer i; 0 <= i < 9 ==> A[i] <= A[i + 1]; behavior exists: - assumes ∃ ℤ j; 0 ≤ j < 10 ∧ A[j] ≡ elt; - ensures \result ≡ 1; + assumes \exists integer j; 0 <= j < 10 && A[j] == elt; + ensures \result == 1; behavior not_exists: - assumes ∀ ℤ j; 0 ≤ j < 10 ⇒ A[j] ≢ elt; - ensures \result ≡ 0; + assumes \forall integer j; 0 <= j < 10 ==> A[j] != elt; + ensures \result == 0; */ int __gen_e_acsl_search(int elt); @@ -51,8 +51,8 @@ int search(int elt) __e_acsl_assert(__gen_e_acsl_and,1,"Invariant","search","0 <= k <= 10", "tests/examples/linear_search.i",17); } - /*@ loop invariant 0 ≤ k ≤ 10; - loop invariant ∀ ℤ i; 0 ≤ i < k ⇒ A[i] < elt; + /*@ loop invariant 0 <= k <= 10; + loop invariant \forall integer i; 0 <= i < k ==> A[i] < elt; */ while (k < 10) { if (A[k] == elt) { @@ -113,24 +113,24 @@ int main(void) found = __gen_e_acsl_search(36); __e_acsl_assert(found == 1,1,"Assertion","main","found == 1", "tests/examples/linear_search.i",34); - /*@ assert found ≡ 1; */ ; + /*@ assert found == 1; */ ; found = __gen_e_acsl_search(5); __e_acsl_assert(found == 0,1,"Assertion","main","found == 0", "tests/examples/linear_search.i",37); - /*@ assert found ≡ 0; */ ; + /*@ assert found == 0; */ ; __retres = 0; return __retres; } -/*@ requires ∀ ℤ i; 0 ≤ i < 9 ⇒ A[i] ≤ A[i + 1]; +/*@ requires \forall integer i; 0 <= i < 9 ==> A[i] <= A[i + 1]; behavior exists: - assumes ∃ ℤ j; 0 ≤ j < 10 ∧ A[j] ≡ elt; - ensures \result ≡ 1; + assumes \exists integer j; 0 <= j < 10 && A[j] == elt; + ensures \result == 1; behavior not_exists: - assumes ∀ ℤ j; 0 ≤ j < 10 ⇒ A[j] ≢ elt; - ensures \result ≡ 0; + assumes \forall integer j; 0 <= j < 10 ==> A[j] != elt; + ensures \result == 0; */ int __gen_e_acsl_search(int elt) { diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c index 09a3554adf54d4a676e021dc16c0d7fb3e087768..4b3beda2ecd1fc95674bc46c9e8b25e9657c6437 100644 --- a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c +++ b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c @@ -43,57 +43,55 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ ensures result_null_or_valid_fd: - \result ≡ \null ∨ \subset(\result, &__fc_fopen[0 .. 16 - 1]); + \result == \null || \subset(\result, &__fc_fopen[0 .. 16 - 1]); assigns \result; assigns \result \from __fc_p_fopen; */ FILE *__gen_e_acsl_tmpfile(void); /*@ requires valid_stream: \valid(stream); - ensures result_zero_or_EOF: \result ≡ 0 ∨ \result ≡ -1; + ensures result_zero_or_EOF: \result == 0 || \result == -1; assigns \result; assigns \result \from (indirect: stream), (indirect: *stream); */ int __gen_e_acsl_fclose(FILE *stream); -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; */ void __gen_e_acsl_exit(int status); -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options); /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ pid_t __gen_e_acsl_fork(void); /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -115,22 +113,22 @@ pid_t __gen_e_acsl_fork(void) } } -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) @@ -189,7 +187,7 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) } } -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; @@ -203,7 +201,7 @@ void __gen_e_acsl_exit(int status) } /*@ requires valid_stream: \valid(stream); - ensures result_zero_or_EOF: \result ≡ 0 ∨ \result ≡ -1; + ensures result_zero_or_EOF: \result == 0 || \result == -1; assigns \result; assigns \result \from (indirect: stream), (indirect: *stream); */ @@ -234,7 +232,7 @@ int __gen_e_acsl_fclose(FILE *stream) /*@ ensures result_null_or_valid_fd: - \result ≡ \null ∨ \subset(\result, &__fc_fopen[0 .. 16 - 1]); + \result == \null || \subset(\result, &__fc_fopen[0 .. 16 - 1]); assigns \result; assigns \result \from __fc_p_fopen; */ diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c index a4f24c803d736d1fbbdf9803ba71b612cb937a6a..a89af5d5c7e8c3115a967db7ba9efb953a4e35d4 100644 --- a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c +++ b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c @@ -470,50 +470,49 @@ char *__gen_e_acsl_literal_string_34; char *__gen_e_acsl_literal_string_441; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ exits status: \exit_status ≢ 0; +/*@ exits status: \exit_status != 0; ensures never_terminates: \false; assigns \exit_status \from \nothing; */ void __gen_e_acsl_abort(void); -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; */ void __gen_e_acsl_exit(int status); -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options); /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ pid_t __gen_e_acsl_fork(void); /*@ requires valid_string_s: valid_read_string(s); - ensures acsl_c_equiv: \result ≡ strlen(\old(s)); + ensures acsl_c_equiv: \result == strlen(\old(s)); assigns \result; assigns \result \from (indirect: *(s + (0 ..))); */ @@ -525,24 +524,24 @@ size_t __gen_e_acsl_strlen(char const *s); \from s, (indirect: *(s + (0 .. strlen{Old}(s)))), (indirect: c); behavior found: - assumes char_found: strchr(s, c) ≡ \true; - ensures result_char: *\result ≡ (char)\old(c); - ensures result_same_base: \base_addr(\result) ≡ \base_addr(\old(s)); + assumes char_found: strchr(s, c) == \true; + ensures result_char: *\result == (char)\old(c); + ensures result_same_base: \base_addr(\result) == \base_addr(\old(s)); ensures - result_in_length: \old(s) ≤ \result ≤ \old(s) + strlen(\old(s)); + result_in_length: \old(s) <= \result <= \old(s) + strlen(\old(s)); ensures result_valid_string: valid_read_string(\result); ensures result_first_occur: - ∀ char *p; \old(s) ≤ p < \result ⇒ *p ≢ (char)\old(c); + \forall char *p; \old(s) <= p < \result ==> *p != (char)\old(c); behavior not_found: - assumes char_not_found: ¬(strchr(s, c) ≡ \true); - ensures result_null: \result ≡ \null; + assumes char_not_found: !(strchr(s, c) == \true); + ensures result_null: \result == \null; behavior default: ensures result_null_or_same_base: - \result ≡ \null ∨ \base_addr(\result) ≡ \base_addr(\old(s)); + \result == \null || \base_addr(\result) == \base_addr(\old(s)); */ char *__gen_e_acsl_strchr(char const *s, int c); @@ -551,8 +550,8 @@ char *__gen_e_acsl_strchr(char const *s, int c); requires separation: \separated(dest + (0 .. strlen(src)), src + (0 .. strlen(src))); - ensures equal_contents: strcmp(\old(dest), \old(src)) ≡ 0; - ensures result_ptr: \result ≡ \old(dest); + ensures equal_contents: strcmp(\old(dest), \old(src)) == 0; + ensures result_ptr: \result == \old(dest); assigns *(dest + (0 .. strlen{Old}(src))), \result; assigns *(dest + (0 .. strlen{Old}(src))) \from *(src + (0 .. strlen{Old}(src))); @@ -637,7 +636,7 @@ void test_specifier_application(char const *allowed, char const *fmt, } /*@ assert - alloca_bounds: 0 < sizeof(char) * (int)(len + 1) ≤ 18446744073709551615; + alloca_bounds: 0 < sizeof(char) * (int)(len + 1) <= 18446744073709551615; */ ; __lengthof_format = (unsigned long)(len + 1); @@ -713,8 +712,8 @@ void test_specifier_application(char const *allowed, char const *fmt, requires separation: \separated(dest + (0 .. strlen(src)), src + (0 .. strlen(src))); - ensures equal_contents: strcmp(\old(dest), \old(src)) ≡ 0; - ensures result_ptr: \result ≡ \old(dest); + ensures equal_contents: strcmp(\old(dest), \old(src)) == 0; + ensures result_ptr: \result == \old(dest); assigns *(dest + (0 .. strlen{Old}(src))), \result; assigns *(dest + (0 .. strlen{Old}(src))) \from *(src + (0 .. strlen{Old}(src))); @@ -771,24 +770,24 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src) \from s, (indirect: *(s + (0 .. strlen{Old}(s)))), (indirect: c); behavior found: - assumes char_found: strchr(s, c) ≡ \true; - ensures result_char: *\result ≡ (char)\old(c); - ensures result_same_base: \base_addr(\result) ≡ \base_addr(\old(s)); + assumes char_found: strchr(s, c) == \true; + ensures result_char: *\result == (char)\old(c); + ensures result_same_base: \base_addr(\result) == \base_addr(\old(s)); ensures - result_in_length: \old(s) ≤ \result ≤ \old(s) + strlen(\old(s)); + result_in_length: \old(s) <= \result <= \old(s) + strlen(\old(s)); ensures result_valid_string: valid_read_string(\result); ensures result_first_occur: - ∀ char *p; \old(s) ≤ p < \result ⇒ *p ≢ (char)\old(c); + \forall char *p; \old(s) <= p < \result ==> *p != (char)\old(c); behavior not_found: - assumes char_not_found: ¬(strchr(s, c) ≡ \true); - ensures result_null: \result ≡ \null; + assumes char_not_found: !(strchr(s, c) == \true); + ensures result_null: \result == \null; behavior default: ensures result_null_or_same_base: - \result ≡ \null ∨ \base_addr(\result) ≡ \base_addr(\old(s)); + \result == \null || \base_addr(\result) == \base_addr(\old(s)); */ char *__gen_e_acsl_strchr(char const *s, int c) { @@ -871,7 +870,7 @@ char *__gen_e_acsl_strchr(char const *s, int c) } /*@ requires valid_string_s: valid_read_string(s); - ensures acsl_c_equiv: \result ≡ strlen(\old(s)); + ensures acsl_c_equiv: \result == strlen(\old(s)); assigns \result; assigns \result \from (indirect: *(s + (0 ..))); */ @@ -885,8 +884,7 @@ size_t __gen_e_acsl_strlen(char const *s) } /*@ ensures - result_ok_child_or_error: - \result ≡ 0 ∨ \result > 0 ∨ \result ≡ -1; + result_ok_child_or_error: \result == 0 || \result > 0 || \result == -1; assigns \result; assigns \result \from \nothing; */ @@ -908,22 +906,22 @@ pid_t __gen_e_acsl_fork(void) } } -/*@ ensures result_ok_or_error: \result ≡ -1 ∨ \result ≥ 0; +/*@ ensures result_ok_or_error: \result == -1 || \result >= 0; ensures initialization: stat_loc_init_on_success: - \result ≥ 0 ∧ \old(stat_loc) ≢ \null ⇒ + \result >= 0 && \old(stat_loc) != \null ==> \initialized(\old(stat_loc)); assigns \result, *stat_loc; assigns \result \from (indirect: options); assigns *stat_loc \from (indirect: options); behavior stat_loc_null: - assumes stat_loc_null: stat_loc ≡ \null; + assumes stat_loc_null: stat_loc == \null; assigns \result; assigns \result \from \nothing; behavior stat_loc_non_null: - assumes stat_loc_non_null: stat_loc ≢ \null; + assumes stat_loc_non_null: stat_loc != \null; requires valid_stat_loc: \valid(stat_loc); */ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) @@ -982,7 +980,7 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options) } } -/*@ exits status: \exit_status ≡ \old(status); +/*@ exits status: \exit_status == \old(status); ensures never_terminates: \false; assigns \exit_status \from status; @@ -995,7 +993,7 @@ void __gen_e_acsl_exit(int status) return; } -/*@ exits status: \exit_status ≢ 0; +/*@ exits status: \exit_status != 0; ensures never_terminates: \false; assigns \exit_status \from \nothing; diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c b/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c index 503129bceba33b627a22a9386a48a758b218b2bb..e0415c60f14dd35c55d4009b86bf84ce1860b2b7 100644 --- a/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c +++ b/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c @@ -38,7 +38,7 @@ int main(void) "!\\initialized(&buf[0 .. 3])", "tests/format/sprintf.c",10); } - /*@ assert ¬\initialized(&buf[0 .. 3]); */ ; + /*@ assert !\initialized(&buf[0 .. 3]); */ ; __e_acsl_builtin_sprintf("d",buf,__gen_e_acsl_literal_string,10); { int __gen_e_acsl_size_2; @@ -61,7 +61,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_3,1,"Assertion","main", "!\\initialized(&buf[3])","tests/format/sprintf.c",14); } - /*@ assert ¬\initialized(&buf[3]); */ ; + /*@ assert !\initialized(&buf[3]); */ ; __e_acsl_delete_block((void *)(buf)); } { @@ -81,7 +81,7 @@ int main(void) "!\\initialized(&buf_0[0 .. 3])", "tests/format/sprintf.c",18); } - /*@ assert ¬\initialized(&buf_0[0 .. 3]); */ ; + /*@ assert !\initialized(&buf_0[0 .. 3]); */ ; __e_acsl_builtin_snprintf("d",buf_0,(unsigned long)2, __gen_e_acsl_literal_string,10); { @@ -107,7 +107,7 @@ int main(void) "!\\initialized(&buf_0[2])","tests/format/sprintf.c", 22); } - /*@ assert ¬\initialized(&buf_0[2]); */ ; + /*@ assert !\initialized(&buf_0[2]); */ ; { int __gen_e_acsl_initialized_7; __gen_e_acsl_initialized_7 = __e_acsl_initialized((void *)(& buf_0[3]), @@ -116,7 +116,7 @@ int main(void) "!\\initialized(&buf_0[3])","tests/format/sprintf.c", 23); } - /*@ assert ¬\initialized(&buf_0[3]); */ ; + /*@ assert !\initialized(&buf_0[3]); */ ; __e_acsl_delete_block((void *)(buf_0)); } { @@ -136,7 +136,7 @@ int main(void) "!\\initialized(&buf_1[0 .. 3])", "tests/format/sprintf.c",27); } - /*@ assert ¬\initialized(&buf_1[0 .. 3]); */ ; + /*@ assert !\initialized(&buf_1[0 .. 3]); */ ; __e_acsl_builtin_snprintf("d",buf_1,(unsigned long)4, __gen_e_acsl_literal_string,10); { @@ -162,7 +162,7 @@ int main(void) "!\\initialized(&buf_1[3])","tests/format/sprintf.c", 31); } - /*@ assert ¬\initialized(&buf_1[3]); */ ; + /*@ assert !\initialized(&buf_1[3]); */ ; __e_acsl_delete_block((void *)(buf_1)); } __retres = 0; diff --git a/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle b/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle index b09140dee729c28a7f1f65cee93f96e57c0e5fdc..1eda328e1279afe93eac4ed28ee584b9faaa775e 100644 --- a/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle +++ b/src/plugins/e-acsl/tests/format/oracle/printf.res.oracle @@ -24,7 +24,7 @@ E-ACSL construct `non integer variable p in quantification result_first_occur: - ∀ char *p; \old(s) ≤ p < \result ⇒ *p ≢ (char)\old(c)' + \forall char *p; \old(s) <= p < \result ==> *p != (char)\old(c)' is not yet supported. Ignoring annotation. [e-acsl] FRAMAC_SHARE/libc/__fc_string_axiomatic.h:281: Warning: @@ -86,7 +86,7 @@ E-ACSL construct `non integer variable p in quantification found: result_first_occur: - ∀ char *p; \old(s) ≤ p < \result ⇒ *p ≢ (char)\old(c)' + \forall char *p; \old(s) <= p < \result ==> *p != (char)\old(c)' is not yet supported. Ignoring annotation. [e-acsl] FRAMAC_SHARE/libc/string.h:141: Warning: diff --git a/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c index a27503d98f33e0ad1f9e31e6b310db1832d552b0..04d045d04d52f6071a4973f8aca3fd8d864a7892 100644 --- a/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c +++ b/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c @@ -60,7 +60,7 @@ int main(void) f(); __e_acsl_assert(& x == & x,1,"Assertion","main","&x == &x", "tests/full-mtracking/addrOf.i",16); - /*@ assert &x ≡ &x; */ ; + /*@ assert &x == &x; */ ; __e_acsl_full_init((void *)(& __retres)); __retres = 0; __e_acsl_delete_block((void *)(& x)); diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c index 8c713255a9883ae0820182f496162daa1a888346..2b2eaa2a834f5173996f5455b8ada1dfa5c08e63 100644 --- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c +++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c @@ -27,7 +27,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_neg); __gmpz_clear(__gen_e_acsl_x); } - /*@ assert -3 ≡ x; */ ; + /*@ assert -3 == x; */ ; { __e_acsl_mpz_t __gen_e_acsl_x_2; __e_acsl_mpz_t __gen_e_acsl__2; @@ -46,7 +46,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__2); __gmpz_clear(__gen_e_acsl_neg_2); } - /*@ assert x ≡ -3; */ ; + /*@ assert x == -3; */ ; { __e_acsl_mpz_t __gen_e_acsl__3; __e_acsl_mpz_t __gen_e_acsl_bnot; @@ -62,7 +62,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__3); __gmpz_clear(__gen_e_acsl_bnot); } - /*@ assert 0 ≢ ~0; */ ; + /*@ assert 0 != ~0; */ ; { __e_acsl_mpz_t __gen_e_acsl_x_3; __e_acsl_mpz_t __gen_e_acsl__4; @@ -90,7 +90,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__5); __gmpz_clear(__gen_e_acsl_neg_3); } - /*@ assert x + 1 ≡ -2; */ ; + /*@ assert x + 1 == -2; */ ; { __e_acsl_mpz_t __gen_e_acsl_x_4; __e_acsl_mpz_t __gen_e_acsl__6; @@ -118,7 +118,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__7); __gmpz_clear(__gen_e_acsl_neg_4); } - /*@ assert x - 1 ≡ -4; */ ; + /*@ assert x - 1 == -4; */ ; { __e_acsl_mpz_t __gen_e_acsl_x_5; __e_acsl_mpz_t __gen_e_acsl__8; @@ -146,7 +146,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__9); __gmpz_clear(__gen_e_acsl_neg_5); } - /*@ assert x * 3 ≡ -9; */ ; + /*@ assert x * 3 == -9; */ ; { __e_acsl_mpz_t __gen_e_acsl_x_6; __e_acsl_mpz_t __gen_e_acsl__10; @@ -162,7 +162,7 @@ int main(void) __gen_e_acsl_div_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__10), (__e_acsl_mpz_struct const *)(__gen_e_acsl__11)); __gmpz_init(__gen_e_acsl_div); - /*@ assert E_ACSL: 3 ≢ 0; */ + /*@ assert E_ACSL: 3 != 0; */ __e_acsl_assert(__gen_e_acsl_div_guard != 0,1,"Assertion","main", "3 != 0","tests/gmp-only/arith.i",17); __gmpz_tdiv_q(__gen_e_acsl_div, @@ -183,7 +183,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__12); __gmpz_clear(__gen_e_acsl_neg_6); } - /*@ assert x / 3 ≡ -1; */ ; + /*@ assert x / 3 == -1; */ ; { __e_acsl_mpz_t __gen_e_acsl__13; __e_acsl_mpz_t __gen_e_acsl__14; @@ -196,7 +196,7 @@ int main(void) __gen_e_acsl_div_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__13), (__e_acsl_mpz_struct const *)(__gen_e_acsl__14)); __gmpz_init(__gen_e_acsl_div_2); - /*@ assert E_ACSL: 0xffffffffffffffffffffff ≢ 0; */ + /*@ assert E_ACSL: 0xffffffffffffffffffffff != 0; */ __e_acsl_assert(__gen_e_acsl_div_guard_2 != 0,1,"Assertion","main", "0xffffffffffffffffffffff != 0","tests/gmp-only/arith.i", 18); @@ -214,7 +214,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_div_2); __gmpz_clear(__gen_e_acsl__15); } - /*@ assert 0xffffffffffffffffffffff / 0xffffffffffffffffffffff ≡ 1; */ ; + /*@ assert 0xffffffffffffffffffffff / 0xffffffffffffffffffffff == 1; */ ; { __e_acsl_mpz_t __gen_e_acsl_x_7; __e_acsl_mpz_t __gen_e_acsl__16; @@ -230,7 +230,7 @@ int main(void) __gen_e_acsl_mod_guard = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl__16), (__e_acsl_mpz_struct const *)(__gen_e_acsl__17)); __gmpz_init(__gen_e_acsl_mod); - /*@ assert E_ACSL: 2 ≢ 0; */ + /*@ assert E_ACSL: 2 != 0; */ __e_acsl_assert(__gen_e_acsl_mod_guard != 0,1,"Assertion","main", "2 != 0","tests/gmp-only/arith.i",19); __gmpz_tdiv_r(__gen_e_acsl_mod, @@ -251,7 +251,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__18); __gmpz_clear(__gen_e_acsl_neg_7); } - /*@ assert x % 2 ≡ -1; */ ; + /*@ assert x % 2 == -1; */ ; { __e_acsl_mpz_t __gen_e_acsl__19; __e_acsl_mpz_t __gen_e_acsl_neg_8; @@ -275,7 +275,7 @@ int main(void) __gen_e_acsl_mod_guard_2 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_9), (__e_acsl_mpz_struct const *)(__gen_e_acsl__21)); __gmpz_init(__gen_e_acsl_mod_2); - /*@ assert E_ACSL: -2 ≢ 0; */ + /*@ assert E_ACSL: -2 != 0; */ __e_acsl_assert(__gen_e_acsl_mod_guard_2 != 0,1,"Assertion","main", "-2 != 0","tests/gmp-only/arith.i",20); __gmpz_tdiv_r(__gen_e_acsl_mod_2, @@ -298,7 +298,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__22); __gmpz_clear(__gen_e_acsl_neg_10); } - /*@ assert -3 % -2 ≡ -1; */ ; + /*@ assert -3 % -2 == -1; */ ; { __e_acsl_mpz_t __gen_e_acsl__23; __e_acsl_mpz_t __gen_e_acsl__24; @@ -317,7 +317,7 @@ int main(void) __gen_e_acsl_mod_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_neg_11), (__e_acsl_mpz_struct const *)(__gen_e_acsl__25)); __gmpz_init(__gen_e_acsl_mod_3); - /*@ assert E_ACSL: -2 ≢ 0; */ + /*@ assert E_ACSL: -2 != 0; */ __e_acsl_assert(__gen_e_acsl_mod_guard_3 != 0,1,"Assertion","main", "-2 != 0","tests/gmp-only/arith.i",21); __gmpz_tdiv_r(__gen_e_acsl_mod_3, @@ -335,7 +335,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_mod_3); __gmpz_clear(__gen_e_acsl__26); } - /*@ assert 3 % -2 ≡ 1; */ ; + /*@ assert 3 % -2 == 1; */ ; { __e_acsl_mpz_t __gen_e_acsl_x_8; __e_acsl_mpz_t __gen_e_acsl__27; @@ -403,7 +403,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__30); __gmpz_clear(__gen_e_acsl_neg_12); } - /*@ assert ((x * 2 + (3 + y)) - 4) + (x - y) ≡ -10; */ ; + /*@ assert ((x * 2 + (3 + y)) - 4) + (x - y) == -10; */ ; { __e_acsl_mpz_t __gen_e_acsl__31; __e_acsl_mpz_t __gen_e_acsl__32; @@ -435,7 +435,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__34); __gmpz_clear(__gen_e_acsl__35); } - /*@ assert (0 ≡ 1) ≡ !(0 ≡ 0); */ ; + /*@ assert (0 == 1) == !(0 == 0); */ ; { __e_acsl_mpz_t __gen_e_acsl__36; __e_acsl_mpz_t __gen_e_acsl__37; @@ -466,7 +466,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__38); __gmpz_clear(__gen_e_acsl__39); } - /*@ assert (0 ≤ -1) ≡ (0 > 0); */ ; + /*@ assert (0 <= -1) == (0 > 0); */ ; { __e_acsl_mpz_t __gen_e_acsl__40; __e_acsl_mpz_t __gen_e_acsl__41; @@ -497,7 +497,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__42); __gmpz_clear(__gen_e_acsl__43); } - /*@ assert (0 ≥ -1) ≡ (0 ≤ 0); */ ; + /*@ assert (0 >= -1) == (0 <= 0); */ ; { __e_acsl_mpz_t __gen_e_acsl__44; __e_acsl_mpz_t __gen_e_acsl__45; @@ -529,7 +529,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__47); __gmpz_clear(__gen_e_acsl__48); } - /*@ assert (0 ≢ 1) ≡ !(0 ≢ 0); */ ; + /*@ assert (0 != 1) == !(0 != 0); */ ; { __e_acsl_mpz_t __gen_e_acsl__49; int __gen_e_acsl_ne_4; @@ -561,7 +561,7 @@ int main(void) __gmpz_clear(__gen_e_acsl__52); __gmpz_clear(__gen_e_acsl__53); } - /*@ assert (0 ≢ 0) ≡ !(1 ≢ 0); */ ; + /*@ assert (0 != 0) == !(1 != 0); */ ; { __e_acsl_mpz_t __gen_e_acsl__54; __e_acsl_mpz_t __gen_e_acsl_y_2; @@ -576,7 +576,7 @@ int main(void) __gen_e_acsl_div_guard_3 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_y_2), (__e_acsl_mpz_struct const *)(__gen_e_acsl__55)); __gmpz_init(__gen_e_acsl_div_3); - /*@ assert E_ACSL: y ≢ 0; */ + /*@ assert E_ACSL: y != 0; */ __e_acsl_assert(__gen_e_acsl_div_guard_3 != 0,1,"Assertion","main", "y != 0","tests/gmp-only/arith.i",31); __gmpz_tdiv_q(__gen_e_acsl_div_3, @@ -593,7 +593,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_div_3); __gmpz_clear(__gen_e_acsl__56); } - /*@ assert 4 / y ≡ 2; */ ; + /*@ assert 4 / y == 2; */ ; { __e_acsl_mpz_t __gen_e_acsl__57; __e_acsl_mpz_t __gen_e_acsl_z; @@ -622,7 +622,7 @@ int main(void) __gen_e_acsl_div_guard_4 = __gmpz_cmp((__e_acsl_mpz_struct const *)(__gen_e_acsl_sub_4), (__e_acsl_mpz_struct const *)(__gen_e_acsl__59)); __gmpz_init(__gen_e_acsl_div_4); - /*@ assert E_ACSL: y - 123456789123456789 ≢ 0; */ + /*@ assert E_ACSL: y - 123456789123456789 != 0; */ __e_acsl_assert(__gen_e_acsl_div_guard_4 != 0,1,"Assertion","main", "y - 123456789123456789 != 0","tests/gmp-only/arith.i", 34); @@ -648,7 +648,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_div_4); __gmpz_clear(__gen_e_acsl_add_6); } - /*@ assert 1 + (z + 1) / (y - 123456789123456789) ≡ 1; */ ; + /*@ assert 1 + (z + 1) / (y - 123456789123456789) == 1; */ ; { __e_acsl_mpz_t __gen_e_acsl__60; __e_acsl_mpz_t __gen_e_acsl_x_9; @@ -679,7 +679,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_neg_15); __gmpz_clear(__gen_e_acsl_add_7); } - /*@ assert 1 - x ≡ -x + 1; */ ; + /*@ assert 1 - x == -x + 1; */ ; short a = (short)1; short b = (short)1; { diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c index 444c63fc9a928aa135f48d71e25621ee7f88e498..21629f30c8e704b9c2818dd337ebb69ce1bbb932 100644 --- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c +++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c @@ -65,7 +65,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator); __gmpz_clear(__gen_e_acsl__4); } - /*@ assert \sum(2, 10, \lambda ℤ k; 2 * k) ≡ 108; */ ; + /*@ assert \sum(2, 10, \lambda integer k; 2 * k) == 108; */ ; { __e_acsl_mpz_t __gen_e_acsl__5; __e_acsl_mpz_t __gen_e_acsl__6; @@ -115,7 +115,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_lambda_2); __gmpz_clear(__gen_e_acsl_accumulator_2); } - /*@ assert \sum(1, 10, \lambda ℤ k; 1) ≡ 10; */ ; + /*@ assert \sum(1, 10, \lambda integer k; 1) == 10; */ ; { __e_acsl_mpz_t __gen_e_acsl__8; __e_acsl_mpz_t __gen_e_acsl__9; @@ -196,7 +196,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator_3); __gmpz_clear(__gen_e_acsl__14); } - /*@ assert \numof(2, 10, \lambda ℤ k; k - 2 ≥ 0) ≡ 9; */ ; + /*@ assert \numof(2, 10, \lambda integer k; k - 2 >= 0) == 9; */ ; { __e_acsl_mpz_t __gen_e_acsl__15; __e_acsl_mpz_t __gen_e_acsl__16; @@ -244,7 +244,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator_4); __gmpz_clear(__gen_e_acsl__17); } - /*@ assert \product(1, 10, \lambda ℤ k; k) ≡ 3628800; */ ; + /*@ assert \product(1, 10, \lambda integer k; k) == 3628800; */ ; { __e_acsl_mpz_t __gen_e_acsl__18; __e_acsl_mpz_t __gen_e_acsl_neg; @@ -294,7 +294,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_accumulator_5); __gmpz_clear(__gen_e_acsl__19); } - /*@ assert \product(-10, 10, \lambda ℤ k; k) ≡ 0; */ ; + /*@ assert \product(-10, 10, \lambda integer k; k) == 0; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c index a0dfc7325996cf9771b3fa9ef58887faca913c90..f428661ce537799605665f11e063f1b980d4a830 100644 --- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c +++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c @@ -13,14 +13,14 @@ typedef struct mystruct mystruct; */ int __gen_e_acsl_p1(int x, int y); -/*@ predicate p2(ℤ x, ℤ y) = x + y > 0; +/*@ predicate p2(integer x, integer y) = x + y > 0; */ int __gen_e_acsl_p2(int x, int y); int __gen_e_acsl_p2_3(int x, __e_acsl_mpz_struct * y); -/*@ logic ℤ f1(ℤ x, ℤ y) = x + y; +/*@ logic integer f1(integer x, integer y) = x + y; */ void __gen_e_acsl_f1(__e_acsl_mpz_t *__retres_arg, int x, int y); @@ -51,11 +51,11 @@ int __gen_e_acsl_g(int x); */ mystruct __gen_e_acsl_t1(mystruct m); -/*@ logic ℤ t2(mystruct m) = m.k + m.l; +/*@ logic integer t2(mystruct m) = m.k + m.l; */ void __gen_e_acsl_t2(__e_acsl_mpz_t *__retres_arg, mystruct m); -/*@ predicate k_pred(ℤ x) = x > 0; +/*@ predicate k_pred(integer x) = x > 0; */ int __gen_e_acsl_k_pred(int x); @@ -69,15 +69,15 @@ void k(int x) } int glob = 5; -/*@ predicate never_called(int x) = x ≡ x; +/*@ predicate never_called(int x) = x == x; */ /*@ logic double f2(double x) = (double)(1 / x); */ double __gen_e_acsl_f2(double x); -/*@ predicate p_notyet{L}(ℤ x) = x > 0; +/*@ predicate p_notyet{L}(integer x) = x > 0; */ -/*@ logic ℤ f_notyet{L}(ℤ x) = x; +/*@ logic integer f_notyet{L}(integer x) = x; */ int main(void) @@ -125,7 +125,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_f1_2); __gmpz_clear(__gen_e_acsl__5); } - /*@ assert f1(x, y) ≡ 3; */ ; + /*@ assert f1(x, y) == 3; */ ; { __e_acsl_mpz_t __gen_e_acsl_f1_4; int __gen_e_acsl_p2_6; @@ -181,7 +181,7 @@ int main(void) } /*@ assert - f1(99999999999999999999999999999, 99999999999999999999999999999) ≡ + f1(99999999999999999999999999999, 99999999999999999999999999999) == 199999999999999999999999999998; */ ; { @@ -199,7 +199,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_app); __gmpz_clear(__gen_e_acsl_x_6); } - /*@ assert g(x) ≡ x; */ ; + /*@ assert g(x) == x; */ ; char c = (char)'c'; { int __gen_e_acsl_h_char_2; @@ -216,7 +216,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_app_2); __gmpz_clear(__gen_e_acsl_c); } - /*@ assert h_char(c) ≡ c; */ ; + /*@ assert h_char(c) == c; */ ; short s = (short)1; { int __gen_e_acsl_h_short_2; @@ -233,7 +233,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_app_3); __gmpz_clear(__gen_e_acsl_s); } - /*@ assert h_short(s) ≡ s; */ ; + /*@ assert h_short(s) == s; */ ; m.k = 8; m.l = 9; { @@ -251,7 +251,7 @@ int main(void) __gmpz_clear(__gen_e_acsl_t2_2); __gmpz_clear(__gen_e_acsl__12); } - /*@ assert t2(t1(m)) ≡ 17; */ ; + /*@ assert t2(t1(m)) == 17; */ ; __gen_e_acsl_k(9); double d = 2.0; { diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c index c6b6e713f91cc277f590cb2e9f77e9adaef878f7..828a8f755c01f58a5de4f448722cb09c7f692b94 100644 --- a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c +++ b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c @@ -9,7 +9,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; requires valid_mode: valid_read_string(mode); ensures result_null_or_valid_fd: - \result ≡ \null ∨ \subset(\result, &__fc_fopen[0 .. 16 - 1]); + \result == \null || \subset(\result, &__fc_fopen[0 .. 16 - 1]); assigns \result; assigns \result \from (indirect: *(filename + (0 .. strlen{Old}(filename)))), @@ -20,7 +20,7 @@ FILE *__gen_e_acsl_fopen(char const * restrict filename, /*@ requires valid_ptr_block: \valid((char *)ptr + (0 .. nmemb * size - 1)); requires valid_stream: \valid(stream); - ensures size_read: \result ≤ \old(nmemb); + ensures size_read: \result <= \old(nmemb); ensures initialization: \initialized((char *)\old(ptr) + (0 .. \result * \old(size) - 1)); @@ -36,7 +36,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb, /*@ requires valid_ptr_block: \valid((char *)ptr + (0 .. nmemb * size - 1)); requires valid_stream: \valid(stream); - ensures size_read: \result ≤ \old(nmemb); + ensures size_read: \result <= \old(nmemb); ensures initialization: \initialized((char *)\old(ptr) + (0 .. \result * \old(size) - 1)); @@ -274,7 +274,7 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb, requires valid_mode: valid_read_string(mode); ensures result_null_or_valid_fd: - \result ≡ \null ∨ \subset(\result, &__fc_fopen[0 .. 16 - 1]); + \result == \null || \subset(\result, &__fc_fopen[0 .. 16 - 1]); assigns \result; assigns \result \from (indirect: *(filename + (0 .. strlen{Old}(filename)))), @@ -333,7 +333,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized,1,"Assertion","main", "!\\initialized((int *)buf)","tests/libc/file.c",13); } - /*@ assert ¬\initialized((int *)buf); */ ; + /*@ assert !\initialized((int *)buf); */ ; if (res == 0) { { int __gen_e_acsl_initialized_2; @@ -342,7 +342,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_2,1,"Assertion","main", "!\\initialized(&buf[1])","tests/libc/file.c",15); } - /*@ assert ¬\initialized(&buf[1]); */ ; + /*@ assert !\initialized(&buf[1]); */ ; } if (res >= 1) { { @@ -391,7 +391,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_7,1,"Assertion","main", "!\\initialized(&buf[5])","tests/libc/file.c",29); } - /*@ assert ¬\initialized(&buf[5]); */ ; + /*@ assert !\initialized(&buf[5]); */ ; __gen_e_acsl_fread((void *)(& buf2[1]),sizeof(int),(unsigned long)4,f); { int __gen_e_acsl_initialized_8; @@ -400,7 +400,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_8,1,"Assertion","main", "!\\initialized((int *)buf2)","tests/libc/file.c",36); } - /*@ assert ¬\initialized((int *)buf2); */ ; + /*@ assert !\initialized((int *)buf2); */ ; { int __gen_e_acsl_size; int __gen_e_acsl_if; @@ -422,7 +422,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_10,1,"Assertion","main", "!\\initialized(&buf2[5])","tests/libc/file.c",38); } - /*@ assert ¬\initialized(&buf2[5]); */ ; + /*@ assert !\initialized(&buf2[5]); */ ; __retres = 0; __e_acsl_delete_block((void *)(buf2)); __e_acsl_delete_block((void *)(& f)); diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c index 2416c3eb591f25dd8e76e63e6f907724503a4de6..befa9cc3d996fd17fbabd30459706cd23c580b24 100644 --- a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c +++ b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c @@ -11,9 +11,9 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; \separated((char *)dest + (0 .. n - 1), (char *)src + (0 .. n - 1)); ensures copied_contents: - memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) ≡ + memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) == 0; - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *((char *)dest + (0 .. n - 1)), \result; assigns *((char *)dest + (0 .. n - 1)) \from *((char *)src + (0 .. n - 1)); @@ -26,9 +26,9 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src, requires valid_src: valid_read_or_empty(src, n); ensures copied_contents: - memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) ≡ + memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) == 0; - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *((char *)dest + (0 .. n - 1)), \result; assigns *((char *)dest + (0 .. n - 1)) \from *((char *)src + (0 .. n - 1)); @@ -37,9 +37,8 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src, void *__gen_e_acsl_memmove(void *dest, void const *src, size_t n); /*@ requires valid_s: valid_or_empty(s, n); - ensures - acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) ≡ \true; - ensures result_ptr: \result ≡ \old(s); + ensures acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) == \true; + ensures result_ptr: \result == \old(s); assigns *((char *)s + (0 .. n - 1)), \result; assigns *((char *)s + (0 .. n - 1)) \from c; assigns \result \from s; @@ -71,7 +70,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_2,1,"Assertion","main", "!\\initialized(&a[1])","tests/libc/mem.c",11); } - /*@ assert ¬\initialized(&a[1]); */ ; + /*@ assert !\initialized(&a[1]); */ ; __gen_e_acsl_memset((void *)(& a[1]),1,(unsigned long)1); { int __gen_e_acsl_initialized_3; @@ -89,7 +88,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_4,1,"Assertion","main", "!\\initialized((int *)b)","tests/libc/mem.c",16); } - /*@ assert ¬\initialized((int *)b); */ ; + /*@ assert !\initialized((int *)b); */ ; { int __gen_e_acsl_initialized_5; __gen_e_acsl_initialized_5 = __e_acsl_initialized((void *)(& b[1]), @@ -97,7 +96,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_5,1,"Assertion","main", "!\\initialized(&b[1])","tests/libc/mem.c",17); } - /*@ assert ¬\initialized(&b[1]); */ ; + /*@ assert !\initialized(&b[1]); */ ; { int __gen_e_acsl_size; int __gen_e_acsl_if; @@ -119,7 +118,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_7,1,"Assertion","main", "!\\initialized(&b[4])","tests/libc/mem.c",19); } - /*@ assert ¬\initialized(&b[4]); */ ; + /*@ assert !\initialized(&b[4]); */ ; __gen_e_acsl_memcpy((void *)(& c[1]),(void const *)(a),(unsigned long)2); { int __gen_e_acsl_initialized_8; @@ -128,7 +127,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_8,1,"Assertion","main", "!\\initialized((char *)c)","tests/libc/mem.c",23); } - /*@ assert ¬\initialized((char *)c); */ ; + /*@ assert !\initialized((char *)c); */ ; { int __gen_e_acsl_size_2; int __gen_e_acsl_if_2; @@ -149,7 +148,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_10,1,"Assertion","main", "!\\initialized(&c[3])","tests/libc/mem.c",25); } - /*@ assert ¬\initialized(&c[3]); */ ; + /*@ assert !\initialized(&c[3]); */ ; __gen_e_acsl_memmove((void *)(c),(void const *)(& c[1]),(unsigned long)2); { int __gen_e_acsl_size_3; @@ -171,7 +170,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_12,1,"Assertion","main", "!\\initialized(&c[3])","tests/libc/mem.c",29); } - /*@ assert ¬\initialized(&c[3]); */ ; + /*@ assert !\initialized(&c[3]); */ ; __retres = 0; __e_acsl_delete_block((void *)(c)); __e_acsl_delete_block((void *)(b)); @@ -181,9 +180,8 @@ int main(void) } /*@ requires valid_s: valid_or_empty(s, n); - ensures - acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) ≡ \true; - ensures result_ptr: \result ≡ \old(s); + ensures acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) == \true; + ensures result_ptr: \result == \old(s); assigns *((char *)s + (0 .. n - 1)), \result; assigns *((char *)s + (0 .. n - 1)) \from c; assigns \result \from s; @@ -207,9 +205,9 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n) requires valid_src: valid_read_or_empty(src, n); ensures copied_contents: - memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) ≡ + memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) == 0; - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *((char *)dest + (0 .. n - 1)), \result; assigns *((char *)dest + (0 .. n - 1)) \from *((char *)src + (0 .. n - 1)); @@ -239,9 +237,9 @@ void *__gen_e_acsl_memmove(void *dest, void const *src, size_t n) \separated((char *)dest + (0 .. n - 1), (char *)src + (0 .. n - 1)); ensures copied_contents: - memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) ≡ + memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) == 0; - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *((char *)dest + (0 .. n - 1)), \result; assigns *((char *)dest + (0 .. n - 1)) \from *((char *)src + (0 .. n - 1)); diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c b/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c index 4686cea0c6bfc91acb6d32d4cc97aac1a02621e7..f8091a43b0bd817b10220471f6c3aa084a89124e 100644 --- a/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c +++ b/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c @@ -41,7 +41,7 @@ int main(void) "!\\initialized(&buf[0 .. 3])","tests/libc/sprintf.c", 10); } - /*@ assert ¬\initialized(&buf[0 .. 3]); */ ; + /*@ assert !\initialized(&buf[0 .. 3]); */ ; __gen_e_acsl_sprintf_res = sprintf(buf,__gen_e_acsl_literal_string,10); /* sprintf_va_1 */ if (__gen_e_acsl_sprintf_res >= 0) __e_acsl_initialize((void *)(buf), (size_t)(__gen_e_acsl_sprintf_res + 1L)); @@ -66,7 +66,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_3,1,"Assertion","main", "!\\initialized(&buf[3])","tests/libc/sprintf.c",14); } - /*@ assert ¬\initialized(&buf[3]); */ ; + /*@ assert !\initialized(&buf[3]); */ ; __e_acsl_delete_block((void *)(buf)); } { @@ -86,7 +86,7 @@ int main(void) "!\\initialized(&buf_0[0 .. 3])", "tests/libc/sprintf.c",18); } - /*@ assert ¬\initialized(&buf_0[0 .. 3]); */ ; + /*@ assert !\initialized(&buf_0[0 .. 3]); */ ; __gen_e_acsl_snprintf_res = snprintf(buf_0,(unsigned long)2, __gen_e_acsl_literal_string,10); /* snprintf_va_1 */ if (__gen_e_acsl_snprintf_res >= 0) { @@ -124,7 +124,7 @@ int main(void) "!\\initialized(&buf_0[2 .. 3])", "tests/libc/sprintf.c",22); } - /*@ assert ¬\initialized(&buf_0[2 .. 3]); */ ; + /*@ assert !\initialized(&buf_0[2 .. 3]); */ ; __e_acsl_delete_block((void *)(buf_0)); } { @@ -144,7 +144,7 @@ int main(void) "!\\initialized(&buf_1[0 .. 3])", "tests/libc/sprintf.c",26); } - /*@ assert ¬\initialized(&buf_1[0 .. 3]); */ ; + /*@ assert !\initialized(&buf_1[0 .. 3]); */ ; __gen_e_acsl_snprintf_res_2 = snprintf(buf_1,(unsigned long)4, __gen_e_acsl_literal_string,10); /* snprintf_va_2 */ if (__gen_e_acsl_snprintf_res_2 >= 0) { @@ -175,7 +175,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_9,1,"Assertion","main", "!\\initialized(&buf_1[3])","tests/libc/sprintf.c",30); } - /*@ assert ¬\initialized(&buf_1[3]); */ ; + /*@ assert !\initialized(&buf_1[3]); */ ; __e_acsl_delete_block((void *)(buf_1)); } __retres = 0; diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c index dea7fa975c07e495ed7d09fc665b92ba4d89d40a..e4f7b56a9488f7f1940c628c38d5d1fa7b89557b 100644 --- a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c +++ b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c @@ -10,8 +10,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; requires separation: \separated(dest + (0 .. strlen(src)), src + (0 .. strlen(src))); - ensures equal_contents: strcmp(\old(dest), \old(src)) ≡ 0; - ensures result_ptr: \result ≡ \old(dest); + ensures equal_contents: strcmp(\old(dest), \old(src)) == 0; + ensures result_ptr: \result == \old(dest); assigns *(dest + (0 .. strlen{Old}(src))), \result; assigns *(dest + (0 .. strlen{Old}(src))) \from *(src + (0 .. strlen{Old}(src))); @@ -22,7 +22,7 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src); /*@ requires valid_nstring_src: valid_read_nstring(src, n); requires room_nstring: \valid(dest + (0 .. n - 1)); requires separation: \separated(dest + (0 .. n - 1), src + (0 .. n - 1)); - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); ensures initialization: \initialized(\old(dest) + (0 .. \old(n) - 1)); assigns *(dest + (0 .. n - 1)), \result; assigns *(dest + (0 .. n - 1)) \from *(src + (0 .. n - 1)); @@ -30,13 +30,12 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src); behavior complete: assumes src_fits: strlen(src) < n; - ensures equal_after_copy: strcmp(\old(dest), \old(src)) ≡ 0; + ensures equal_after_copy: strcmp(\old(dest), \old(src)) == 0; behavior partial: - assumes src_too_long: n ≤ strlen(src); + assumes src_too_long: n <= strlen(src); ensures - equal_prefix: - memcmp{Post, Post}(\old(dest), \old(src), \old(n)) ≡ 0; + equal_prefix: memcmp{Post, Post}(\old(dest), \old(src), \old(n)) == 0; */ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, size_t n); @@ -45,14 +44,14 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, requires valid_string_dest: valid_string(dest); requires room_string: \valid(dest + (0 .. strlen(dest) + strlen(src))); ensures - sum_of_lengths: strlen(\old(dest)) ≡ \old(strlen(dest) + strlen(src)); + sum_of_lengths: strlen(\old(dest)) == \old(strlen(dest) + strlen(src)); ensures initialization: dest: \initialized(\old(dest) + (0 .. \old(strlen(dest) + strlen(src)))); ensures dest_null_terminated: - *(\old(dest) + \old(strlen(dest) + strlen(src))) ≡ 0; - ensures result_ptr: \result ≡ \old(dest); + *(\old(dest) + \old(strlen(dest) + strlen(src))) == 0; + ensures result_ptr: \result == \old(dest); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + strlen{Old}(src))), \result; @@ -65,7 +64,7 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src); /*@ requires valid_nstring_src: valid_read_nstring(src, n); requires valid_string_dest: valid_string(dest); - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)), \result; assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)) \from *(src + (0 .. n)); @@ -73,12 +72,12 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src); behavior complete: assumes - valid_string_src_fits: valid_read_string(src) ∧ strlen(src) ≤ n; + valid_string_src_fits: valid_read_string(src) && strlen(src) <= n; requires room_string: \valid((dest + strlen(dest)) + (0 .. strlen(src))); ensures sum_of_lengths: - strlen(\old(dest)) ≡ \old(strlen(dest) + strlen(src)); + strlen(\old(dest)) == \old(strlen(dest) + strlen(src)); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + strlen{Old}(src))), \result; @@ -90,11 +89,11 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src); behavior partial: assumes valid_string_src_too_large: - ¬(valid_read_string(src) ∧ strlen(src) ≤ n); + !(valid_read_string(src) && strlen(src) <= n); requires room_string: \valid((dest + strlen(dest)) + (0 .. n)); ensures sum_of_bounded_lengths: - strlen(\old(dest)) ≡ \old(strlen(dest)) + \old(n); + strlen(\old(dest)) == \old(strlen(dest)) + \old(n); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)), \result; assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)) @@ -106,7 +105,7 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src, /*@ requires valid_nstring_src: valid_read_nstring(src, n); requires valid_string_dest: valid_string(dest); - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)), \result; assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)) \from *(src + (0 .. n)); @@ -114,12 +113,12 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src, behavior complete: assumes - valid_string_src_fits: valid_read_string(src) ∧ strlen(src) ≤ n; + valid_string_src_fits: valid_read_string(src) && strlen(src) <= n; requires room_string: \valid((dest + strlen(dest)) + (0 .. strlen(src))); ensures sum_of_lengths: - strlen(\old(dest)) ≡ \old(strlen(dest) + strlen(src)); + strlen(\old(dest)) == \old(strlen(dest) + strlen(src)); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + strlen{Old}(src))), \result; @@ -131,11 +130,11 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src, behavior partial: assumes valid_string_src_too_large: - ¬(valid_read_string(src) ∧ strlen(src) ≤ n); + !(valid_read_string(src) && strlen(src) <= n); requires room_string: \valid((dest + strlen(dest)) + (0 .. n)); ensures sum_of_bounded_lengths: - strlen(\old(dest)) ≡ \old(strlen(dest)) + \old(n); + strlen(\old(dest)) == \old(strlen(dest)) + \old(n); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)), \result; assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + n)) @@ -206,14 +205,14 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src, requires valid_string_dest: valid_string(dest); requires room_string: \valid(dest + (0 .. strlen(dest) + strlen(src))); ensures - sum_of_lengths: strlen(\old(dest)) ≡ \old(strlen(dest) + strlen(src)); + sum_of_lengths: strlen(\old(dest)) == \old(strlen(dest) + strlen(src)); ensures initialization: dest: \initialized(\old(dest) + (0 .. \old(strlen(dest) + strlen(src)))); ensures dest_null_terminated: - *(\old(dest) + \old(strlen(dest) + strlen(src))) ≡ 0; - ensures result_ptr: \result ≡ \old(dest); + *(\old(dest) + \old(strlen(dest) + strlen(src))) == 0; + ensures result_ptr: \result == \old(dest); assigns *(dest + (strlen{Old}(dest) .. strlen{Old}(dest) + strlen{Old}(src))), \result; @@ -281,7 +280,7 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src) /*@ requires valid_nstring_src: valid_read_nstring(src, n); requires room_nstring: \valid(dest + (0 .. n - 1)); requires separation: \separated(dest + (0 .. n - 1), src + (0 .. n - 1)); - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); ensures initialization: \initialized(\old(dest) + (0 .. \old(n) - 1)); assigns *(dest + (0 .. n - 1)), \result; assigns *(dest + (0 .. n - 1)) \from *(src + (0 .. n - 1)); @@ -289,13 +288,12 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src) behavior complete: assumes src_fits: strlen(src) < n; - ensures equal_after_copy: strcmp(\old(dest), \old(src)) ≡ 0; + ensures equal_after_copy: strcmp(\old(dest), \old(src)) == 0; behavior partial: - assumes src_too_long: n ≤ strlen(src); + assumes src_too_long: n <= strlen(src); ensures - equal_prefix: - memcmp{Post, Post}(\old(dest), \old(src), \old(n)) ≡ 0; + equal_prefix: memcmp{Post, Post}(\old(dest), \old(src), \old(n)) == 0; */ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, size_t n) @@ -469,8 +467,8 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src, requires separation: \separated(dest + (0 .. strlen(src)), src + (0 .. strlen(src))); - ensures equal_contents: strcmp(\old(dest), \old(src)) ≡ 0; - ensures result_ptr: \result ≡ \old(dest); + ensures equal_contents: strcmp(\old(dest), \old(src)) == 0; + ensures result_ptr: \result == \old(dest); assigns *(dest + (0 .. strlen{Old}(src))), \result; assigns *(dest + (0 .. strlen{Old}(src))) \from *(src + (0 .. strlen{Old}(src))); @@ -557,7 +555,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized,1,"Assertion","main", "!\\initialized(&dest[0 .. 3])","tests/libc/str.c",12); } - /*@ assert ¬\initialized(&dest[0 .. 3]); */ ; + /*@ assert !\initialized(&dest[0 .. 3]); */ ; { int __gen_e_acsl_size_2; int __gen_e_acsl_if_2; @@ -597,7 +595,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_4,1,"Assertion","main", "!\\initialized(&dest[2 .. 3])","tests/libc/str.c",17); } - /*@ assert ¬\initialized(&dest[2 .. 3]); */ ; + /*@ assert !\initialized(&dest[2 .. 3]); */ ; __e_acsl_delete_block((void *)(src)); __e_acsl_delete_block((void *)(dest)); } @@ -621,7 +619,7 @@ int main(void) "!\\initialized(&dest_0[0 .. 3])","tests/libc/str.c", 22); } - /*@ assert ¬\initialized(&dest_0[0 .. 3]); */ ; + /*@ assert !\initialized(&dest_0[0 .. 3]); */ ; { int __gen_e_acsl_size_6; int __gen_e_acsl_if_6; @@ -659,7 +657,7 @@ int main(void) "!\\initialized(&dest_0[1 .. 3])","tests/libc/str.c", 27); } - /*@ assert ¬\initialized(&dest_0[1 .. 3]); */ ; + /*@ assert !\initialized(&dest_0[1 .. 3]); */ ; __e_acsl_delete_block((void *)(src_0)); __e_acsl_delete_block((void *)(dest_0)); } @@ -683,7 +681,7 @@ int main(void) "!\\initialized(&dest_1[0 .. 3])","tests/libc/str.c", 32); } - /*@ assert ¬\initialized(&dest_1[0 .. 3]); */ ; + /*@ assert !\initialized(&dest_1[0 .. 3]); */ ; { int __gen_e_acsl_size_9; int __gen_e_acsl_if_9; @@ -720,7 +718,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_12,1,"Assertion","main", "!\\initialized(&dest_1[3])","tests/libc/str.c",37); } - /*@ assert ¬\initialized(&dest_1[3]); */ ; + /*@ assert !\initialized(&dest_1[3]); */ ; __e_acsl_delete_block((void *)(src_1)); __e_acsl_delete_block((void *)(dest_1)); } @@ -759,7 +757,7 @@ int main(void) "!\\initialized(&dest_2[2 .. 3])","tests/libc/str.c", 44); } - /*@ assert ¬\initialized(&dest_2[2 .. 3]); */ ; + /*@ assert !\initialized(&dest_2[2 .. 3]); */ ; { int __gen_e_acsl_size_13; int __gen_e_acsl_if_13; @@ -796,7 +794,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_17,1,"Assertion","main", "!\\initialized(&dest_2[3])","tests/libc/str.c",49); } - /*@ assert ¬\initialized(&dest_2[3]); */ ; + /*@ assert !\initialized(&dest_2[3]); */ ; __e_acsl_delete_block((void *)(src_2)); __e_acsl_delete_block((void *)(dest_2)); } @@ -835,7 +833,7 @@ int main(void) "!\\initialized(&dest_3[2 .. 3])","tests/libc/str.c", 56); } - /*@ assert ¬\initialized(&dest_3[2 .. 3]); */ ; + /*@ assert !\initialized(&dest_3[2 .. 3]); */ ; { int __gen_e_acsl_size_17; int __gen_e_acsl_if_17; @@ -872,7 +870,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_22,1,"Assertion","main", "!\\initialized(&dest_3[3])","tests/libc/str.c",61); } - /*@ assert ¬\initialized(&dest_3[3]); */ ; + /*@ assert !\initialized(&dest_3[3]); */ ; __e_acsl_delete_block((void *)(src_3)); __e_acsl_delete_block((void *)(dest_3)); } @@ -911,7 +909,7 @@ int main(void) "!\\initialized(&dest_4[2 .. 3])","tests/libc/str.c", 68); } - /*@ assert ¬\initialized(&dest_4[2 .. 3]); */ ; + /*@ assert !\initialized(&dest_4[2 .. 3]); */ ; { int __gen_e_acsl_size_21; int __gen_e_acsl_if_21; @@ -948,7 +946,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_27,1,"Assertion","main", "!\\initialized(&dest_4[3])","tests/libc/str.c",73); } - /*@ assert ¬\initialized(&dest_4[3]); */ ; + /*@ assert !\initialized(&dest_4[3]); */ ; __e_acsl_delete_block((void *)(src_4)); __e_acsl_delete_block((void *)(dest_4)); } diff --git a/src/plugins/e-acsl/tests/memory/oracle/early_exit.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/early_exit.res.oracle index 965ff85803169a13ec505dc05504dd6b12557d30..f3172d2e248ebb55d244cdd5d93f8512a8eb9669 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/early_exit.res.oracle +++ b/src/plugins/e-acsl/tests/memory/oracle/early_exit.res.oracle @@ -3,5 +3,4 @@ [eva:locals-escaping] tests/memory/early_exit.c:14: Warning: locals {a} escaping the scope of a block of goto_bts through p [eva:alarm] tests/memory/early_exit.c:18: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&p); + accessing left-value that contains escaping addresses. assert !\dangling(&p); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c index 77eb66c73434ef0a19ff2a79c1618a08e4cef21e..5717b4c6b5e145a448e5efb1185b47878c837edf 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c @@ -39,7 +39,7 @@ int main(void) f(); __e_acsl_assert(& x == & x,1,"Assertion","main","&x == &x", "tests/memory/addrOf.i",16); - /*@ assert &x ≡ &x; */ ; + /*@ assert &x == &x; */ ; __retres = 0; __e_acsl_memory_clean(); return __retres; diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c b/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c index 9ddd7c0b569e52ac51fabaf2ece1c78ecb2847ee..e69c3b579bbc86dc5ab541decc779433575485d9 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c @@ -35,7 +35,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_valid,1,"Assertion","main", "!\\valid(&a[4])","tests/memory/array_overflow.c",31); } - /*@ assert ¬\valid(&a[4]); */ ; + /*@ assert !\valid(&a[4]); */ ; int *ap = a; __e_acsl_store_block((void *)(& ap),(size_t)8); __e_acsl_full_init((void *)(& ap)); @@ -50,7 +50,7 @@ int main(void) "!\\valid(&(*((int (*)[])ap))[4])", "tests/memory/array_overflow.c",36); } - /*@ assert ¬\valid(&(*((int (*)[])ap))[4]); */ ; + /*@ assert !\valid(&(*((int (*)[])ap))[4]); */ ; struct dat d = {.arr = {4, 5, 6, 7}}; __e_acsl_store_block((void *)(& d),(size_t)16); __e_acsl_full_init((void *)(& d)); @@ -67,7 +67,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_valid_3,1,"Assertion","main", "!\\valid(&d.arr[4])","tests/memory/array_overflow.c",42); } - /*@ assert ¬\valid(&d.arr[4]); */ ; + /*@ assert !\valid(&d.arr[4]); */ ; { int __gen_e_acsl_valid_4; __gen_e_acsl_valid_4 = __e_acsl_valid((void *)(& (d2.p[1])->arr[2]), diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c b/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c index df3b503ecb9c9d7a4cfecbc76de75042ff1ab23a..7afb16957a7b7517c62bfc28da15fd48324a366e 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c @@ -44,7 +44,7 @@ int main(void) "\\base_addr((int *)A) == \\base_addr(&A)", "tests/memory/base_addr.c",13); } - /*@ assert \base_addr((int *)A) ≡ \base_addr(&A); */ ; + /*@ assert \base_addr((int *)A) == \base_addr(&A); */ ; { void *__gen_e_acsl_base_addr_3; void *__gen_e_acsl_base_addr_4; @@ -55,7 +55,7 @@ int main(void) "\\base_addr((int *)A) == \\base_addr(PA)", "tests/memory/base_addr.c",14); } - /*@ assert \base_addr((int *)A) ≡ \base_addr(PA); */ ; + /*@ assert \base_addr((int *)A) == \base_addr(PA); */ ; { void *__gen_e_acsl_base_addr_5; void *__gen_e_acsl_base_addr_6; @@ -66,7 +66,7 @@ int main(void) "\\base_addr(&A[3]) == \\base_addr(PA)", "tests/memory/base_addr.c",15); } - /*@ assert \base_addr(&A[3]) ≡ \base_addr(PA); */ ; + /*@ assert \base_addr(&A[3]) == \base_addr(PA); */ ; PA ++; { void *__gen_e_acsl_base_addr_7; @@ -78,7 +78,7 @@ int main(void) "\\base_addr(PA) == \\base_addr((int *)A)", "tests/memory/base_addr.c",17); } - /*@ assert \base_addr(PA) ≡ \base_addr((int *)A); */ ; + /*@ assert \base_addr(PA) == \base_addr((int *)A); */ ; { void *__gen_e_acsl_base_addr_9; void *__gen_e_acsl_base_addr_10; @@ -89,7 +89,7 @@ int main(void) "\\base_addr(PA + 2) == \\base_addr(&A[3])", "tests/memory/base_addr.c",18); } - /*@ assert \base_addr(PA + 2) ≡ \base_addr(&A[3]); */ ; + /*@ assert \base_addr(PA + 2) == \base_addr(&A[3]); */ ; int a[4] = {1, 2, 3, 4}; __e_acsl_store_block((void *)(a),(size_t)16); __e_acsl_full_init((void *)(& a)); @@ -105,7 +105,7 @@ int main(void) "\\base_addr((int *)a) == \\base_addr(&a)", "tests/memory/base_addr.c",25); } - /*@ assert \base_addr((int *)a) ≡ \base_addr(&a); */ ; + /*@ assert \base_addr((int *)a) == \base_addr(&a); */ ; { void *__gen_e_acsl_base_addr_13; void *__gen_e_acsl_base_addr_14; @@ -116,7 +116,7 @@ int main(void) "\\base_addr((int *)a) == \\base_addr(pa)", "tests/memory/base_addr.c",26); } - /*@ assert \base_addr((int *)a) ≡ \base_addr(pa); */ ; + /*@ assert \base_addr((int *)a) == \base_addr(pa); */ ; { void *__gen_e_acsl_base_addr_15; void *__gen_e_acsl_base_addr_16; @@ -127,7 +127,7 @@ int main(void) "\\base_addr(&a[3]) == \\base_addr(pa)", "tests/memory/base_addr.c",27); } - /*@ assert \base_addr(&a[3]) ≡ \base_addr(pa); */ ; + /*@ assert \base_addr(&a[3]) == \base_addr(pa); */ ; __e_acsl_full_init((void *)(& pa)); pa ++; { @@ -140,7 +140,7 @@ int main(void) "\\base_addr(pa) == \\base_addr((int *)a)", "tests/memory/base_addr.c",29); } - /*@ assert \base_addr(pa) ≡ \base_addr((int *)a); */ ; + /*@ assert \base_addr(pa) == \base_addr((int *)a); */ ; { void *__gen_e_acsl_base_addr_19; void *__gen_e_acsl_base_addr_20; @@ -151,7 +151,7 @@ int main(void) "\\base_addr(pa + 2) == \\base_addr((int *)a)", "tests/memory/base_addr.c",30); } - /*@ assert \base_addr(pa + 2) ≡ \base_addr((int *)a); */ ; + /*@ assert \base_addr(pa + 2) == \base_addr((int *)a); */ ; long l = (long)4; __e_acsl_store_block((void *)(& l),(size_t)8); __e_acsl_full_init((void *)(& l)); @@ -167,7 +167,7 @@ int main(void) "Assertion","main","\\base_addr(&l) == \\base_addr(pl)", "tests/memory/base_addr.c",35); } - /*@ assert \base_addr(&l) ≡ \base_addr(pl); */ ; + /*@ assert \base_addr(&l) == \base_addr(pl); */ ; { void *__gen_e_acsl_base_addr_23; void *__gen_e_acsl_base_addr_24; @@ -178,7 +178,7 @@ int main(void) "\\base_addr(pl + 2) == \\base_addr(&l)", "tests/memory/base_addr.c",36); } - /*@ assert \base_addr(pl + 2) ≡ \base_addr(&l); */ ; + /*@ assert \base_addr(pl + 2) == \base_addr(&l); */ ; short *pi = (short *)(& l); __e_acsl_store_block((void *)(& pi),(size_t)8); __e_acsl_full_init((void *)(& pi)); @@ -195,7 +195,7 @@ int main(void) "Assertion","main","\\base_addr(pi) == \\base_addr(pl)", "tests/memory/base_addr.c",40); } - /*@ assert \base_addr(pi) ≡ \base_addr(pl); */ ; + /*@ assert \base_addr(pi) == \base_addr(pl); */ ; { void *__gen_e_acsl_base_addr_27; void *__gen_e_acsl_base_addr_28; @@ -205,7 +205,7 @@ int main(void) "Assertion","main","\\base_addr(pl) == \\base_addr(&l)", "tests/memory/base_addr.c",41); } - /*@ assert \base_addr(pl) ≡ \base_addr(&l); */ ; + /*@ assert \base_addr(pl) == \base_addr(&l); */ ; char *p = malloc((unsigned long)12); __e_acsl_store_block((void *)(& p),(size_t)8); __e_acsl_full_init((void *)(& p)); @@ -221,7 +221,7 @@ int main(void) "Assertion","main","\\base_addr(p) == \\base_addr(pd)", "tests/memory/base_addr.c",46); } - /*@ assert \base_addr(p) ≡ \base_addr(pd); */ ; + /*@ assert \base_addr(p) == \base_addr(pd); */ ; { void *__gen_e_acsl_base_addr_31; void *__gen_e_acsl_base_addr_32; @@ -232,7 +232,7 @@ int main(void) "\\base_addr(p + 1) == \\base_addr(pd + 5)", "tests/memory/base_addr.c",47); } - /*@ assert \base_addr(p + 1) ≡ \base_addr(pd + 5); */ ; + /*@ assert \base_addr(p + 1) == \base_addr(pd + 5); */ ; { void *__gen_e_acsl_base_addr_33; void *__gen_e_acsl_base_addr_34; @@ -243,7 +243,7 @@ int main(void) "\\base_addr(p + 11) == \\base_addr(pd + 1)", "tests/memory/base_addr.c",48); } - /*@ assert \base_addr(p + 11) ≡ \base_addr(pd + 1); */ ; + /*@ assert \base_addr(p + 11) == \base_addr(pd + 1); */ ; __e_acsl_full_init((void *)(& p)); p += 5; { @@ -256,7 +256,7 @@ int main(void) "\\base_addr(p + 5) == \\base_addr(pd)", "tests/memory/base_addr.c",50); } - /*@ assert \base_addr(p + 5) ≡ \base_addr(pd); */ ; + /*@ assert \base_addr(p + 5) == \base_addr(pd); */ ; { void *__gen_e_acsl_base_addr_37; void *__gen_e_acsl_base_addr_38; @@ -267,7 +267,7 @@ int main(void) "\\base_addr(p - 5) == \\base_addr(pd)", "tests/memory/base_addr.c",51); } - /*@ assert \base_addr(p - 5) ≡ \base_addr(pd); */ ; + /*@ assert \base_addr(p - 5) == \base_addr(pd); */ ; long *q = malloc((unsigned long)30 * sizeof(long)); __e_acsl_store_block((void *)(& q),(size_t)8); __e_acsl_full_init((void *)(& q)); @@ -283,7 +283,7 @@ int main(void) "Assertion","main","\\base_addr(q) == \\base_addr(qd)", "tests/memory/base_addr.c",57); } - /*@ assert \base_addr(q) ≡ \base_addr(qd); */ ; + /*@ assert \base_addr(q) == \base_addr(qd); */ ; __e_acsl_full_init((void *)(& q)); q ++; { @@ -295,7 +295,7 @@ int main(void) "Assertion","main","\\base_addr(q) == \\base_addr(qd)", "tests/memory/base_addr.c",59); } - /*@ assert \base_addr(q) ≡ \base_addr(qd); */ ; + /*@ assert \base_addr(q) == \base_addr(qd); */ ; __e_acsl_full_init((void *)(& q)); q += 2; { @@ -307,7 +307,7 @@ int main(void) "Assertion","main","\\base_addr(q) == \\base_addr(qd)", "tests/memory/base_addr.c",61); } - /*@ assert \base_addr(q) ≡ \base_addr(qd); */ ; + /*@ assert \base_addr(q) == \base_addr(qd); */ ; __e_acsl_full_init((void *)(& q)); q += 4; { @@ -319,7 +319,7 @@ int main(void) "Assertion","main","\\base_addr(q) == \\base_addr(qd)", "tests/memory/base_addr.c",63); } - /*@ assert \base_addr(q) ≡ \base_addr(qd); */ ; + /*@ assert \base_addr(q) == \base_addr(qd); */ ; __retres = 0; __e_acsl_delete_block((void *)(& qd)); __e_acsl_delete_block((void *)(& q)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c b/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c index fe71ab122788e51417f97d655b22442bf014b5e4..d19923ed8b828ca3ef2809e9c7b6151ec67f21ee 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c @@ -39,7 +39,7 @@ int main(void) "\\block_length((int *)A) == sizeof(A)", "tests/memory/block_length.c",13); } - /*@ assert \block_length((int *)A) ≡ sizeof(A); */ ; + /*@ assert \block_length((int *)A) == sizeof(A); */ ; { unsigned long __gen_e_acsl_block_length_2; __gen_e_acsl_block_length_2 = __e_acsl_block_length((void *)(& A[3])); @@ -47,7 +47,7 @@ int main(void) "\\block_length(&A[3]) == sizeof(A)", "tests/memory/block_length.c",14); } - /*@ assert \block_length(&A[3]) ≡ sizeof(A); */ ; + /*@ assert \block_length(&A[3]) == sizeof(A); */ ; { unsigned long __gen_e_acsl_block_length_3; __gen_e_acsl_block_length_3 = __e_acsl_block_length((void *)PA); @@ -55,7 +55,7 @@ int main(void) "\\block_length(PA) == sizeof(A)", "tests/memory/block_length.c",15); } - /*@ assert \block_length(PA) ≡ sizeof(A); */ ; + /*@ assert \block_length(PA) == sizeof(A); */ ; PA ++; { unsigned long __gen_e_acsl_block_length_4; @@ -67,7 +67,7 @@ int main(void) "\\block_length(PA + 1) == \\block_length(&A[1])", "tests/memory/block_length.c",17); } - /*@ assert \block_length(PA + 1) ≡ \block_length(&A[1]); */ ; + /*@ assert \block_length(PA + 1) == \block_length(&A[1]); */ ; int a[4] = {1, 2, 3, 4}; __e_acsl_store_block((void *)(a),(size_t)16); __e_acsl_full_init((void *)(& a)); @@ -81,7 +81,7 @@ int main(void) "\\block_length((int *)a) == sizeof(a)", "tests/memory/block_length.c",22); } - /*@ assert \block_length((int *)a) ≡ sizeof(a); */ ; + /*@ assert \block_length((int *)a) == sizeof(a); */ ; { unsigned long __gen_e_acsl_block_length_7; __gen_e_acsl_block_length_7 = __e_acsl_block_length((void *)(& a[3])); @@ -89,7 +89,7 @@ int main(void) "\\block_length(&a[3]) == sizeof(a)", "tests/memory/block_length.c",23); } - /*@ assert \block_length(&a[3]) ≡ sizeof(a); */ ; + /*@ assert \block_length(&a[3]) == sizeof(a); */ ; { unsigned long __gen_e_acsl_block_length_8; __gen_e_acsl_block_length_8 = __e_acsl_block_length((void *)pa); @@ -97,7 +97,7 @@ int main(void) "\\block_length(pa) == sizeof(a)", "tests/memory/block_length.c",24); } - /*@ assert \block_length(pa) ≡ sizeof(a); */ ; + /*@ assert \block_length(pa) == sizeof(a); */ ; __e_acsl_full_init((void *)(& pa)); pa ++; { @@ -110,7 +110,7 @@ int main(void) "\\block_length(pa + 1) == \\block_length(&a[1])", "tests/memory/block_length.c",26); } - /*@ assert \block_length(pa + 1) ≡ \block_length(&a[1]); */ ; + /*@ assert \block_length(pa + 1) == \block_length(&a[1]); */ ; long l = (long)4; __e_acsl_store_block((void *)(& l),(size_t)8); __e_acsl_full_init((void *)(& l)); @@ -124,7 +124,7 @@ int main(void) "\\block_length(&l) == sizeof(long)", "tests/memory/block_length.c",32); } - /*@ assert \block_length(&l) ≡ sizeof(long); */ ; + /*@ assert \block_length(&l) == sizeof(long); */ ; { unsigned long __gen_e_acsl_block_length_12; __gen_e_acsl_block_length_12 = __e_acsl_block_length((void *)pl); @@ -132,7 +132,7 @@ int main(void) "\\block_length(pl) == sizeof(long)", "tests/memory/block_length.c",33); } - /*@ assert \block_length(pl) ≡ sizeof(long); */ ; + /*@ assert \block_length(pl) == sizeof(long); */ ; { unsigned long __gen_e_acsl_block_length_13; __gen_e_acsl_block_length_13 = __e_acsl_block_length((void *)(pl + 7)); @@ -140,7 +140,7 @@ int main(void) "\\block_length(pl + 7) == sizeof(long)", "tests/memory/block_length.c",34); } - /*@ assert \block_length(pl + 7) ≡ sizeof(long); */ ; + /*@ assert \block_length(pl + 7) == sizeof(long); */ ; int *pi = (int *)(& l); __e_acsl_store_block((void *)(& pi),(size_t)8); __e_acsl_full_init((void *)(& pi)); @@ -154,7 +154,7 @@ int main(void) "\\block_length(pi) == \\block_length(&l)", "tests/memory/block_length.c",36); } - /*@ assert \block_length(pi) ≡ \block_length(&l); */ ; + /*@ assert \block_length(pi) == \block_length(&l); */ ; __e_acsl_full_init((void *)(& pi)); pi ++; { @@ -167,7 +167,7 @@ int main(void) "\\block_length(pi) == \\block_length(&l)", "tests/memory/block_length.c",38); } - /*@ assert \block_length(pi) ≡ \block_length(&l); */ ; + /*@ assert \block_length(pi) == \block_length(&l); */ ; size_t size = (unsigned long)12; char *p = malloc(size); __e_acsl_store_block((void *)(& p),(size_t)8); @@ -179,7 +179,7 @@ int main(void) "main","\\block_length(p) == size", "tests/memory/block_length.c",43); } - /*@ assert \block_length(p) ≡ size; */ ; + /*@ assert \block_length(p) == size; */ ; { unsigned long __gen_e_acsl_block_length_19; __gen_e_acsl_block_length_19 = __e_acsl_block_length((void *)(p + 11)); @@ -187,7 +187,7 @@ int main(void) "main","\\block_length(p + 11) == size", "tests/memory/block_length.c",44); } - /*@ assert \block_length(p + 11) ≡ size; */ ; + /*@ assert \block_length(p + 11) == size; */ ; __e_acsl_full_init((void *)(& p)); p += 5; { @@ -200,7 +200,7 @@ int main(void) "\\block_length(p + 5) == \\block_length(p - 5)", "tests/memory/block_length.c",46); } - /*@ assert \block_length(p + 5) ≡ \block_length(p - 5); */ ; + /*@ assert \block_length(p + 5) == \block_length(p - 5); */ ; size = (unsigned long)30 * sizeof(long); long *q = malloc(size); __e_acsl_store_block((void *)(& q),(size_t)8); @@ -212,7 +212,7 @@ int main(void) "main","\\block_length(q) == size", "tests/memory/block_length.c",52); } - /*@ assert \block_length(q) ≡ size; */ ; + /*@ assert \block_length(q) == size; */ ; __e_acsl_full_init((void *)(& q)); q += 4; { @@ -222,7 +222,7 @@ int main(void) "main","\\block_length(q) == size", "tests/memory/block_length.c",54); } - /*@ assert \block_length(q) ≡ size; */ ; + /*@ assert \block_length(q) == size; */ ; __retres = 0; __e_acsl_delete_block((void *)(& q)); __e_acsl_delete_block((void *)(& p)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c b/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c index 913c86ce1bf8abdb5232bb263dc45d93acffa884..a2c639da809e9b68c64a99d5a05d391deab1abca 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c @@ -63,7 +63,7 @@ int main(int argc, char **argv) __e_acsl_assert(! __gen_e_acsl_valid_2,1,"Assertion","main", "!\\valid(p + 1)","tests/memory/block_valid.c",21); } - /*@ assert ¬\valid(p + 1); */ ; + /*@ assert !\valid(p + 1); */ ; __e_acsl_full_init((void *)(& p)); p = & B; { @@ -89,7 +89,7 @@ int main(int argc, char **argv) __e_acsl_assert(! __gen_e_acsl_valid_4,1,"Assertion","main", "!\\valid(p + 1)","tests/memory/block_valid.c",26); } - /*@ assert ¬\valid(p + 1); */ ; + /*@ assert !\valid(p + 1); */ ; char *pmin = malloc(sizeof(int)); __e_acsl_store_block((void *)(& pmin),(size_t)8); __e_acsl_full_init((void *)(& pmin)); @@ -150,7 +150,7 @@ int main(int argc, char **argv) __e_acsl_assert(! __gen_e_acsl_valid_7,1,"Assertion","main", "!\\valid(pmin + diff)","tests/memory/block_valid.c",47); } - /*@ assert ¬\valid(pmin + diff); */ ; + /*@ assert !\valid(pmin + diff); */ ; { int __gen_e_acsl_valid_8; __gen_e_acsl_valid_8 = __e_acsl_valid((void *)(pmax - diff),sizeof(char), @@ -158,7 +158,7 @@ int main(int argc, char **argv) __e_acsl_assert(! __gen_e_acsl_valid_8,1,"Assertion","main", "!\\valid(pmax - diff)","tests/memory/block_valid.c",49); } - /*@ assert ¬\valid(pmax - diff); */ ; + /*@ assert !\valid(pmax - diff); */ ; __retres = 0; __e_acsl_delete_block((void *)(& pmax)); __e_acsl_delete_block((void *)(& pmin)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c b/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c index 35129325096b543be203e72c0de69489c04968fd..51a722c13454cfea75f338bd74b5f54c7cf75352 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c @@ -177,7 +177,7 @@ int main(int argc, char **argv) /*@ assert \valid(&_F); */ ; __e_acsl_assert(_E == 44,1,"Assertion","main","_E == 44", "tests/memory/compound_initializers.c",31); - /*@ assert _E ≡ 44; */ ; + /*@ assert _E == 44; */ ; { int __gen_e_acsl_valid_6; __gen_e_acsl_valid_6 = __e_acsl_valid((void *)(& _G), @@ -189,7 +189,7 @@ int main(int argc, char **argv) /*@ assert \valid(&_G); */ ; __e_acsl_assert(_G[0].num == 99,1,"Assertion","main","_G[0].num == 99", "tests/memory/compound_initializers.c",33); - /*@ assert _G[0].num ≡ 99; */ ; + /*@ assert _G[0].num == 99; */ ; __retres = 0; __e_acsl_globals_clean(); __e_acsl_memory_clean(); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c index 45e92a3f5de25520a5d1439bf732ede4eb8b9164..e022cf5784679e2b24524c72a6fcd87c68b0d00f 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c @@ -5,18 +5,17 @@ #include "stdio.h" extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; -/*@ requires c_uchar_or_eof: (0 ≤ c ≤ 255) ∨ c ≡ -1; +/*@ requires c_uchar_or_eof: (0 <= c <= 255) || c == -1; assigns \result; assigns \result \from c; behavior definitely_match: - assumes c_upper: 'A' ≤ c ≤ 'Z'; - ensures nonzero_result: \result < 0 ∨ \result > 0; + assumes c_upper: 'A' <= c <= 'Z'; + ensures nonzero_result: \result < 0 || \result > 0; behavior definitely_not_match: - assumes - c_non_upper: c ≡ -1 ∨ (0 ≤ c < 'A') ∨ ('Z' < c ≤ 127); - ensures zero_result: \result ≡ 0; + assumes c_non_upper: c == -1 || (0 <= c < 'A') || ('Z' < c <= 127); + ensures zero_result: \result == 0; disjoint behaviors definitely_not_match, definitely_match; */ @@ -57,18 +56,17 @@ int main(int argc, char const **argv) return __retres; } -/*@ requires c_uchar_or_eof: (0 ≤ c ≤ 255) ∨ c ≡ -1; +/*@ requires c_uchar_or_eof: (0 <= c <= 255) || c == -1; assigns \result; assigns \result \from c; behavior definitely_match: - assumes c_upper: 'A' ≤ c ≤ 'Z'; - ensures nonzero_result: \result < 0 ∨ \result > 0; + assumes c_upper: 'A' <= c <= 'Z'; + ensures nonzero_result: \result < 0 || \result > 0; behavior definitely_not_match: - assumes - c_non_upper: c ≡ -1 ∨ (0 ≤ c < 'A') ∨ ('Z' < c ≤ 127); - ensures zero_result: \result ≡ 0; + assumes c_non_upper: c == -1 || (0 <= c < 'A') || ('Z' < c <= 127); + ensures zero_result: \result == 0; disjoint behaviors definitely_not_match, definitely_match; */ diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c b/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c index 123bf12d8a51831f1632b19ef1861568f048c60e..a513c9945064ee6bedf6bbc147d8646ab70a7751 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c @@ -36,7 +36,7 @@ int goto_bts(void) __e_acsl_delete_block((void *)(& a)); } L: - /*@ assert ¬\valid(p); */ + /*@ assert !\valid(p); */ { int __gen_e_acsl_initialized_2; int __gen_e_acsl_and_2; @@ -44,7 +44,7 @@ int goto_bts(void) sizeof(int *)); if (__gen_e_acsl_initialized_2) { int __gen_e_acsl_valid_2; - /*@ assert Eva: dangling_pointer: ¬\dangling(&p); */ + /*@ assert Eva: dangling_pointer: !\dangling(&p); */ __gen_e_acsl_valid_2 = __e_acsl_valid((void *)p,sizeof(int),(void *)p, (void *)(& p)); __gen_e_acsl_and_2 = __gen_e_acsl_valid_2; @@ -131,7 +131,7 @@ int goto_valid(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","goto_valid", "!\\valid(q)","tests/memory/early_exit.c",47); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; { int __gen_e_acsl_initialized_3; int __gen_e_acsl_and_3; @@ -147,7 +147,7 @@ int goto_valid(void) __e_acsl_assert(! __gen_e_acsl_and_3,1,"Assertion","goto_valid", "!\\valid(r)","tests/memory/early_exit.c",48); } - /*@ assert ¬\valid(r); */ ; + /*@ assert !\valid(r); */ ; __e_acsl_delete_block((void *)(& a1)); goto SECOND; __e_acsl_full_init((void *)(& q)); @@ -159,7 +159,7 @@ int goto_valid(void) __e_acsl_delete_block((void *)(& a1)); } SECOND: - /*@ assert ¬\valid(p); */ + /*@ assert !\valid(p); */ { int __gen_e_acsl_initialized_4; int __gen_e_acsl_and_4; @@ -190,7 +190,7 @@ int goto_valid(void) __e_acsl_assert(! __gen_e_acsl_and_5,1,"Assertion","goto_valid", "!\\valid(q)","tests/memory/early_exit.c",57); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; { int __gen_e_acsl_initialized_6; int __gen_e_acsl_and_6; @@ -206,7 +206,7 @@ int goto_valid(void) __e_acsl_assert(! __gen_e_acsl_and_6,1,"Assertion","goto_valid", "!\\valid(r)","tests/memory/early_exit.c",58); } - /*@ assert ¬\valid(r); */ ; + /*@ assert !\valid(r); */ ; __retres = 0; __e_acsl_delete_block((void *)(& r)); __e_acsl_delete_block((void *)(& q)); @@ -319,7 +319,7 @@ int switch_valid(void) __e_acsl_assert(! __gen_e_acsl_and_4,1,"Assertion","switch_valid", "!\\valid(q)","tests/memory/early_exit.c",87); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; { int __gen_e_acsl_initialized_5; int __gen_e_acsl_and_5; @@ -335,7 +335,7 @@ int switch_valid(void) __e_acsl_assert(! __gen_e_acsl_and_5,1,"Assertion","switch_valid", "!\\valid(p)","tests/memory/early_exit.c",88); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; { int __gen_e_acsl_initialized_6; int __gen_e_acsl_and_6; @@ -464,7 +464,7 @@ int while_valid(void) __e_acsl_assert(! __gen_e_acsl_and_4,1,"Assertion","while_valid", "!\\valid(p)","tests/memory/early_exit.c",116); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; { int __gen_e_acsl_initialized_5; int __gen_e_acsl_and_5; @@ -480,7 +480,7 @@ int while_valid(void) __e_acsl_assert(! __gen_e_acsl_and_5,1,"Assertion","while_valid", "!\\valid(q)","tests/memory/early_exit.c",117); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; { int __gen_e_acsl_initialized_6; int __gen_e_acsl_and_6; @@ -535,7 +535,7 @@ void continue_valid(void) __e_acsl_assert(! __gen_e_acsl_and,1,"Assertion","continue_valid", "!\\valid(p)","tests/memory/early_exit.c",130); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; { int __gen_e_acsl_initialized_2; int __gen_e_acsl_and_2; @@ -551,7 +551,7 @@ void continue_valid(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","continue_valid", "!\\valid(q)","tests/memory/early_exit.c",131); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; int a1 = 1; __e_acsl_store_block((void *)(& a1),(size_t)4); __e_acsl_full_init((void *)(& a1)); @@ -588,7 +588,7 @@ void continue_valid(void) __e_acsl_assert(! __gen_e_acsl_and_4,1,"Assertion","continue_valid", "!\\valid(q)","tests/memory/early_exit.c",136); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; { int a2 = 1; __e_acsl_store_block((void *)(& a2),(size_t)4); @@ -654,7 +654,7 @@ void continue_valid(void) __e_acsl_assert(! __gen_e_acsl_and_7,1,"Assertion","continue_valid", "!\\valid(p)","tests/memory/early_exit.c",150); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; { int __gen_e_acsl_initialized_8; int __gen_e_acsl_and_8; @@ -670,7 +670,7 @@ void continue_valid(void) __e_acsl_assert(! __gen_e_acsl_and_8,1,"Assertion","continue_valid", "!\\valid(q)","tests/memory/early_exit.c",151); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; __e_acsl_delete_block((void *)(& q)); __e_acsl_delete_block((void *)(& p)); return; diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c b/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c index f804ef702e5b85b114de9eb6f80a4028faac9e05..aea350e876ad5fab647a0187be9c761bbb53b101 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c @@ -36,14 +36,14 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_freeable,1,"Assertion","main", "!\\freeable(p)","tests/memory/freeable.c",14); } - /*@ assert ¬\freeable(p); */ ; + /*@ assert !\freeable(p); */ ; { int __gen_e_acsl_freeable_2; __gen_e_acsl_freeable_2 = __e_acsl_freeable((void *)0); __e_acsl_assert(! __gen_e_acsl_freeable_2,1,"Assertion","main", "!\\freeable((void *)0)","tests/memory/freeable.c",15); } - /*@ assert ¬\freeable((void *)0); */ ; + /*@ assert !\freeable((void *)0); */ ; __e_acsl_full_init((void *)(& p)); p = (int *)malloc((unsigned long)4 * sizeof(int)); { @@ -52,7 +52,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_freeable_3,1,"Assertion","main", "!\\freeable(p + 1)","tests/memory/freeable.c",17); } - /*@ assert ¬\freeable(p + 1); */ ; + /*@ assert !\freeable(p + 1); */ ; { int __gen_e_acsl_freeable_4; __gen_e_acsl_freeable_4 = __e_acsl_freeable((void *)p); @@ -67,7 +67,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_freeable_5,1,"Assertion","main", "!\\freeable(p)","tests/memory/freeable.c",20); } - /*@ assert ¬\freeable(p); */ ; + /*@ assert !\freeable(p); */ ; { int __gen_e_acsl_freeable_6; __gen_e_acsl_freeable_6 = __e_acsl_freeable((void *)(array)); @@ -75,14 +75,14 @@ int main(void) "!\\freeable((char *)array)","tests/memory/freeable.c", 23); } - /*@ assert ¬\freeable((char *)array); */ ; + /*@ assert !\freeable((char *)array); */ ; { int __gen_e_acsl_freeable_7; __gen_e_acsl_freeable_7 = __e_acsl_freeable((void *)(& array[5])); __e_acsl_assert(! __gen_e_acsl_freeable_7,1,"Assertion","main", "!\\freeable(&array[5])","tests/memory/freeable.c",24); } - /*@ assert ¬\freeable(&array[5]); */ ; + /*@ assert !\freeable(&array[5]); */ ; __retres = 0; __e_acsl_delete_block((void *)(& p)); __e_acsl_globals_clean(); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c b/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c index 0f80a70efb16cce469924cd3c6bd384fcabe2ec0..fb2293104ab9bf8abf0b51ddd7da4290fdb1d4d1 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c @@ -13,12 +13,12 @@ int main(void) __e_acsl_assert(__e_acsl_heap_allocation_size == 0UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 0", "tests/memory/init_function.c",16); - /*@ assert __e_acsl_heap_allocation_size ≡ 0; */ ; + /*@ assert __e_acsl_heap_allocation_size == 0; */ ; char *a = malloc((unsigned long)7); __e_acsl_assert(__e_acsl_heap_allocation_size == 7UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 7", "tests/memory/init_function.c",18); - /*@ assert __e_acsl_heap_allocation_size ≡ 7; */ ; + /*@ assert __e_acsl_heap_allocation_size == 7; */ ; __retres = 0; __e_acsl_memory_clean(); return __retres; diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c b/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c index ecebc5da9e304428b2b62d79680ba460cdc0e971..55fd7ef8cca3886e0c15ac6eb728d82b3465feb5 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c @@ -89,7 +89,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_4,1,"Assertion","main", "!\\initialized(&b)","tests/memory/initialized.c",31); } - /*@ assert ¬\initialized(&b); */ ; + /*@ assert !\initialized(&b); */ ; { int __gen_e_acsl_initialized_5; __gen_e_acsl_initialized_5 = __e_acsl_initialized((void *)p,sizeof(int)); @@ -103,7 +103,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_6,1,"Assertion","main", "!\\initialized(q)","tests/memory/initialized.c",33); } - /*@ assert ¬\initialized(q); */ ; + /*@ assert !\initialized(q); */ ; { int __gen_e_acsl_initialized_7; __gen_e_acsl_initialized_7 = __e_acsl_initialized((void *)(& c), @@ -119,7 +119,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_8,1,"Assertion","main", "!\\initialized(&d)","tests/memory/initialized.c",35); } - /*@ assert ¬\initialized(&d); */ ; + /*@ assert !\initialized(&d); */ ; __e_acsl_full_init((void *)(& b)); b = 0; { @@ -147,7 +147,7 @@ int main(void) "!\\initialized((long *)d)","tests/memory/initialized.c", 43); } - /*@ assert ¬\initialized((long *)d); */ ; + /*@ assert !\initialized((long *)d); */ ; { int __gen_e_acsl_initialized_12; __gen_e_acsl_initialized_12 = __e_acsl_initialized((void *)(& d[1]), @@ -155,7 +155,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_12,1,"Assertion","main", "!\\initialized(&d[1])","tests/memory/initialized.c",44); } - /*@ assert ¬\initialized(&d[1]); */ ; + /*@ assert !\initialized(&d[1]); */ ; { int __gen_e_acsl_initialized_13; __gen_e_acsl_initialized_13 = __e_acsl_initialized((void *)(& d), @@ -163,7 +163,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_13,1,"Assertion","main", "!\\initialized(&d)","tests/memory/initialized.c",45); } - /*@ assert ¬\initialized(&d); */ ; + /*@ assert !\initialized(&d); */ ; { int __gen_e_acsl_initialized_14; __gen_e_acsl_initialized_14 = __e_acsl_initialized((void *)r, @@ -171,7 +171,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_14,1,"Assertion","main", "!\\initialized(r)","tests/memory/initialized.c",46); } - /*@ assert ¬\initialized(r); */ ; + /*@ assert !\initialized(r); */ ; { int __gen_e_acsl_initialized_15; __gen_e_acsl_initialized_15 = __e_acsl_initialized((void *)(r + 1), @@ -179,7 +179,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_15,1,"Assertion","main", "!\\initialized(r + 1)","tests/memory/initialized.c",47); } - /*@ assert ¬\initialized(r + 1); */ ; + /*@ assert !\initialized(r + 1); */ ; __e_acsl_initialize((void *)(d),sizeof(long)); d[0] = (long)1; { @@ -198,7 +198,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_17,1,"Assertion","main", "!\\initialized(&d[1])","tests/memory/initialized.c",51); } - /*@ assert ¬\initialized(&d[1]); */ ; + /*@ assert !\initialized(&d[1]); */ ; { int __gen_e_acsl_initialized_18; __gen_e_acsl_initialized_18 = __e_acsl_initialized((void *)(& d), @@ -206,7 +206,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_18,1,"Assertion","main", "!\\initialized(&d)","tests/memory/initialized.c",52); } - /*@ assert ¬\initialized(&d); */ ; + /*@ assert !\initialized(&d); */ ; { int __gen_e_acsl_initialized_19; __gen_e_acsl_initialized_19 = __e_acsl_initialized((void *)r, @@ -222,7 +222,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_20,1,"Assertion","main", "!\\initialized(r + 1)","tests/memory/initialized.c",54); } - /*@ assert ¬\initialized(r + 1); */ ; + /*@ assert !\initialized(r + 1); */ ; __e_acsl_initialize((void *)(& d[1]),sizeof(long)); d[1] = (long)1; { @@ -274,7 +274,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_26,1,"Assertion","main", "!\\initialized(p)","tests/memory/initialized.c",65); } - /*@ assert ¬\initialized(p); */ ; + /*@ assert !\initialized(p); */ ; __e_acsl_full_init((void *)(& q)); q = (int *)calloc((unsigned long)1,sizeof(int)); { @@ -301,26 +301,26 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_29,1,"Assertion","main", "!\\initialized(q)","tests/memory/initialized.c",76); } - /*@ assert ¬\initialized(q); */ ; + /*@ assert !\initialized(q); */ ; __e_acsl_full_init((void *)(& q)); q --; free((void *)p); free((void *)q); { int __gen_e_acsl_initialized_30; - /*@ assert Eva: dangling_pointer: ¬\dangling(&p); */ + /*@ assert Eva: dangling_pointer: !\dangling(&p); */ __gen_e_acsl_initialized_30 = __e_acsl_initialized((void *)p,sizeof(int)); __e_acsl_assert(! __gen_e_acsl_initialized_30,1,"Assertion","main", "!\\initialized(p)","tests/memory/initialized.c",84); } - /*@ assert ¬\initialized(p); */ ; + /*@ assert !\initialized(p); */ ; { int __gen_e_acsl_initialized_31; __gen_e_acsl_initialized_31 = __e_acsl_initialized((void *)q,sizeof(int)); __e_acsl_assert(! __gen_e_acsl_initialized_31,1,"Assertion","main", "!\\initialized(q)","tests/memory/initialized.c",85); } - /*@ assert ¬\initialized(q); */ ; + /*@ assert !\initialized(q); */ ; __e_acsl_full_init((void *)(& q)); q = (int *)calloc((unsigned long)3,sizeof(int)); { @@ -362,7 +362,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_34,1,"Assertion","main", "!\\initialized(q + 3)","tests/memory/initialized.c",93); } - /*@ assert ¬\initialized(q + 3); */ ; + /*@ assert !\initialized(q + 3); */ ; { int __gen_e_acsl_initialized_35; __gen_e_acsl_initialized_35 = __e_acsl_initialized((void *)(q + 4), @@ -370,7 +370,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_35,1,"Assertion","main", "!\\initialized(q + 4)","tests/memory/initialized.c",94); } - /*@ assert ¬\initialized(q + 4); */ ; + /*@ assert !\initialized(q + 4); */ ; { int __gen_e_acsl_initialized_36; __gen_e_acsl_initialized_36 = __e_acsl_initialized((void *)(q + 5), @@ -378,7 +378,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_36,1,"Assertion","main", "!\\initialized(q + 5)","tests/memory/initialized.c",95); } - /*@ assert ¬\initialized(q + 5); */ ; + /*@ assert !\initialized(q + 5); */ ; free((void *)q); __e_acsl_full_init((void *)(& q)); q = (int *)calloc((unsigned long)7,sizeof(int)); @@ -421,7 +421,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_39,1,"Assertion","main", "!\\initialized(q + 7)","tests/memory/initialized.c",101); } - /*@ assert ¬\initialized(q + 7); */ ; + /*@ assert !\initialized(q + 7); */ ; __e_acsl_full_init((void *)(& q)); q = (int *)realloc((void *)q,(unsigned long)10 * sizeof(int)); { @@ -446,7 +446,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_41,1,"Assertion","main", "!\\initialized(q + 7)","tests/memory/initialized.c",104); } - /*@ assert ¬\initialized(q + 7); */ ; + /*@ assert !\initialized(q + 7); */ ; { int __gen_e_acsl_initialized_42; __gen_e_acsl_initialized_42 = __e_acsl_initialized((void *)(q + 8), @@ -454,7 +454,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_42,1,"Assertion","main", "!\\initialized(q + 8)","tests/memory/initialized.c",105); } - /*@ assert ¬\initialized(q + 8); */ ; + /*@ assert !\initialized(q + 8); */ ; { int __gen_e_acsl_initialized_43; __gen_e_acsl_initialized_43 = __e_acsl_initialized((void *)(q + 9), @@ -462,7 +462,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_43,1,"Assertion","main", "!\\initialized(q + 9)","tests/memory/initialized.c",106); } - /*@ assert ¬\initialized(q + 9); */ ; + /*@ assert !\initialized(q + 9); */ ; free((void *)q); __e_acsl_full_init((void *)(& q)); q = (int *)calloc((unsigned long)2,sizeof(int)); @@ -505,7 +505,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_46,1,"Assertion","main", "!\\initialized(q + 2)","tests/memory/initialized.c",112); } - /*@ assert ¬\initialized(q + 2); */ ; + /*@ assert !\initialized(q + 2); */ ; { int __gen_e_acsl_initialized_47; __gen_e_acsl_initialized_47 = __e_acsl_initialized((void *)(q + 3), @@ -513,7 +513,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_47,1,"Assertion","main", "!\\initialized(q + 3)","tests/memory/initialized.c",113); } - /*@ assert ¬\initialized(q + 3); */ ; + /*@ assert !\initialized(q + 3); */ ; free((void *)q); __e_acsl_full_init((void *)(& q)); q = (int *)calloc((unsigned long)6,sizeof(int)); @@ -559,7 +559,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_50,1,"Assertion","main", "!\\initialized(q + 0)","tests/memory/initialized.c",121); } - /*@ assert ¬\initialized(q + 0); */ ; + /*@ assert !\initialized(q + 0); */ ; { int __gen_e_acsl_initialized_51; __gen_e_acsl_initialized_51 = __e_acsl_initialized((void *)(q + 1), @@ -567,7 +567,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_51,1,"Assertion","main", "!\\initialized(q + 1)","tests/memory/initialized.c",122); } - /*@ assert ¬\initialized(q + 1); */ ; + /*@ assert !\initialized(q + 1); */ ; { int __gen_e_acsl_initialized_52; __gen_e_acsl_initialized_52 = __e_acsl_initialized((void *)(q + 2), @@ -575,7 +575,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_52,1,"Assertion","main", "!\\initialized(q + 2)","tests/memory/initialized.c",123); } - /*@ assert ¬\initialized(q + 2); */ ; + /*@ assert !\initialized(q + 2); */ ; { int __gen_e_acsl_initialized_53; __gen_e_acsl_initialized_53 = __e_acsl_initialized((void *)(q + 3), @@ -583,7 +583,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_53,1,"Assertion","main", "!\\initialized(q + 3)","tests/memory/initialized.c",124); } - /*@ assert ¬\initialized(q + 3); */ ; + /*@ assert !\initialized(q + 3); */ ; { int __gen_e_acsl_initialized_54; __gen_e_acsl_initialized_54 = __e_acsl_initialized((void *)(q + 4), @@ -591,7 +591,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_54,1,"Assertion","main", "!\\initialized(q + 4)","tests/memory/initialized.c",125); } - /*@ assert ¬\initialized(q + 4); */ ; + /*@ assert !\initialized(q + 4); */ ; { int __gen_e_acsl_initialized_55; __gen_e_acsl_initialized_55 = __e_acsl_initialized((void *)(q + 5), @@ -599,7 +599,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_55,1,"Assertion","main", "!\\initialized(q + 5)","tests/memory/initialized.c",126); } - /*@ assert ¬\initialized(q + 5); */ ; + /*@ assert !\initialized(q + 5); */ ; __e_acsl_full_init((void *)(& q)); q = (int *)realloc((void *)q,(unsigned long)3 * sizeof(int)); { @@ -609,7 +609,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_56,1,"Assertion","main", "!\\initialized(q + 0)","tests/memory/initialized.c",128); } - /*@ assert ¬\initialized(q + 0); */ ; + /*@ assert !\initialized(q + 0); */ ; { int __gen_e_acsl_initialized_57; __gen_e_acsl_initialized_57 = __e_acsl_initialized((void *)(q + 1), @@ -617,7 +617,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_57,1,"Assertion","main", "!\\initialized(q + 1)","tests/memory/initialized.c",129); } - /*@ assert ¬\initialized(q + 1); */ ; + /*@ assert !\initialized(q + 1); */ ; { int __gen_e_acsl_initialized_58; __gen_e_acsl_initialized_58 = __e_acsl_initialized((void *)(q + 2), @@ -625,7 +625,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_58,1,"Assertion","main", "!\\initialized(q + 2)","tests/memory/initialized.c",130); } - /*@ assert ¬\initialized(q + 2); */ ; + /*@ assert !\initialized(q + 2); */ ; free((void *)q); __e_acsl_full_init((void *)(& q)); q = (int *)(& q - 1024 * 5); @@ -637,7 +637,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_59,1,"Assertion","main", "!\\initialized(q)","tests/memory/initialized.c",139); } - /*@ assert ¬\initialized(q); */ ; + /*@ assert !\initialized(q); */ ; __e_acsl_full_init((void *)(& p)); p = (int *)0; { @@ -646,7 +646,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_initialized_60,1,"Assertion","main", "!\\initialized(p)","tests/memory/initialized.c",142); } - /*@ assert ¬\initialized(p); */ ; + /*@ assert !\initialized(p); */ ; int size = 100; char *partsc = malloc((unsigned long)size * sizeof(char)); char *partsi = malloc((unsigned long)size * sizeof(int)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c b/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c index 6162260111829a4c53f7ab287aeb99ef1ed8f4c9..3355e369ea680cf1739050f9c19103d2b1ef339c 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c @@ -27,7 +27,7 @@ void f(void) __e_acsl_assert((int)*(T + G) == 98,1,"Assertion","f", "*(T + G) == \'b\'","tests/memory/literal_string.i",11); } - /*@ assert *(T + G) ≡ 'b'; */ ; + /*@ assert *(T + G) == 'b'; */ ; G ++; return; } @@ -114,7 +114,7 @@ int main(void) __e_acsl_assert((int)*(S + G2) == 111,1,"Assertion","main", "*(S + G2) == \'o\'","tests/memory/literal_string.i",25); } - /*@ assert *(S + G2) ≡ 'o'; */ ; + /*@ assert *(S + G2) == 'o'; */ ; { int __gen_e_acsl_initialized; __gen_e_acsl_initialized = __e_acsl_initialized((void *)S,sizeof(char)); @@ -146,7 +146,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and,1,"Assertion","main","!\\valid(SS)", "tests/memory/literal_string.i",28); } - /*@ assert ¬\valid(SS); */ ; + /*@ assert !\valid(SS); */ ; f(); s_str ++; l_str ++; diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c b/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c index 61c8808202551d230a623137e95c4c4d451bbc86..747618f9ffd35d5e83006f73f76eae2b472f4e30 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c @@ -5,7 +5,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ requires valid_string_s: valid_read_string(s); - ensures acsl_c_equiv: \result ≡ strlen(\old(s)); + ensures acsl_c_equiv: \result == strlen(\old(s)); assigns \result; assigns \result \from (indirect: *(s + (0 ..))); */ @@ -45,7 +45,7 @@ int __gen_e_acsl_main(int argc, char **argv) "\\forall int k; 0 <= k <= argc ==> \\valid(argv + k)", "tests/memory/mainargs.c",12); } - /*@ assert ∀ int k; 0 ≤ k ≤ argc ⇒ \valid(argv + k); */ ; + /*@ assert \forall int k; 0 <= k <= argc ==> \valid(argv + k); */ ; { unsigned long __gen_e_acsl_block_length; __e_acsl_mpz_t __gen_e_acsl_block_length_2; @@ -62,7 +62,7 @@ int __gen_e_acsl_main(int argc, char **argv) __gmpz_clear(__gen_e_acsl_block_length_2); __gmpz_clear(__gen_e_acsl_); } - /*@ assert \block_length(argv) ≡ (argc + 1) * sizeof(char *); */ ; + /*@ assert \block_length(argv) == (argc + 1) * sizeof(char *); */ ; { int __gen_e_acsl_valid_read; __gen_e_acsl_valid_read = __e_acsl_valid_read((void *)(argv + argc), @@ -76,7 +76,7 @@ int __gen_e_acsl_main(int argc, char **argv) __e_acsl_assert(*(argv + argc) == (char *)0,1,"Assertion","main", "*(argv + argc) == \\null","tests/memory/mainargs.c",15); } - /*@ assert *(argv + argc) ≡ \null; */ ; + /*@ assert *(argv + argc) == \null; */ ; { int __gen_e_acsl_initialized; int __gen_e_acsl_and; @@ -103,7 +103,7 @@ int __gen_e_acsl_main(int argc, char **argv) __e_acsl_assert(! __gen_e_acsl_and,1,"Assertion","main", "!\\valid(*(argv + argc))","tests/memory/mainargs.c",16); } - /*@ assert ¬\valid(*(argv + argc)); */ ; + /*@ assert !\valid(*(argv + argc)); */ ; i = 0; while (i < argc) { { @@ -171,7 +171,8 @@ int __gen_e_acsl_main(int argc, char **argv) "\\forall int k; 0 <= k <= len ==> \\valid(*(argv + i) + k)", "tests/memory/mainargs.c",20); } - /*@ assert ∀ int k; 0 ≤ k ≤ len ⇒ \valid(*(argv + i) + k); */ ; + /*@ assert \forall int k; 0 <= k <= len ==> \valid(*(argv + i) + k); */ + ; } i ++; } @@ -205,7 +206,7 @@ int main(int argc, char **argv) } /*@ requires valid_string_s: valid_read_string(s); - ensures acsl_c_equiv: \result ≡ strlen(\old(s)); + ensures acsl_c_equiv: \result == strlen(\old(s)); assigns \result; assigns \result \from (indirect: *(s + (0 ..))); */ diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c index 2f9c48d8a945ad526d97dbb871b9689e4d534d93..bb5be992590ffc2d04b0ab0993e5d7d862c40ab7 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c @@ -7,8 +7,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ requires valid_memptr: \valid(memptr); requires alignment_is_a_suitable_power_of_two: - alignment ≥ sizeof(void *) ∧ - ((size_t)alignment & ((size_t)alignment - 1)) ≡ 0; + alignment >= sizeof(void *) && + ((size_t)alignment & ((size_t)alignment - 1)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: alignment), size, __fc_heap_status; @@ -20,7 +20,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; behavior allocation: assumes can_allocate: is_allocable(size); ensures allocation: \fresh{Old, Here}(*\old(memptr),\old(size)); - ensures result_zero: \result ≡ 0; + ensures result_zero: \result == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: alignment), size, __fc_heap_status; @@ -29,8 +29,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(size); - ensures result_non_zero: \result < 0 ∨ \result > 0; + assumes cannot_allocate: !is_allocable(size); + ensures result_non_zero: \result < 0 || \result > 0; assigns \result; assigns \result \from (indirect: alignment); allocates \nothing; @@ -85,7 +85,7 @@ int main(int argc, char const **argv) __e_acsl_assert(__gen_e_acsl_block_length == 15UL,1,"Assertion","main", "\\block_length(p) == 15","tests/memory/memalign.c",16); } - /*@ assert \block_length(p) ≡ 15; */ ; + /*@ assert \block_length(p) == 15; */ ; { int __gen_e_acsl_freeable; __gen_e_acsl_freeable = __e_acsl_freeable((void *)p); @@ -109,27 +109,27 @@ int main(int argc, char const **argv) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","main","!\\valid(p)", "tests/memory/memalign.c",19); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; __e_acsl_full_init((void *)(& a)); a = (char *)aligned_alloc((unsigned long)256,(unsigned long)12); __e_acsl_assert(a == (char *)0,1,"Assertion","main","a == \\null", "tests/memory/memalign.c",23); - /*@ assert a ≡ \null; */ ; + /*@ assert a == \null; */ ; __e_acsl_full_init((void *)(& a)); a = (char *)aligned_alloc((unsigned long)255,(unsigned long)512); __e_acsl_assert(a == (char *)0,1,"Assertion","main","a == \\null", "tests/memory/memalign.c",26); - /*@ assert a ≡ \null; */ ; + /*@ assert a == \null; */ ; __e_acsl_full_init((void *)(& a)); a = (char *)aligned_alloc((unsigned long)0,(unsigned long)512); __e_acsl_assert(a == (char *)0,1,"Assertion","main","a == \\null", "tests/memory/memalign.c",29); - /*@ assert a ≡ \null; */ ; + /*@ assert a == \null; */ ; __e_acsl_full_init((void *)(& a)); a = (char *)aligned_alloc((unsigned long)256,(unsigned long)512); __e_acsl_assert(a != (char *)0,1,"Assertion","main","a != \\null", "tests/memory/memalign.c",32); - /*@ assert a ≢ \null; */ ; + /*@ assert a != \null; */ ; { int __gen_e_acsl_initialized_3; int __gen_e_acsl_and_3; @@ -153,7 +153,7 @@ int main(int argc, char const **argv) "main","\\block_length(a) == 512", "tests/memory/memalign.c",34); } - /*@ assert \block_length(a) ≡ 512; */ ; + /*@ assert \block_length(a) == 512; */ ; { int __gen_e_acsl_freeable_2; __gen_e_acsl_freeable_2 = __e_acsl_freeable((void *)a); @@ -177,7 +177,7 @@ int main(int argc, char const **argv) __e_acsl_assert(! __gen_e_acsl_and_4,1,"Assertion","main","!\\valid(a)", "tests/memory/memalign.c",38); } - /*@ assert ¬\valid(a); */ ; + /*@ assert !\valid(a); */ ; __retres = 0; __e_acsl_delete_block((void *)(& a)); __e_acsl_delete_block((void *)(& p)); @@ -189,8 +189,8 @@ int main(int argc, char const **argv) /*@ requires valid_memptr: \valid(memptr); requires alignment_is_a_suitable_power_of_two: - alignment ≥ sizeof(void *) ∧ - ((size_t)alignment & ((size_t)alignment - 1)) ≡ 0; + alignment >= sizeof(void *) && + ((size_t)alignment & ((size_t)alignment - 1)) == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: alignment), size, __fc_heap_status; @@ -202,7 +202,7 @@ int main(int argc, char const **argv) behavior allocation: assumes can_allocate: is_allocable(size); ensures allocation: \fresh{Old, Here}(*\old(memptr),\old(size)); - ensures result_zero: \result ≡ 0; + ensures result_zero: \result == 0; assigns __fc_heap_status, \result; assigns __fc_heap_status \from (indirect: alignment), size, __fc_heap_status; @@ -211,8 +211,8 @@ int main(int argc, char const **argv) (indirect: __fc_heap_status); behavior no_allocation: - assumes cannot_allocate: ¬is_allocable(size); - ensures result_non_zero: \result < 0 ∨ \result > 0; + assumes cannot_allocate: !is_allocable(size); + ensures result_non_zero: \result < 0 || \result > 0; assigns \result; assigns \result \from (indirect: alignment); allocates \nothing; diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c b/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c index df3a77b8d7a83dbe3650e8f9cfe3704ad8bdd2c5..c901f0cb51ec7b7c2a2b663a03dd00e00d21e969 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c @@ -14,73 +14,73 @@ int main(int argc, char **argv) __e_acsl_assert(__e_acsl_heap_allocation_size == 7UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 7", "tests/memory/memsize.c",15); - /*@ assert __e_acsl_heap_allocation_size ≡ 7; */ ; + /*@ assert __e_acsl_heap_allocation_size == 7; */ ; char *b = malloc((unsigned long)14); __e_acsl_assert(__e_acsl_heap_allocation_size == 21UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 21", "tests/memory/memsize.c",17); - /*@ assert __e_acsl_heap_allocation_size ≡ 21; */ ; + /*@ assert __e_acsl_heap_allocation_size == 21; */ ; free((void *)a); __e_acsl_assert(__e_acsl_heap_allocation_size == 14UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 14", "tests/memory/memsize.c",21); - /*@ assert __e_acsl_heap_allocation_size ≡ 14; */ ; + /*@ assert __e_acsl_heap_allocation_size == 14; */ ; a = (char *)0; free((void *)a); __e_acsl_assert(__e_acsl_heap_allocation_size == 14UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 14", "tests/memory/memsize.c",26); - /*@ assert __e_acsl_heap_allocation_size ≡ 14; */ ; + /*@ assert __e_acsl_heap_allocation_size == 14; */ ; b = (char *)realloc((void *)b,(unsigned long)9); __e_acsl_assert(__e_acsl_heap_allocation_size == 9UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 9", "tests/memory/memsize.c",30); - /*@ assert __e_acsl_heap_allocation_size ≡ 9; */ ; + /*@ assert __e_acsl_heap_allocation_size == 9; */ ; b = (char *)realloc((void *)b,(unsigned long)18); __e_acsl_assert(__e_acsl_heap_allocation_size == 18UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 18", "tests/memory/memsize.c",34); - /*@ assert __e_acsl_heap_allocation_size ≡ 18; */ ; + /*@ assert __e_acsl_heap_allocation_size == 18; */ ; b = (char *)realloc((void *)b,(unsigned long)0); b = (char *)0; __e_acsl_assert(__e_acsl_heap_allocation_size == 0UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 0", "tests/memory/memsize.c",39); - /*@ assert __e_acsl_heap_allocation_size ≡ 0; */ ; + /*@ assert __e_acsl_heap_allocation_size == 0; */ ; b = (char *)realloc((void *)b,(unsigned long)8); __e_acsl_assert(__e_acsl_heap_allocation_size == 8UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 8", "tests/memory/memsize.c",43); - /*@ assert __e_acsl_heap_allocation_size ≡ 8; */ ; + /*@ assert __e_acsl_heap_allocation_size == 8; */ ; b = (char *)realloc((void *)0,(unsigned long)8); __e_acsl_assert(__e_acsl_heap_allocation_size == 16UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 16", "tests/memory/memsize.c",47); - /*@ assert __e_acsl_heap_allocation_size ≡ 16; */ ; + /*@ assert __e_acsl_heap_allocation_size == 16; */ ; b = (char *)realloc((void *)0,18446744073709551615UL); __e_acsl_assert(__e_acsl_heap_allocation_size == 16UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 16", "tests/memory/memsize.c",51); - /*@ assert __e_acsl_heap_allocation_size ≡ 16; */ ; + /*@ assert __e_acsl_heap_allocation_size == 16; */ ; __e_acsl_assert(b == (char *)0,1,"Assertion","main","b == (char *)0", "tests/memory/memsize.c",52); - /*@ assert b ≡ (char *)0; */ ; + /*@ assert b == (char *)0; */ ; b = (char *)calloc(18446744073709551615UL,18446744073709551615UL); __e_acsl_assert(__e_acsl_heap_allocation_size == 16UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 16", "tests/memory/memsize.c",56); - /*@ assert __e_acsl_heap_allocation_size ≡ 16; */ ; + /*@ assert __e_acsl_heap_allocation_size == 16; */ ; __e_acsl_assert(b == (char *)0,1,"Assertion","main","b == (char *)0", "tests/memory/memsize.c",57); - /*@ assert b ≡ (char *)0; */ ; + /*@ assert b == (char *)0; */ ; b = (char *)malloc(18446744073709551615UL); __e_acsl_assert(__e_acsl_heap_allocation_size == 16UL,1,"Assertion","main", "__e_acsl_heap_allocation_size == 16", "tests/memory/memsize.c",61); - /*@ assert __e_acsl_heap_allocation_size ≡ 16; */ ; + /*@ assert __e_acsl_heap_allocation_size == 16; */ ; __e_acsl_assert(b == (char *)0,1,"Assertion","main","b == (char *)0", "tests/memory/memsize.c",62); - /*@ assert b ≡ (char *)0; */ ; + /*@ assert b == (char *)0; */ ; __retres = 0; __e_acsl_memory_clean(); return __retres; diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_null.c b/src/plugins/e-acsl/tests/memory/oracle/gen_null.c index 375f0da012931441d10f4a33032c16acccb5d7a7..4be12c98a6085a2da8b4e6af172448a64c1702d8 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_null.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_null.c @@ -9,7 +9,7 @@ int main(void) int __retres; __e_acsl_assert((void *)0 == (void *)0,1,"Assertion","main", "\\null == (void *)0","tests/memory/null.i",6); - /*@ assert \null ≡ (void *)0; */ ; + /*@ assert \null == (void *)0; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c b/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c index b6b52a83efa197495cd28c47be378cd2ca9ef3cf..447174a36b515a4b34084df47724fc3fbe171db2 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c @@ -38,21 +38,21 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset == 0UL,1,"Assertion","main", "\\offset((int *)A) == 0","tests/memory/offset.c",13); } - /*@ assert \offset((int *)A) ≡ 0; */ ; + /*@ assert \offset((int *)A) == 0; */ ; { unsigned long __gen_e_acsl_offset_2; __gen_e_acsl_offset_2 = __e_acsl_offset((void *)(& A[3])); __e_acsl_assert(__gen_e_acsl_offset_2 == 12UL,1,"Assertion","main", "\\offset(&A[3]) == 12","tests/memory/offset.c",14); } - /*@ assert \offset(&A[3]) ≡ 12; */ ; + /*@ assert \offset(&A[3]) == 12; */ ; { unsigned long __gen_e_acsl_offset_3; __gen_e_acsl_offset_3 = __e_acsl_offset((void *)PA); __e_acsl_assert(__gen_e_acsl_offset_3 == 0UL,1,"Assertion","main", "\\offset(PA) == 0","tests/memory/offset.c",15); } - /*@ assert \offset(PA) ≡ 0; */ ; + /*@ assert \offset(PA) == 0; */ ; PA ++; { unsigned long __gen_e_acsl_offset_4; @@ -60,7 +60,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_4 == 8UL,1,"Assertion","main", "\\offset(PA + 1) == 8","tests/memory/offset.c",17); } - /*@ assert \offset(PA + 1) ≡ 8; */ ; + /*@ assert \offset(PA + 1) == 8; */ ; int a[4] = {1, 2, 3, 4}; __e_acsl_store_block((void *)(a),(size_t)16); __e_acsl_full_init((void *)(& a)); @@ -70,21 +70,21 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_5 == 0UL,1,"Assertion","main", "\\offset((int *)a) == 0","tests/memory/offset.c",21); } - /*@ assert \offset((int *)a) ≡ 0; */ ; + /*@ assert \offset((int *)a) == 0; */ ; { unsigned long __gen_e_acsl_offset_6; __gen_e_acsl_offset_6 = __e_acsl_offset((void *)(& a[1])); __e_acsl_assert(__gen_e_acsl_offset_6 == 4UL,1,"Assertion","main", "\\offset(&a[1]) == 4","tests/memory/offset.c",22); } - /*@ assert \offset(&a[1]) ≡ 4; */ ; + /*@ assert \offset(&a[1]) == 4; */ ; { unsigned long __gen_e_acsl_offset_7; __gen_e_acsl_offset_7 = __e_acsl_offset((void *)(& a[3])); __e_acsl_assert(__gen_e_acsl_offset_7 == 12UL,1,"Assertion","main", "\\offset(&a[3]) == 12","tests/memory/offset.c",23); } - /*@ assert \offset(&a[3]) ≡ 12; */ ; + /*@ assert \offset(&a[3]) == 12; */ ; long l = (long)4; __e_acsl_store_block((void *)(& l),(size_t)8); __e_acsl_full_init((void *)(& l)); @@ -97,28 +97,28 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_8 == 0UL,1,"Assertion","main", "\\offset(&l) == 0","tests/memory/offset.c",28); } - /*@ assert \offset(&l) ≡ 0; */ ; + /*@ assert \offset(&l) == 0; */ ; { unsigned long __gen_e_acsl_offset_9; __gen_e_acsl_offset_9 = __e_acsl_offset((void *)pl); __e_acsl_assert(__gen_e_acsl_offset_9 == 0UL,1,"Assertion","main", "\\offset(pl) == 0","tests/memory/offset.c",29); } - /*@ assert \offset(pl) ≡ 0; */ ; + /*@ assert \offset(pl) == 0; */ ; { unsigned long __gen_e_acsl_offset_10; __gen_e_acsl_offset_10 = __e_acsl_offset((void *)(pl + 1)); __e_acsl_assert(__gen_e_acsl_offset_10 == 1UL,1,"Assertion","main", "\\offset(pl + 1) == 1","tests/memory/offset.c",30); } - /*@ assert \offset(pl + 1) ≡ 1; */ ; + /*@ assert \offset(pl + 1) == 1; */ ; { unsigned long __gen_e_acsl_offset_11; __gen_e_acsl_offset_11 = __e_acsl_offset((void *)(pl + 7)); __e_acsl_assert(__gen_e_acsl_offset_11 == 7UL,1,"Assertion","main", "\\offset(pl + 7) == 7","tests/memory/offset.c",31); } - /*@ assert \offset(pl + 7) ≡ 7; */ ; + /*@ assert \offset(pl + 7) == 7; */ ; int *pi = (int *)(& l); __e_acsl_store_block((void *)(& pi),(size_t)8); __e_acsl_full_init((void *)(& pi)); @@ -128,7 +128,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_12 == 0UL,1,"Assertion","main", "\\offset(pi) == 0","tests/memory/offset.c",33); } - /*@ assert \offset(pi) ≡ 0; */ ; + /*@ assert \offset(pi) == 0; */ ; __e_acsl_full_init((void *)(& pi)); pi ++; { @@ -137,7 +137,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_13 == 4UL,1,"Assertion","main", "\\offset(pi) == 4","tests/memory/offset.c",35); } - /*@ assert \offset(pi) ≡ 4; */ ; + /*@ assert \offset(pi) == 4; */ ; char *p = malloc((unsigned long)12); __e_acsl_store_block((void *)(& p),(size_t)8); __e_acsl_full_init((void *)(& p)); @@ -147,21 +147,21 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_14 == 0UL,1,"Assertion","main", "\\offset(p) == 0","tests/memory/offset.c",39); } - /*@ assert \offset(p) ≡ 0; */ ; + /*@ assert \offset(p) == 0; */ ; { unsigned long __gen_e_acsl_offset_15; __gen_e_acsl_offset_15 = __e_acsl_offset((void *)(p + 1)); __e_acsl_assert(__gen_e_acsl_offset_15 == 1UL,1,"Assertion","main", "\\offset(p + 1) == 1","tests/memory/offset.c",40); } - /*@ assert \offset(p + 1) ≡ 1; */ ; + /*@ assert \offset(p + 1) == 1; */ ; { unsigned long __gen_e_acsl_offset_16; __gen_e_acsl_offset_16 = __e_acsl_offset((void *)(p + 11)); __e_acsl_assert(__gen_e_acsl_offset_16 == 11UL,1,"Assertion","main", "\\offset(p + 11) == 11","tests/memory/offset.c",41); } - /*@ assert \offset(p + 11) ≡ 11; */ ; + /*@ assert \offset(p + 11) == 11; */ ; __e_acsl_full_init((void *)(& p)); p += 5; { @@ -170,14 +170,14 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_17 == 10UL,1,"Assertion","main", "\\offset(p + 5) == 10","tests/memory/offset.c",43); } - /*@ assert \offset(p + 5) ≡ 10; */ ; + /*@ assert \offset(p + 5) == 10; */ ; { unsigned long __gen_e_acsl_offset_18; __gen_e_acsl_offset_18 = __e_acsl_offset((void *)(p - 5)); __e_acsl_assert(__gen_e_acsl_offset_18 == 0UL,1,"Assertion","main", "\\offset(p - 5) == 0","tests/memory/offset.c",44); } - /*@ assert \offset(p - 5) ≡ 0; */ ; + /*@ assert \offset(p - 5) == 0; */ ; long *q = malloc((unsigned long)30 * sizeof(long)); __e_acsl_store_block((void *)(& q),(size_t)8); __e_acsl_full_init((void *)(& q)); @@ -187,7 +187,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_19 == 0UL,1,"Assertion","main", "\\offset(q) == 0","tests/memory/offset.c",49); } - /*@ assert \offset(q) ≡ 0; */ ; + /*@ assert \offset(q) == 0; */ ; __e_acsl_full_init((void *)(& q)); q ++; { @@ -196,7 +196,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_offset_20 == 8UL,1,"Assertion","main", "\\offset(q) == sizeof(long)","tests/memory/offset.c",51); } - /*@ assert \offset(q) ≡ sizeof(long); */ ; + /*@ assert \offset(q) == sizeof(long); */ ; __e_acsl_full_init((void *)(& q)); q += 2; { @@ -206,7 +206,7 @@ int main(void) "\\offset(q) == sizeof(long) * 3", "tests/memory/offset.c",53); } - /*@ assert \offset(q) ≡ sizeof(long) * 3; */ ; + /*@ assert \offset(q) == sizeof(long) * 3; */ ; __e_acsl_full_init((void *)(& q)); q += 4; { @@ -216,7 +216,7 @@ int main(void) "\\offset(q) == sizeof(long) * 7", "tests/memory/offset.c",55); } - /*@ assert \offset(q) ≡ sizeof(long) * 7; */ ; + /*@ assert \offset(q) == sizeof(long) * 7; */ ; __retres = 0; __e_acsl_delete_block((void *)(& q)); __e_acsl_delete_block((void *)(& p)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c b/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c index 7de63880550589245145a85f4f5185e7d4e9deb2..cab6f22f1ec0c4cb755055e35df9d6884791cfe9 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c @@ -13,10 +13,10 @@ int main(void) int __retres; __e_acsl_assert(1,1,"Assertion","main","\'c\' == \'c\'", "tests/memory/other_constants.i",10); - /*@ assert 'c' ≡ 'c'; */ ; + /*@ assert 'c' == 'c'; */ ; __e_acsl_assert(1,1,"Assertion","main","false != true", "tests/memory/other_constants.i",11); - /*@ assert false ≢ true; */ ; + /*@ assert false != true; */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c index 3aadcd229f8b1c88013602b610b59b8b75255ca8..12aa050673841b3f8ada1c6efd9f0aa1a1528945 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c @@ -34,17 +34,17 @@ int main(void) __e_acsl_assert(*p == 1,1,"Assertion","main","*p == 1", "tests/memory/ptr.i",12); } - /*@ assert *p ≡ 1; */ ; + /*@ assert *p == 1; */ ; __e_acsl_assert(t[0] == 2,1,"Assertion","main","t[0] == 2", "tests/memory/ptr.i",13); - /*@ assert t[0] ≡ 2; */ ; + /*@ assert t[0] == 2; */ ; __e_acsl_assert(t[2] == 4,1,"Assertion","main","t[2] == 4", "tests/memory/ptr.i",14); - /*@ assert t[2] ≡ 4; */ ; + /*@ assert t[2] == 4; */ ; __e_acsl_assert(t[2] == 4,1,"Assertion","main", "t[(2 * sizeof(int)) / sizeof((int)0x0)] == 4", "tests/memory/ptr.i",15); - /*@ assert t[(2 * sizeof(int)) / sizeof((int)0x0)] ≡ 4; */ ; + /*@ assert t[(2 * sizeof(int)) / sizeof((int)0x0)] == 4; */ ; { int i = 0; while (i < 2) { @@ -54,7 +54,7 @@ int main(void) "tests/memory/ptr.i",18); __e_acsl_assert((long)t[i] == i + 2L,1,"Assertion","main", "t[i] == i + 2","tests/memory/ptr.i",18); - /*@ assert t[i] ≡ i + 2; */ ; + /*@ assert t[i] == i + 2; */ ; __e_acsl_assert(2L - i < 3L,1,"RTE","main", "index_bound: (long)(2 - i) < 3","tests/memory/ptr.i", 19); @@ -63,7 +63,7 @@ int main(void) 19); __e_acsl_assert((long)t[2L - i] == 4L - i,1,"Assertion","main", "t[2 - i] == 4 - i","tests/memory/ptr.i",19); - /*@ assert t[2 - i] ≡ 4 - i; */ ; + /*@ assert t[2 - i] == 4 - i; */ ; { int __gen_e_acsl_valid_read_2; __gen_e_acsl_valid_read_2 = __e_acsl_valid_read((void *)(& t[2] - i), @@ -76,7 +76,7 @@ int main(void) __e_acsl_assert((long)*(& t[2] - i) == 4L - i,1,"Assertion","main", "*(&t[2] - i) == 4 - i","tests/memory/ptr.i",20); } - /*@ assert *(&t[2] - i) ≡ 4 - i; */ ; + /*@ assert *(&t[2] - i) == 4 - i; */ ; i ++; } } @@ -102,7 +102,7 @@ int main(void) __e_acsl_assert(*p == 5,1,"Assertion","main","*p == 5", "tests/memory/ptr.i",26); } - /*@ assert *p ≡ 5; */ ; + /*@ assert *p == 5; */ ; int k = -1; { int __gen_e_acsl_valid_read_4; @@ -115,7 +115,7 @@ int main(void) __e_acsl_assert(*(p + k) == 3,1,"Assertion","main","*(p + k) == 3", "tests/memory/ptr.i",28); } - /*@ assert *(p + k) ≡ 3; */ ; + /*@ assert *(p + k) == 3; */ ; __retres = 0; __e_acsl_delete_block((void *)(& p)); __e_acsl_delete_block((void *)(t)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c index 044b08b27b4463f0fc2398a233064e949ad5a7b8..d1c59dc46c4692c21898712ecec09f8f0e0c8e0a 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c @@ -9,7 +9,7 @@ struct S { float *b ; float *c ; }; -/*@ requires ¬\valid(s + (3 .. n + 1000)); */ +/*@ requires !\valid(s + (3 .. n + 1000)); */ void __gen_e_acsl_f(char *s, long n); void f(char *s, long n) @@ -18,7 +18,7 @@ void f(char *s, long n) } /*@ requires \valid(ptr + (0 .. size - 1)); - ensures ¬\valid(\old(ptr) + (0 .. \old(size) + 1)); + ensures !\valid(\old(ptr) + (0 .. \old(size) + 1)); */ void __gen_e_acsl_g(long *ptr, size_t size); @@ -95,7 +95,7 @@ int main(void) "!\\valid(a + (10 .. 11))", "tests/memory/ranges_in_builtins.c",27); } - /*@ assert ¬\valid(a + (10 .. 11)); */ ; + /*@ assert !\valid(a + (10 .. 11)); */ ; free((void *)a); __e_acsl_full_init((void *)(& b)); b = (char *)malloc((unsigned long)10 * sizeof(char)); @@ -128,7 +128,7 @@ int main(void) "!\\valid(b + (10 .. 15))", "tests/memory/ranges_in_builtins.c",33); } - /*@ assert ¬\valid(b + (10 .. 15)); */ ; + /*@ assert !\valid(b + (10 .. 15)); */ ; long t[3] = {7l, 8l, 9l}; __e_acsl_store_block((void *)(t),(size_t)24); __e_acsl_full_init((void *)(& t)); @@ -161,7 +161,7 @@ int main(void) "!\\valid(&t[3 .. 5])", "tests/memory/ranges_in_builtins.c",37); } - /*@ assert ¬\valid(&t[3 .. 5]); */ ; + /*@ assert !\valid(&t[3 .. 5]); */ ; __gen_e_acsl_g(t,(unsigned long)3); __e_acsl_initialize((void *)(t2),sizeof(double)); t2[0] = 0.5; @@ -196,7 +196,7 @@ int main(void) "!\\initialized(&t2[2 .. 3])", "tests/memory/ranges_in_builtins.c",44); } - /*@ assert ¬\initialized(&t2[2 .. 3]); */ ; + /*@ assert !\initialized(&t2[2 .. 3]); */ ; { int __gen_e_acsl_size_10; int __gen_e_acsl_if_10; @@ -210,7 +210,7 @@ int main(void) "!\\initialized(b + (0 .. 9))", "tests/memory/ranges_in_builtins.c",46); } - /*@ assert ¬\initialized(b + (0 .. 9)); */ ; + /*@ assert !\initialized(b + (0 .. 9)); */ ; free((void *)b); int n = 2; { @@ -253,7 +253,7 @@ int main(void) "!\\initialized(&t3[n - 1 .. n + 2][1][0 .. 1])", "tests/memory/ranges_in_builtins.c",51); } - /*@ assert ¬\initialized(&t3[n - 1 .. n + 2][1][0 .. 1]); */ ; + /*@ assert !\initialized(&t3[n - 1 .. n + 2][1][0 .. 1]); */ ; { int __gen_e_acsl_size_11; int __gen_e_acsl_if_11; @@ -270,7 +270,7 @@ int main(void) "!\\valid_read(&t3[6][1][0] + (2 .. 10))", "tests/memory/ranges_in_builtins.c",53); } - /*@ assert ¬\valid_read(&t3[6][1][0] + (2 .. 10)); */ ; + /*@ assert !\valid_read(&t3[6][1][0] + (2 .. 10)); */ ; { int __gen_e_acsl_forall_3; long __gen_e_acsl_range_3; @@ -361,7 +361,7 @@ int main(void) "!\\initialized(s.b + (0 .. 1))", "tests/memory/ranges_in_builtins.c",63); } - /*@ assert ¬\initialized(s.b + (0 .. 1)); */ ; + /*@ assert !\initialized(s.b + (0 .. 1)); */ ; int size1 = 5; int size2 = 9; __e_acsl_full_init((void *)(& multi_dynamic)); @@ -443,7 +443,7 @@ int main(void) } /*@ requires \valid(ptr + (0 .. size - 1)); - ensures ¬\valid(\old(ptr) + (0 .. \old(size) + 1)); + ensures !\valid(\old(ptr) + (0 .. \old(size) + 1)); */ void __gen_e_acsl_g(long *ptr, size_t size) { @@ -611,7 +611,7 @@ void __gen_e_acsl_g(long *ptr, size_t size) } } -/*@ requires ¬\valid(s + (3 .. n + 1000)); */ +/*@ requires !\valid(s + (3 .. n + 1000)); */ void __gen_e_acsl_f(char *s, long n) { { diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c b/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c index d1ab26cc2eb68711e15231c8fd9dab0201e112c5..8937ef07e3bcb47ccaed72123c1055f0273554b3 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c @@ -108,7 +108,7 @@ int main(void) "!\\separated(&a, &b, &c, d)", "tests/memory/separated.c",15); } - /*@ assert ¬\separated(&a, &b, &c, d); */ ; + /*@ assert !\separated(&a, &b, &c, d); */ ; __e_acsl_delete_block((void *)(& d)); __e_acsl_delete_block((void *)(& c)); __e_acsl_delete_block((void *)(& b)); @@ -217,7 +217,7 @@ int main(void) "!\\separated(&array[0 .. 10], &array[5 .. 15])", "tests/memory/separated.c",22); } - /*@ assert ¬\separated(&array[0 .. 10], &array[5 .. 15]); */ ; + /*@ assert !\separated(&array[0 .. 10], &array[5 .. 15]); */ ; { int __gen_e_acsl_size_9; int __gen_e_acsl_if_9; @@ -267,7 +267,7 @@ int main(void) "!\\separated(&array[0 .. 19], &array[5 .. 15])", "tests/memory/separated.c",23); } - /*@ assert ¬\separated(&array[0 .. 19], &array[5 .. 15]); */ ; + /*@ assert !\separated(&array[0 .. 19], &array[5 .. 15]); */ ; { int __gen_e_acsl_valid_read_14; int __gen_e_acsl_valid_read_15; @@ -344,7 +344,7 @@ int main(void) "!\\separated(&array[0 .. 1], &array[1 .. 2])", "tests/memory/separated.c",25); } - /*@ assert ¬\separated(&array[0 .. 1], &array[1 .. 2]); */ ; + /*@ assert !\separated(&array[0 .. 1], &array[1 .. 2]); */ ; { int __gen_e_acsl_size_17; int __gen_e_acsl_if_17; @@ -556,7 +556,7 @@ int main(void) "!\\separated(a_0, b_0, c_0)", "tests/memory/separated.c",37); } - /*@ assert ¬\separated(a_0, b_0, c_0); */ ; + /*@ assert !\separated(a_0, b_0, c_0); */ ; free((void *)a_0); free((void *)b_0); __e_acsl_delete_block((void *)(& c_0)); @@ -666,7 +666,7 @@ int main(void) "!\\separated(array_0 + (0 .. 10), array_0 + (5 .. 15))", "tests/memory/separated.c",47); } - /*@ assert ¬\separated(array_0 + (0 .. 10), array_0 + (5 .. 15)); */ ; + /*@ assert !\separated(array_0 + (0 .. 10), array_0 + (5 .. 15)); */ ; { int __gen_e_acsl_size_33; int __gen_e_acsl_if_33; @@ -716,7 +716,7 @@ int main(void) "!\\separated(array_0 + (0 .. 19), array_0 + (5 .. 15))", "tests/memory/separated.c",48); } - /*@ assert ¬\separated(array_0 + (0 .. 19), array_0 + (5 .. 15)); */ ; + /*@ assert !\separated(array_0 + (0 .. 19), array_0 + (5 .. 15)); */ ; { int __gen_e_acsl_valid_read_33; int __gen_e_acsl_valid_read_34; @@ -793,7 +793,7 @@ int main(void) "!\\separated(array_0 + (0 .. 1), array_0 + (1 .. 2))", "tests/memory/separated.c",50); } - /*@ assert ¬\separated(array_0 + (0 .. 1), array_0 + (1 .. 2)); */ ; + /*@ assert !\separated(array_0 + (0 .. 1), array_0 + (1 .. 2)); */ ; { int __gen_e_acsl_size_41; int __gen_e_acsl_if_41; @@ -1577,8 +1577,7 @@ int main(void) } /*@ assert - ¬\separated(&array_1[0 .. 3][0 .. 2][0], &array_1[3 .. 5][0 .. 2][0]); - */ + !\separated(&array_1[0 .. 3][0 .. 2][0], &array_1[3 .. 5][0 .. 2][0]); */ ; { int __gen_e_acsl_forall_29; diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c b/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c index 04238dc3f425095bb6201e4823a9092509c6484e..5b0bd420e810ce679e7f7d943b18ef4304e7b882 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c @@ -11,7 +11,7 @@ int main(void) x ++; __e_acsl_assert(1,1,"Assertion","main","sizeof(int) == sizeof(x)", "tests/memory/sizeof.i",8); - /*@ assert sizeof(int) ≡ sizeof(x); */ ; + /*@ assert sizeof(int) == sizeof(x); */ ; __retres = 0; return __retres; } diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c b/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c index cfc1ad9048e8045e97dc8923de8b2dac5b084b8b..1132619e638d09549162618b0eb26ee3f7593a25 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c @@ -25,7 +25,7 @@ int main(void) "!\\initialized(&static_pair.a)", "tests/memory/struct_initialized.c",13); } - /*@ assert ¬\initialized(&static_pair.a); */ ; + /*@ assert !\initialized(&static_pair.a); */ ; { int __gen_e_acsl_initialized_2; __gen_e_acsl_initialized_2 = __e_acsl_initialized((void *)(& static_pair.b), @@ -34,7 +34,7 @@ int main(void) "!\\initialized(&static_pair.b)", "tests/memory/struct_initialized.c",14); } - /*@ assert ¬\initialized(&static_pair.b); */ ; + /*@ assert !\initialized(&static_pair.b); */ ; __e_acsl_initialize((void *)(& static_pair.a),sizeof(int32_t)); static_pair.a = 1; { @@ -54,7 +54,7 @@ int main(void) "!\\initialized(&static_pair.b)", "tests/memory/struct_initialized.c",17); } - /*@ assert ¬\initialized(&static_pair.b); */ ; + /*@ assert !\initialized(&static_pair.b); */ ; __e_acsl_initialize((void *)(& static_pair.b),sizeof(int32_t)); static_pair.b = 2; { @@ -89,7 +89,7 @@ int main(void) "!\\initialized(&heap_pair->a)", "tests/memory/struct_initialized.c",26); } - /*@ assert ¬\initialized(&heap_pair->a); */ ; + /*@ assert !\initialized(&heap_pair->a); */ ; { int __gen_e_acsl_initialized_8; __gen_e_acsl_initialized_8 = __e_acsl_initialized((void *)(& heap_pair->b), @@ -98,7 +98,7 @@ int main(void) "!\\initialized(&heap_pair->b)", "tests/memory/struct_initialized.c",27); } - /*@ assert ¬\initialized(&heap_pair->b); */ ; + /*@ assert !\initialized(&heap_pair->b); */ ; __e_acsl_initialize((void *)(& heap_pair->a),sizeof(int32_t)); heap_pair->a = 3; { @@ -118,7 +118,7 @@ int main(void) "!\\initialized(&heap_pair->b)", "tests/memory/struct_initialized.c",30); } - /*@ assert ¬\initialized(&heap_pair->b); */ ; + /*@ assert !\initialized(&heap_pair->b); */ ; __e_acsl_initialize((void *)(& heap_pair->b),sizeof(int32_t)); heap_pair->b = 4; { diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c index 78e7579f2309606b261436cfc0fabe82d513e995..ab1aff2dc03bf1eb344d574e4bedf3557b47985f 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c @@ -30,7 +30,7 @@ int *f(int *x) __e_acsl_assert(! __gen_e_acsl_and,1,"Assertion","f","!\\valid(y)", "tests/memory/valid.c",13); } - /*@ assert ¬\valid(y); */ ; + /*@ assert !\valid(y); */ ; __e_acsl_full_init((void *)(& y)); y = x; { @@ -201,7 +201,7 @@ int main(void) "!\\valid(a) && !\\valid(b) && !\\valid(X)", "tests/memory/valid.c",29); } - /*@ assert ¬\valid(a) ∧ ¬\valid(b) ∧ ¬\valid(X); */ ; + /*@ assert !\valid(a) && !\valid(b) && !\valid(X); */ ; __e_acsl_full_init((void *)(& a)); a = (int *)malloc(sizeof(int)); { @@ -244,7 +244,7 @@ int main(void) "\\valid(a) && !\\valid(b) && !\\valid(X)", "tests/memory/valid.c",31); } - /*@ assert \valid(a) ∧ ¬\valid(b) ∧ ¬\valid(X); */ ; + /*@ assert \valid(a) && !\valid(b) && !\valid(X); */ ; X = a; { int __gen_e_acsl_initialized_5; @@ -286,7 +286,7 @@ int main(void) "\\valid(a) && !\\valid(b) && \\valid(X)", "tests/memory/valid.c",33); } - /*@ assert \valid(a) ∧ ¬\valid(b) ∧ \valid(X); */ ; + /*@ assert \valid(a) && !\valid(b) && \valid(X); */ ; __e_acsl_full_init((void *)(& b)); b = __gen_e_acsl_f(& n); { @@ -329,7 +329,7 @@ int main(void) "\\valid(a) && \\valid(b) && \\valid(X)", "tests/memory/valid.c",35); } - /*@ assert \valid(a) ∧ \valid(b) ∧ \valid(X); */ ; + /*@ assert \valid(a) && \valid(b) && \valid(X); */ ; X = b; { int __gen_e_acsl_initialized_9; @@ -371,7 +371,7 @@ int main(void) "\\valid(a) && \\valid(b) && \\valid(X)", "tests/memory/valid.c",37); } - /*@ assert \valid(a) ∧ \valid(b) ∧ \valid(X); */ ; + /*@ assert \valid(a) && \valid(b) && \valid(X); */ ; __e_acsl_full_init((void *)(& c)); c = & a; __e_acsl_full_init((void *)(& d)); @@ -496,7 +496,7 @@ int main(void) sizeof(int *)); if (__gen_e_acsl_initialized_18) { int __gen_e_acsl_valid_18; - /*@ assert Eva: dangling_pointer: ¬\dangling(&a); */ + /*@ assert Eva: dangling_pointer: !\dangling(&a); */ __gen_e_acsl_valid_18 = __e_acsl_valid((void *)a,sizeof(int),(void *)a, (void *)(& a)); __gen_e_acsl_and_28 = __gen_e_acsl_valid_18; @@ -528,7 +528,7 @@ int main(void) "!\\valid(a) && \\valid(b) && \\valid(X)", "tests/memory/valid.c",43); } - /*@ assert ¬\valid(a) ∧ \valid(b) ∧ \valid(X); */ ; + /*@ assert !\valid(a) && \valid(b) && \valid(X); */ ; { int __gen_e_acsl_valid_21; __gen_e_acsl_valid_21 = __e_acsl_valid((void *)(& Z),sizeof(int), diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c index bd36506b4f1487339a94a483e2eac8484eae8caf..a6f0a8e77f7faaa5edadcb545303689aea28803a 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c @@ -45,7 +45,7 @@ int main(void) "!\\valid(a) && !\\valid(b)", "tests/memory/valid_alias.c",9); } - /*@ assert ¬\valid(a) ∧ ¬\valid(b); */ ; + /*@ assert !\valid(a) && !\valid(b); */ ; __e_acsl_full_init((void *)(& a)); a = (int *)malloc(sizeof(int)); __e_acsl_initialize((void *)a,sizeof(int)); @@ -84,7 +84,7 @@ int main(void) "\\valid(a) && \\valid(b)","tests/memory/valid_alias.c", 13); } - /*@ assert \valid(a) ∧ \valid(b); */ ; + /*@ assert \valid(a) && \valid(b); */ ; { int __gen_e_acsl_initialized_5; int __gen_e_acsl_and_7; @@ -103,7 +103,7 @@ int main(void) __e_acsl_assert(*b == n,1,"Assertion","main","*b == n", "tests/memory/valid_alias.c",14); } - /*@ assert *b ≡ n; */ ; + /*@ assert *b == n; */ ; free((void *)b); { int __gen_e_acsl_initialized_6; @@ -113,7 +113,7 @@ int main(void) sizeof(int *)); if (__gen_e_acsl_initialized_6) { int __gen_e_acsl_valid_5; - /*@ assert Eva: dangling_pointer: ¬\dangling(&a); */ + /*@ assert Eva: dangling_pointer: !\dangling(&a); */ __gen_e_acsl_valid_5 = __e_acsl_valid((void *)a,sizeof(int),(void *)a, (void *)(& a)); __gen_e_acsl_and_8 = __gen_e_acsl_valid_5; @@ -138,7 +138,7 @@ int main(void) "!\\valid(a) && !\\valid(b)", "tests/memory/valid_alias.c",16); } - /*@ assert ¬\valid(a) ∧ ¬\valid(b); */ ; + /*@ assert !\valid(a) && !\valid(b); */ ; __retres = 0; __e_acsl_delete_block((void *)(& b)); __e_acsl_delete_block((void *)(& a)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c index b8910535a12c93389c032a422e0f2d5df6a56e5b..828993a77a2be5626d2d016089782f6987c65c7e 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c @@ -9,12 +9,12 @@ struct list { struct list *next ; }; /*@ behavior B1: - assumes l ≡ \null; - ensures \result ≡ \old(l); + assumes l == \null; + ensures \result == \old(l); behavior B2: - assumes ¬\valid(l) ∨ ¬\valid(l->next); - ensures \result ≡ \old(l); + assumes !\valid(l) || !\valid(l->next); + ensures \result == \old(l); */ struct list *__gen_e_acsl_f(struct list *l); @@ -54,12 +54,12 @@ int main(void) } /*@ behavior B1: - assumes l ≡ \null; - ensures \result ≡ \old(l); + assumes l == \null; + ensures \result == \old(l); behavior B2: - assumes ¬\valid(l) ∨ ¬\valid(l->next); - ensures \result ≡ \old(l); + assumes !\valid(l) || !\valid(l->next); + ensures \result == \old(l); */ struct list *__gen_e_acsl_f(struct list *l) { diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c index f35eefe1d62032a0d7b35743ac9a0fc8150430d6..fa6ee8e78437c3afb0c207d07d5590e8e97f7b70 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c @@ -47,8 +47,7 @@ int *new_inversed(int len, int *v) "\\valid(v) && \\offset(v) + len * sizeof(int) <= \\block_length(v)", "tests/memory/vector.c",12); } - /*@ - assert \valid(v) ∧ \offset(v) + len * sizeof(int) ≤ \block_length(v); + /*@ assert \valid(v) && \offset(v) + len * sizeof(int) <= \block_length(v); */ ; __e_acsl_full_init((void *)(& p)); @@ -104,7 +103,7 @@ int main(void) /*@ assert \initialized(v2 + 2); */ ; __e_acsl_assert(LAST == 1,1,"Assertion","main","LAST == 1", "tests/memory/vector.c",28); - /*@ assert LAST ≡ 1; */ ; + /*@ assert LAST == 1; */ ; free((void *)v2); __retres = 0; __e_acsl_delete_block((void *)(& v2)); diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c index db99b83114133ad4e8d0b79dc9dd0a944d921036..02164eace9e58653e8a87bffd2b050ed7b2e1672 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c +++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c @@ -30,8 +30,7 @@ int main(int argc, char **argv) "alloca_bounds: 0 < sizeof(int) * LEN <= 18446744073709551615", "tests/memory/vla.c",9); } - /*@ assert alloca_bounds: 0 < sizeof(int) * LEN ≤ 18446744073709551615; - */ + /*@ assert alloca_bounds: 0 < sizeof(int) * LEN <= 18446744073709551615; */ ; __lengthof_arr = (unsigned long)LEN; int *arr = __builtin_alloca(sizeof(int) * __lengthof_arr); @@ -58,7 +57,7 @@ int main(int argc, char **argv) __e_acsl_assert(! __gen_e_acsl_valid_2,1,"Assertion","main", "!\\valid(arr + i)","tests/memory/vla.c",15); } - /*@ assert ¬\valid(arr + i); */ ; + /*@ assert !\valid(arr + i); */ ; } i ++; } diff --git a/src/plugins/e-acsl/tests/memory/oracle/initialized.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/initialized.res.oracle index 1b5901750f8eff4dff841228dab2b7f39ee88eb1..c5a43e59b4e2f2532b45c480d6e01f409ae8464a 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/initialized.res.oracle +++ b/src/plugins/e-acsl/tests/memory/oracle/initialized.res.oracle @@ -1,5 +1,4 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/memory/initialized.c:84: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&p); + accessing left-value that contains escaping addresses. assert !\dangling(&p); diff --git a/src/plugins/e-acsl/tests/memory/oracle/valid.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/valid.res.oracle index 10d60024c84446247288b53d197b4897a6a119ad..2255bd8b8bbd019de042ea84a296ae750919de88 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/valid.res.oracle +++ b/src/plugins/e-acsl/tests/memory/oracle/valid.res.oracle @@ -1,5 +1,4 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/memory/valid.c:43: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&a); + accessing left-value that contains escaping addresses. assert !\dangling(&a); diff --git a/src/plugins/e-acsl/tests/memory/oracle/valid_alias.res.oracle b/src/plugins/e-acsl/tests/memory/oracle/valid_alias.res.oracle index 6fdc0e52c0e715a6d514e6ccd33a5307a271136b..e98e4bfdbed525b342d228f1a22aa563c6b34e92 100644 --- a/src/plugins/e-acsl/tests/memory/oracle/valid_alias.res.oracle +++ b/src/plugins/e-acsl/tests/memory/oracle/valid_alias.res.oracle @@ -1,5 +1,4 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/memory/valid_alias.c:16: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&a); + accessing left-value that contains escaping addresses. assert !\dangling(&a); diff --git a/src/plugins/e-acsl/tests/special/oracle/e-acsl-functions.res.oracle b/src/plugins/e-acsl/tests/special/oracle/e-acsl-functions.res.oracle index 8a13b595cda6bcb891eaaed531c8ea270ed56d38..65e34e27e7462c8305a1f33da6a183ab9a046055 100644 --- a/src/plugins/e-acsl/tests/special/oracle/e-acsl-functions.res.oracle +++ b/src/plugins/e-acsl/tests/special/oracle/e-acsl-functions.res.oracle @@ -1,4 +1,4 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/special/e-acsl-functions.c:38: Warning: - function g: precondition *p ≡ 1 got status invalid. + function g: precondition *p == 1 got status invalid. diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c b/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c index a80a813054c76077f2d3027cf177897eeac77ecc..8d4d7161fe0e2dbba30ecfa922aefbee07f6b7e4 100644 --- a/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c +++ b/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c @@ -6,7 +6,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; int incr(int x); -/*@ ensures \result ≡ incr(\old(i)); */ +/*@ ensures \result == incr(\old(i)); */ int __gen_e_acsl_f(int i); int f(int i) @@ -30,7 +30,7 @@ int main(void) return __retres; } -/*@ ensures \result ≡ incr(\old(i)); */ +/*@ ensures \result == incr(\old(i)); */ int __gen_e_acsl_f(int i) { int __gen_e_acsl_at; diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c index 79d83f6e40dab17fa30344132cf90e4891a44645..c5f588fcc44d3e61d70bd0e24bdd61104c6c2bbe 100644 --- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c +++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c @@ -5,9 +5,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ requires \initialized(p); - requires *p ≡ 0; - ensures \result ≡ \old(*p); - */ + requires *p == 0; + ensures \result == \old(*p); */ int __gen_e_acsl_f(int *p); int f(int *p) @@ -22,7 +21,7 @@ int f(int *p) __e_acsl_assert(__gen_e_acsl_and,1,"Invariant","f","0 <= i <= 1", "tests/special/e-acsl-functions.c",13); } - /*@ loop invariant 0 ≤ i ≤ 1; */ + /*@ loop invariant 0 <= i <= 1; */ while (i < 1) { int __gen_e_acsl_and_2; i ++; @@ -37,15 +36,14 @@ int f(int *p) } /*@ requires \initialized(p); - requires *p ≡ 1; - ensures \result ≡ \old(*p); - */ + requires *p == 1; + ensures \result == \old(*p); */ int g(int *p) { int __retres; { int i = 0; - /*@ loop invariant 0 ≤ i ≤ 1; */ + /*@ loop invariant 0 <= i <= 1; */ while (i < 1) i ++; } __retres = 0; @@ -69,9 +67,8 @@ int main(void) } /*@ requires \initialized(p); - requires *p ≡ 0; - ensures \result ≡ \old(*p); - */ + requires *p == 0; + ensures \result == \old(*p); */ int __gen_e_acsl_f(int *p) { int __gen_e_acsl_at; diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c index cf967bfa6fb56894ae6236270ff14523ae6d1469..aac8a6185d6ac900b7133ac783a1ffa9d27e2025 100644 --- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c +++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c @@ -5,19 +5,19 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ requires \valid(y); - requires *x ≥ 0; - ensures *\old(x) ≡ \old(*x) + 1; + requires *x >= 0; + ensures *\old(x) == \old(*x) + 1; assigns *x; assigns *x \from *x, x; behavior b1: - assumes *x ≡ 1; + assumes *x == 1; ensures *\old(x) < 0; assigns \nothing; behavior b2: - assumes *x ≡ 0; - ensures *\old(x) ≡ 1; + assumes *x == 0; + ensures *\old(x) == 1; complete behaviors b2, b1; disjoint behaviors b1, b2; @@ -39,8 +39,8 @@ void f(int *x, int *y) __e_acsl_assert(*x >= 0,1,"Precondition","f","*x >= 0", "tests/special/e-acsl-valid.c",27); } - /*@ requires *x ≥ 0; - ensures 2 ≥ 1; + /*@ requires *x >= 0; + ensures 2 >= 1; assigns *x; */ { __e_acsl_initialize((void *)x,sizeof(int)); @@ -50,17 +50,16 @@ void f(int *x, int *y) "tests/special/e-acsl-valid.c",28); { int i = 0; - /*@ loop invariant 0 ≤ i ≤ 1; + /*@ loop invariant 0 <= i <= 1; loop variant 2 - i; */ while (1) { __gen_e_acsl_old_variant = 2L - i; if (! (i < 1)) break; - /*@ assert 1 ≡ 1; */ ; + /*@ assert 1 == 1; */ ; /*@ assert \valid(y); */ ; i ++; __e_acsl_assert(__gen_e_acsl_old_variant >= 0L,1,"Variant","f", - "(old 2 - i) \342\211\245 0", - "tests/special/e-acsl-valid.c",33); + "(old 2 - i) >= 0","tests/special/e-acsl-valid.c",33); __e_acsl_assert(__gen_e_acsl_old_variant > 2L - i,1,"Variant","f", "(old 2 - i) > 2 - i","tests/special/e-acsl-valid.c", 33); @@ -90,19 +89,19 @@ int main(void) } /*@ requires \valid(y); - requires *x ≥ 0; - ensures *\old(x) ≡ \old(*x) + 1; + requires *x >= 0; + ensures *\old(x) == \old(*x) + 1; assigns *x; assigns *x \from *x, x; behavior b1: - assumes *x ≡ 1; + assumes *x == 1; ensures *\old(x) < 0; assigns \nothing; behavior b2: - assumes *x ≡ 0; - ensures *\old(x) ≡ 1; + assumes *x == 0; + ensures *\old(x) == 1; complete behaviors b2, b1; disjoint behaviors b1, b2; diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c index 17349b414867ebc57efc76abda167c3f1087dc35..a492820b2416ce2ae069c778a8e5fef6565bc76e 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c @@ -71,7 +71,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_3,1,"Assertion","main", "!\\valid(src[2])","tests/temporal/t_array.c",14); } - /*@ assert ¬\valid(src[2]); */ ; + /*@ assert !\valid(src[2]); */ ; __retres = 0; __e_acsl_delete_block((void *)(src)); __e_acsl_delete_block((void *)(& b)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c index 44b32fb0b13f0699b87c1da69c93901bee899264..8897b88d2d0dad6b5fa9c8b13f5d4d4f2f91bec9 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c @@ -78,7 +78,7 @@ int main(void) __e_acsl_assert(__gen_e_acsl_valid_read_2,1,"RTE","main", "mem_access: \\valid_read(p + 2)", "tests/temporal/t_dpointer.c",21); - /*@ assert Eva: dangling_pointer: ¬\dangling(p + 2); */ + /*@ assert Eva: dangling_pointer: !\dangling(p + 2); */ __gen_e_acsl_valid_3 = __e_acsl_valid((void *)*(p + 2),sizeof(int), (void *)*(p + 2),(void *)( p + 2)); @@ -88,7 +88,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","main", "!\\valid(*(p + 2))","tests/temporal/t_dpointer.c",21); } - /*@ assert ¬\valid(*(p + 2)); */ ; + /*@ assert !\valid(*(p + 2)); */ ; __retres = 0; __e_acsl_delete_block((void *)(& p)); __e_acsl_memory_clean(); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c index e883e275a28ba0a40a14da678e0c6f20a8542ebd..4f110e9cfb11b051dbe536c1d5957807c0d04963 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c @@ -71,7 +71,7 @@ int main(void) "\\valid(q) && \\valid(p)","tests/temporal/t_fun_lib.c", 15); } - /*@ assert \valid(q) ∧ \valid(p); */ ; + /*@ assert \valid(q) && \valid(p); */ ; __e_acsl_temporal_reset_parameters(); __e_acsl_temporal_reset_return(); __e_acsl_temporal_save_nreferent_parameter((void *)(& q),1U); @@ -141,7 +141,7 @@ int main(void) "!\\valid(p) && !\\valid(path)", "tests/temporal/t_fun_lib.c",29); } - /*@ assert ¬\valid(p) ∧ ¬\valid(path); */ ; + /*@ assert !\valid(p) && !\valid(path); */ ; __retres = 0; __e_acsl_delete_block((void *)(& path)); __e_acsl_delete_block((void *)(& q)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c index ad2ee7a02d6a21a388d24b3c7090113ef50d5071..27774ce57dc553ae51caaf9f583c870957613fe4 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c @@ -7,14 +7,14 @@ char *__gen_e_acsl_literal_string; extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; /*@ requires valid_name: valid_read_string(name); - ensures null_or_valid_result: \result ≡ \null ∨ \valid(\result); + ensures null_or_valid_result: \result == \null || \valid(\result); assigns \result; assigns \result \from __fc_env[0 ..], (indirect: name), *(name + (0 ..)); */ char *__gen_e_acsl_getenv(char const *name); /*@ requires valid_name: valid_read_string(name); - ensures null_or_valid_result: \result ≡ \null ∨ \valid(\result); + ensures null_or_valid_result: \result == \null || \valid(\result); assigns \result; assigns \result \from __fc_env[0 ..], (indirect: name), *(name + (0 ..)); */ @@ -104,7 +104,7 @@ int main(int argc, char const **argv) "g1 == \\null || \\valid(g1)", "tests/temporal/t_getenv.c",13); } - /*@ assert g1 ≡ \null ∨ \valid(g1); */ ; + /*@ assert g1 == \null || \valid(g1); */ ; { int __gen_e_acsl_or_2; if (g2 == (char *)0) __gen_e_acsl_or_2 = 1; @@ -126,7 +126,7 @@ int main(int argc, char const **argv) "g2 == \\null || \\valid(g2)", "tests/temporal/t_getenv.c",14); } - /*@ assert g2 ≡ \null ∨ \valid(g2); */ ; + /*@ assert g2 == \null || \valid(g2); */ ; __retres = 0; __e_acsl_delete_block((void *)(& g2)); __e_acsl_delete_block((void *)(& g1)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c index 72fec76659a77a3aa1be7d0ed9597500503ccbce..26631356a1372697e69d32bf281816b3f716a118 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c @@ -82,7 +82,7 @@ int main(int argc, char const **argv) "\\valid(p) && \\valid(q)","tests/temporal/t_labels.c", 26); } - /*@ assert \valid(p) ∧ \valid(q); */ ; + /*@ assert \valid(p) && \valid(q); */ ; __e_acsl_full_init((void *)(& q)); LAB2: __e_acsl_temporal_store_nreferent((void *)(& q),(void *)(& p)); q = p; diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c index 55a7f643816a48caf304ba6d625c12f67541b7de..b0c9447aea4fd5c7ddaaac76c01b82f0b18b9e59 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c @@ -69,7 +69,7 @@ int main(void) "\\valid_read(f) && !\\valid(f)", "tests/temporal/t_lit_string.c",9); } - /*@ assert \valid_read(f) ∧ ¬\valid(f); */ ; + /*@ assert \valid_read(f) && !\valid(f); */ ; __e_acsl_full_init((void *)(& g)); __e_acsl_temporal_store_nblock((void *)(& g), (void *)__gen_e_acsl_literal_string_2); @@ -107,7 +107,7 @@ int main(void) "\\valid_read(g) && !\\valid(g)", "tests/temporal/t_lit_string.c",12); } - /*@ assert \valid_read(g) ∧ ¬\valid(g); */ ; + /*@ assert \valid_read(g) && !\valid(g); */ ; char *p = f; __e_acsl_temporal_store_nreferent((void *)(& p),(void *)(& f)); __e_acsl_store_block((void *)(& p),(size_t)8); @@ -145,7 +145,7 @@ int main(void) "\\valid_read(p) && !\\valid(p)", "tests/temporal/t_lit_string.c",15); } - /*@ assert \valid_read(p) ∧ ¬\valid(p); */ ; + /*@ assert \valid_read(p) && !\valid(p); */ ; __e_acsl_full_init((void *)(& q)); __e_acsl_temporal_store_nreferent((void *)(& q),(void *)(& f)); q = f; @@ -182,7 +182,7 @@ int main(void) "\\valid_read(q) && !\\valid(q)", "tests/temporal/t_lit_string.c",18); } - /*@ assert \valid_read(q) ∧ ¬\valid(q); */ ; + /*@ assert \valid_read(q) && !\valid(q); */ ; __retres = 0; __e_acsl_delete_block((void *)(& q)); __e_acsl_delete_block((void *)(& p)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c index 28d445663fa2d5681b645ac2dc174e1e7685c768..61cec75faa66f276d253e660668b3ff38625460b 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c @@ -49,7 +49,7 @@ int main(void) p = (int *)malloc((unsigned long)(1024 * 1024)); __e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p)); counter ++; - /*@ assert Eva: dangling_pointer: ¬\dangling(&q); */ + /*@ assert Eva: dangling_pointer: !\dangling(&q); */ if (p != q) { __e_acsl_temporal_reset_parameters(); __e_acsl_temporal_reset_return(); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c index 93a179e2a29395b84dc30359889e3331d28443b9..ae467f799816d41778df24864e358e4ab60dcad9 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c @@ -27,7 +27,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and,1,"Assertion","main","!\\valid(p)", "tests/temporal/t_malloc.c",11); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; { int __gen_e_acsl_initialized_2; int __gen_e_acsl_and_2; @@ -43,7 +43,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","main","!\\valid(q)", "tests/temporal/t_malloc.c",12); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; __e_acsl_full_init((void *)(& p)); __e_acsl_temporal_reset_parameters(); __e_acsl_temporal_reset_return(); @@ -95,7 +95,7 @@ int main(void) sizeof(int *)); if (__gen_e_acsl_initialized_5) { int __gen_e_acsl_valid_5; - /*@ assert Eva: dangling_pointer: ¬\dangling(&p); */ + /*@ assert Eva: dangling_pointer: !\dangling(&p); */ __gen_e_acsl_valid_5 = __e_acsl_valid((void *)p,sizeof(int),(void *)p, (void *)(& p)); __gen_e_acsl_and_5 = __gen_e_acsl_valid_5; @@ -104,7 +104,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_5,1,"Assertion","main","!\\valid(p)", "tests/temporal/t_malloc.c",22); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; { int __gen_e_acsl_initialized_6; int __gen_e_acsl_and_6; @@ -120,7 +120,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_6,1,"Assertion","main","!\\valid(q)", "tests/temporal/t_malloc.c",23); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; __e_acsl_full_init((void *)(& p)); __e_acsl_temporal_reset_parameters(); __e_acsl_temporal_reset_return(); @@ -157,7 +157,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_8,1,"Assertion","main","!\\valid(q)", "tests/temporal/t_malloc.c",29); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; __e_acsl_initialize((void *)q,sizeof(int)); *q = 1; __e_acsl_initialize((void *)p,sizeof(int)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c index c54bc9d417f2ae65931cfb5fd109ea98c165f2f7..771e33247d4f882c4eb3e8d5609544af267f037a 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c @@ -12,9 +12,9 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict; \separated((char *)dest + (0 .. n - 1), (char *)src + (0 .. n - 1)); ensures copied_contents: - memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) ≡ + memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) == 0; - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *((char *)dest + (0 .. n - 1)), \result; assigns *((char *)dest + (0 .. n - 1)) \from *((char *)src + (0 .. n - 1)); @@ -24,9 +24,8 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src, size_t n); /*@ requires valid_s: valid_or_empty(s, n); - ensures - acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) ≡ \true; - ensures result_ptr: \result ≡ \old(s); + ensures acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) == \true; + ensures result_ptr: \result == \old(s); assigns *((char *)s + (0 .. n - 1)), \result; assigns *((char *)s + (0 .. n - 1)) \from c; assigns \result \from s; @@ -153,7 +152,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_5,1,"Assertion","main", "!\\valid(dest[0])","tests/temporal/t_memcpy.c",30); } - /*@ assert ¬\valid(dest[0]); */ ; + /*@ assert !\valid(dest[0]); */ ; { int __gen_e_acsl_initialized_6; int __gen_e_acsl_and_6; @@ -170,7 +169,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_6,1,"Assertion","main", "!\\valid(dest[1])","tests/temporal/t_memcpy.c",31); } - /*@ assert ¬\valid(dest[1]); */ ; + /*@ assert !\valid(dest[1]); */ ; __e_acsl_temporal_reset_parameters(); __e_acsl_temporal_reset_return(); int **p = malloc((unsigned long)size); @@ -277,7 +276,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_11,1,"Assertion","main", "!\\valid(*q)","tests/temporal/t_memcpy.c",42); } - /*@ assert ¬\valid(*q); */ ; + /*@ assert !\valid(*q); */ ; { int __gen_e_acsl_initialized_12; int __gen_e_acsl_and_12; @@ -302,7 +301,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_12,1,"Assertion","main", "!\\valid(*(q + 1))","tests/temporal/t_memcpy.c",43); } - /*@ assert ¬\valid(*(q + 1)); */ ; + /*@ assert !\valid(*(q + 1)); */ ; __e_acsl_full_init((void *)(& tmp_1)); __e_acsl_temporal_store_nblock((void *)(& tmp_1),(void *)0); tmp_1 = (int *)0; @@ -387,9 +386,8 @@ int main(void) } /*@ requires valid_s: valid_or_empty(s, n); - ensures - acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) ≡ \true; - ensures result_ptr: \result ≡ \old(s); + ensures acsl_c_equiv: memset((char *)\old(s), \old(c), \old(n)) == \true; + ensures result_ptr: \result == \old(s); assigns *((char *)s + (0 .. n - 1)), \result; assigns *((char *)s + (0 .. n - 1)) \from c; assigns \result \from s; @@ -421,9 +419,9 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n) \separated((char *)dest + (0 .. n - 1), (char *)src + (0 .. n - 1)); ensures copied_contents: - memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) ≡ + memcmp{Post, Pre}((char *)\old(dest), (char *)\old(src), \old(n)) == 0; - ensures result_ptr: \result ≡ \old(dest); + ensures result_ptr: \result == \old(dest); assigns *((char *)dest + (0 .. n - 1)), \result; assigns *((char *)dest + (0 .. n - 1)) \from *((char *)src + (0 .. n - 1)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c index d2fccd6d110b8a6a5ea893322af2ca29f610d2b2..2cc26a9259dc6ac49abff9c200fec43332f5e4d1 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c @@ -35,7 +35,7 @@ int main(void) sizeof(int *)); if (__gen_e_acsl_initialized) { int __gen_e_acsl_valid; - /*@ assert Eva: dangling_pointer: ¬\dangling(&p); */ + /*@ assert Eva: dangling_pointer: !\dangling(&p); */ __gen_e_acsl_valid = __e_acsl_valid((void *)p,sizeof(int),(void *)p, (void *)(& p)); __gen_e_acsl_and = __gen_e_acsl_valid; @@ -44,7 +44,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and,1,"Assertion","main","!\\valid(p)", "tests/temporal/t_scope.c",15); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; { int __gen_e_acsl_initialized_2; int __gen_e_acsl_and_2; @@ -60,7 +60,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","main","!\\valid(q)", "tests/temporal/t_scope.c",16); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; { int j = 8; __e_acsl_store_block((void *)(& j),(size_t)4); @@ -101,7 +101,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_4,1,"Assertion","main", "!\\valid(q)","tests/temporal/t_scope.c",24); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; { int __gen_e_acsl_valid_5; __gen_e_acsl_valid_5 = __e_acsl_valid((void *)(& j),sizeof(int), @@ -137,7 +137,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_5,1,"Assertion","main", "!\\valid(p)","tests/temporal/t_scope.c",33); } - /*@ assert ¬\valid(p); */ ; + /*@ assert !\valid(p); */ ; __e_acsl_full_init((void *)(& q)); __e_acsl_temporal_store_nblock((void *)(& q),(void *)(& a)); q = & a; diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c index cf3331c161ba0ccb1d28369c4ee644fbef937def..9aabc159ffa1e4aade1353ee90e48a7f1f61206c 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c @@ -74,7 +74,7 @@ int main(void) "\\valid(t1.p) && \\valid(t1.q)", "tests/temporal/t_struct.c",30); } - /*@ assert \valid(t1.p) ∧ \valid(t1.q); */ ; + /*@ assert \valid(t1.p) && \valid(t1.q); */ ; { int __gen_e_acsl_initialized_3; int __gen_e_acsl_and_4; @@ -107,7 +107,7 @@ int main(void) "!\\valid(t2.p) && !\\valid(t2.q)", "tests/temporal/t_struct.c",31); } - /*@ assert ¬\valid(t2.p) ∧ ¬\valid(t2.q); */ ; + /*@ assert !\valid(t2.p) && !\valid(t2.q); */ ; __e_acsl_full_init((void *)(& t2)); __e_acsl_temporal_memcpy((void *)(& t2),(void *)(& t1),(size_t)16); t2 = t1; @@ -143,7 +143,7 @@ int main(void) "\\valid(t2.p) && \\valid(t2.q)", "tests/temporal/t_struct.c",34); } - /*@ assert \valid(t2.p) ∧ \valid(t2.q); */ ; + /*@ assert \valid(t2.p) && \valid(t2.q); */ ; __e_acsl_initialize((void *)(& t2.p),sizeof(char *)); __e_acsl_temporal_store_nblock((void *)(& t2.p),(void *)0); t2.p = (char *)0; @@ -184,7 +184,7 @@ int main(void) "!\\valid(t2.p) && \\valid(t2.q)", "tests/temporal/t_struct.c",38); } - /*@ assert ¬\valid(t2.p) ∧ \valid(t2.q); */ ; + /*@ assert !\valid(t2.p) && \valid(t2.q); */ ; __e_acsl_initialize((void *)(& l.t),sizeof(struct temporal_t)); __e_acsl_temporal_memcpy((void *)(& l.t),(void *)(& t2),(size_t)16); l.t = t2; @@ -221,7 +221,7 @@ int main(void) "!\\valid(l.t.p) && \\valid(l.t.q)", "tests/temporal/t_struct.c",41); } - /*@ assert ¬\valid(l.t.p) ∧ \valid(l.t.q); */ ; + /*@ assert !\valid(l.t.p) && \valid(l.t.q); */ ; __e_acsl_full_init((void *)(& lp)); __e_acsl_temporal_store_nblock((void *)(& lp),(void *)(& l)); lp = & l; @@ -249,7 +249,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_16,1,"Assertion","main", "!\\valid(lp->t.p)","tests/temporal/t_struct.c",44); } - /*@ assert ¬\valid(lp->t.p); */ ; + /*@ assert !\valid(lp->t.p); */ ; __e_acsl_initialize((void *)(tarr),sizeof(temporal)); __e_acsl_temporal_memcpy((void *)(tarr),(void *)(& t2),(size_t)16); tarr[0] = t2; @@ -288,7 +288,7 @@ int main(void) "!\\valid(tarr[0].p) && \\valid(tarr[0].q)", "tests/temporal/t_struct.c",47); } - /*@ assert ¬\valid(tarr[0].p) ∧ \valid(tarr[0].q); */ ; + /*@ assert !\valid(tarr[0].p) && \valid(tarr[0].q); */ ; __e_acsl_initialize((void *)(larr),sizeof(larger)); __e_acsl_temporal_memcpy((void *)(larr),(void *)(& l),(size_t)32); larr[0] = l; @@ -328,7 +328,7 @@ int main(void) "!\\valid(larr[0].t.p) && \\valid(larr[0].t.q)", "tests/temporal/t_struct.c",50); } - /*@ assert ¬\valid(larr[0].t.p) ∧ \valid(larr[0].t.q); */ ; + /*@ assert !\valid(larr[0].t.p) && \valid(larr[0].t.q); */ ; __retres = 0; __e_acsl_delete_block((void *)(larr)); __e_acsl_delete_block((void *)(& lp)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c index 8dd92ddbabe95047d7346030178dc49bb905e389..f04466330cd4c0fcf7c1af6806e3b70a4f6dcb52 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c +++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c @@ -60,7 +60,7 @@ int main(void) __e_acsl_assert(! __gen_e_acsl_and_2,1,"Assertion","main","!\\valid(q)", "tests/temporal/t_while.c",37); } - /*@ assert ¬\valid(q); */ ; + /*@ assert !\valid(q); */ ; __retres = 0; return_label: __e_acsl_store_block_duplicate((void *)(& q),(size_t)8); __e_acsl_delete_block((void *)(& q)); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/t_dpointer.res.oracle b/src/plugins/e-acsl/tests/temporal/oracle/t_dpointer.res.oracle index be99b03ac0e2a4d60f8dd1374232a3bab4b5229c..8f49319f5e7da27a78eeb967363aeae4546f473d 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/t_dpointer.res.oracle +++ b/src/plugins/e-acsl/tests/temporal/oracle/t_dpointer.res.oracle @@ -4,7 +4,7 @@ function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/temporal/t_dpointer.c:21: Warning: accessing left-value that contains escaping addresses. - assert ¬\dangling(p + 2); + assert !\dangling(p + 2); [eva:alarm] tests/temporal/t_dpointer.c:21: Warning: function __e_acsl_assert, behavior blocking: precondition got status unknown. [eva:alarm] tests/temporal/t_dpointer.c:21: Warning: diff --git a/src/plugins/e-acsl/tests/temporal/oracle/t_malloc-asan.res.oracle b/src/plugins/e-acsl/tests/temporal/oracle/t_malloc-asan.res.oracle index 966a3018a5d8b478de4164882d306bfe24614209..1c418fb4ff465463625db3ff054d4496cf29c01a 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/t_malloc-asan.res.oracle +++ b/src/plugins/e-acsl/tests/temporal/oracle/t_malloc-asan.res.oracle @@ -1,5 +1,4 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/temporal/t_malloc-asan.c:28: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&q); + accessing left-value that contains escaping addresses. assert !\dangling(&q); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/t_malloc.res.oracle b/src/plugins/e-acsl/tests/temporal/oracle/t_malloc.res.oracle index 01e8d6abf31a734a75a7b78bf851da3fd7fe38e2..b5343deda65edfa71a22d29bf6430376108cf527 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/t_malloc.res.oracle +++ b/src/plugins/e-acsl/tests/temporal/oracle/t_malloc.res.oracle @@ -1,5 +1,4 @@ [e-acsl] beginning translation. [e-acsl] translation done in project "e-acsl". [eva:alarm] tests/temporal/t_malloc.c:22: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&p); + accessing left-value that contains escaping addresses. assert !\dangling(&p); diff --git a/src/plugins/e-acsl/tests/temporal/oracle/t_scope.res.oracle b/src/plugins/e-acsl/tests/temporal/oracle/t_scope.res.oracle index 9826a53ef7efbcc35395480a2eb83765489302ab..4859c7ca85cde90da964b1ff8bc63051f412c966 100644 --- a/src/plugins/e-acsl/tests/temporal/oracle/t_scope.res.oracle +++ b/src/plugins/e-acsl/tests/temporal/oracle/t_scope.res.oracle @@ -5,5 +5,4 @@ [eva:locals-escaping] tests/temporal/t_scope.c:10: Warning: locals {i} escaping the scope of a block of main through q [eva:alarm] tests/temporal/t_scope.c:15: Warning: - accessing left-value that contains escaping addresses. - assert ¬\dangling(&p); + accessing left-value that contains escaping addresses. assert !\dangling(&p); diff --git a/src/plugins/e-acsl/tests/test_config.in b/src/plugins/e-acsl/tests/test_config.in index bc110ce7a29056ec7096f32ee803e0eac3dc4d08..73a5c7f1a7ee35b42730a5c284817543d48d27bd 100644 --- a/src/plugins/e-acsl/tests/test_config.in +++ b/src/plugins/e-acsl/tests/test_config.in @@ -1,6 +1,6 @@ MACRO: DEST @PTEST_RESULT@/gen_@PTEST_NAME@ MACRO: MACHDEP -machdep gcc_x86_64 -MACRO: GLOBAL @MACHDEP@ -remove-unused-specified-functions -verbose 0 +MACRO: GLOBAL @MACHDEP@ -remove-unused-specified-functions -verbose 0 -no-unicode MACRO: EACSL -e-acsl -e-acsl-share ./share/e-acsl -e-acsl-verbose 1 MACRO: EVA -eva -eva-no-alloc-returns-null -eva-no-results -eva-no-print -eva-warn-key libc:unsupported-spec=inactive -eva-warn-key loop-unroll:auto=inactive