Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit 6b28b635 authored by Andrei Paskevich's avatar Andrei Paskevich
Browse files

cosmetic changes in drivers

also, remove the "material_type_arg" meta for (->), hardcoded now
in Eliminate_algebraic
parent 9fa6da6d
...@@ -12,7 +12,6 @@ theory BuiltIn ...@@ -12,7 +12,6 @@ theory BuiltIn
end end
theory int.EuclideanDivision theory int.EuclideanDivision
(* protection against wrong semantics for negative arguments (* protection against wrong semantics for negative arguments
...@@ -46,11 +45,3 @@ theory int.ComputerDivision ...@@ -46,11 +45,3 @@ theory int.ComputerDivision
syntax function mod "safe_comp_mod(%1,%2)" syntax function mod "safe_comp_mod(%1,%2)"
end end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
...@@ -170,8 +170,6 @@ end ...@@ -170,8 +170,6 @@ end
theory HighOrd theory HighOrd
syntax type (->) "(%1,%2) farray" syntax type (->) "(%1,%2) farray"
meta "material_type_arg" type (->), 1
syntax function (@) "(%1[%2])" syntax function (@) "(%1[%2])"
end end
......
...@@ -5,12 +5,3 @@ import "alt_ergo.drv" ...@@ -5,12 +5,3 @@ import "alt_ergo.drv"
theory BuiltIn theory BuiltIn
meta "printer_option" "show_labels" meta "printer_option" "show_labels"
end end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
...@@ -109,11 +109,3 @@ theory real.Real ...@@ -109,11 +109,3 @@ theory real.Real
remove prop ZeroLessOne remove prop ZeroLessOne
end end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
...@@ -135,33 +135,33 @@ theory real.FromInt ...@@ -135,33 +135,33 @@ theory real.FromInt
end end
theory Bool theory Bool
syntax type bool "BITVECTOR(1)" syntax type bool "BITVECTOR(1)"
syntax function True "0bin1" syntax function True "0bin1"
syntax function False "0bin0" syntax function False "0bin0"
meta "encoding:kept" type bool
meta "encoding:kept" type bool
end end
theory bool.Bool theory bool.Bool
syntax function andb "(%1 & %2)" syntax function andb "(%1 & %2)"
syntax function orb "(%1 | %2)" syntax function orb "(%1 | %2)"
syntax function xorb "(BVXOR(%1,%2))" syntax function xorb "(BVXOR(%1,%2))"
syntax function notb "(~ %1)" syntax function notb "(~ %1)"
end end
theory HighOrd theory HighOrd
syntax type (->) "(ARRAY %1 OF %2)" syntax type (->) "(ARRAY %1 OF %2)"
meta "material_type_arg" type (->), 1
syntax function (@) "(%1[%2])" syntax function (@) "(%1[%2])"
meta "encoding:lskept" function (@) meta "encoding:lskept" function (@)
end end
theory map.Map theory map.Map
meta "encoding:lskept" function get
meta "encoding:lskept" function set
syntax function get "(%1[%2])" syntax function get "(%1[%2])"
syntax function set "(%1 WITH [%2] := %3)" syntax function set "(%1 WITH [%2] := %3)"
meta "encoding:lskept" function get
meta "encoding:lskept" function set
end end
import "discrimination.gen" import "discrimination.gen"
...@@ -53,12 +53,12 @@ steplimitexceeded "??" ...@@ -53,12 +53,12 @@ steplimitexceeded "??"
*) *)
(* (*
theory int.EuclideanDivision theory int.EuclideanDivision
syntax function div "(div %1 %2)" syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)" syntax function mod "(mod %1 %2)"
remove prop Mod_bound remove prop Mod_bound
remove prop Div_mod remove prop Div_mod
remove prop Mod_1 remove prop Mod_1
remove prop Div_1 remove prop Div_1
end end
*) *)
......
...@@ -36,11 +36,11 @@ timeout "interrupted by timeout" ...@@ -36,11 +36,11 @@ timeout "interrupted by timeout"
CVC4 seems less efficient with its built-in implementation than CVC4 seems less efficient with its built-in implementation than
with the axiomatic version with the axiomatic version
theory int.EuclideanDivision theory int.EuclideanDivision
syntax function div "(div %1 %2)" syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)" syntax function mod "(mod %1 %2)"
remove prop Mod_bound remove prop Mod_bound
remove prop Div_mod remove prop Div_mod
remove prop Mod_1 remove prop Mod_1
remove prop Div_1 remove prop Div_1
end end
*) *)
...@@ -53,12 +53,12 @@ steplimitexceeded "??" ...@@ -53,12 +53,12 @@ steplimitexceeded "??"
*) *)
(* (*
theory int.EuclideanDivision theory int.EuclideanDivision
syntax function div "(div %1 %2)" syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)" syntax function mod "(mod %1 %2)"
remove prop Mod_bound remove prop Mod_bound
remove prop Div_mod remove prop Div_mod
remove prop Mod_1 remove prop Mod_1
remove prop Div_1 remove prop Div_1
end end
*) *)
......
...@@ -54,21 +54,21 @@ steplimitexceeded "??" ...@@ -54,21 +54,21 @@ steplimitexceeded "??"
CVC4 division seems to be neither the Euclidean one, nor the Computer one CVC4 division seems to be neither the Euclidean one, nor the Computer one
theory int.EuclideanDivision theory int.EuclideanDivision
syntax function div "(div %1 %2)" syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)" syntax function mod "(mod %1 %2)"
remove prop Mod_bound remove prop Mod_bound
remove prop Div_mod remove prop Div_mod
remove prop Mod_1 remove prop Mod_1
remove prop Div_1 remove prop Div_1
end end
theory int.ComputerDivision theory int.ComputerDivision
syntax function div "(div %1 %2)" syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)" syntax function mod "(mod %1 %2)"
remove prop Mod_bound remove prop Mod_bound
remove prop Div_mod remove prop Div_mod
remove prop Mod_1 remove prop Mod_1
remove prop Div_1 remove prop Div_1
end end
*) *)
......
(* Why driver for Gappa *) (* Why driver for Gappa *)
prelude "# this is a prelude for Gappa" prelude "# this is a prelude for Gappa"
...@@ -178,11 +177,3 @@ theory floating_point.DoubleMultiRounding ...@@ -178,11 +177,3 @@ theory floating_point.DoubleMultiRounding
meta "instantiate:auto" prop Bounded_value meta "instantiate:auto" prop Bounded_value
end end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
...@@ -245,24 +245,17 @@ end ...@@ -245,24 +245,17 @@ end
theory Bool theory Bool
syntax type bool "Bool" syntax type bool "Bool"
syntax function True "True" syntax function True "True"
syntax function False "False" syntax function False "False"
meta "encoding:kept" type bool
meta "encoding:kept" type bool
end end
theory bool.Bool theory bool.Bool
syntax function andb "(%1 && %2)" syntax function andb "(%1 && %2)"
syntax function orb "(%1 || %2)" syntax function orb "(%1 || %2)"
syntax function xorb "Xor[%1, %2]" syntax function xorb "Xor[%1, %2]"
syntax function notb "(! %1)" syntax function notb "(! %1)"
syntax function implb "Implies[%1, %2]" syntax function implb "Implies[%1, %2]"
end end
(*
Local Variables:
mode: why
compile-command: "unset LANG; make -C .. bench"
End:
*)
...@@ -118,18 +118,18 @@ theory real.Real ...@@ -118,18 +118,18 @@ theory real.Real
end end
theory Bool theory Bool
syntax type bool "Bool" syntax type bool "Bool"
syntax function True "true" syntax function True "true"
syntax function False "false" syntax function False "false"
meta "encoding:kept" type bool meta "encoding:kept" type bool
end end
theory bool.Bool theory bool.Bool
syntax function andb "(and %1 %2)" syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)" syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)" syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)" syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)" syntax function implb "(=> %1 %2)"
end end
theory bool.Ite theory bool.Ite
...@@ -139,12 +139,12 @@ end ...@@ -139,12 +139,12 @@ end
(* needs to be checked (* needs to be checked
theory int.EuclideanDivision theory int.EuclideanDivision
syntax function div "(div %1 %2)" syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)" syntax function mod "(mod %1 %2)"
remove prop Mod_bound remove prop Mod_bound
remove prop Div_mod remove prop Div_mod
remove prop Mod_1 remove prop Mod_1
remove prop Div_1 remove prop Div_1
end end
*) *)
...@@ -168,18 +168,17 @@ end ...@@ -168,18 +168,17 @@ end
theory HighOrd theory HighOrd
syntax type (->) "(Array %1 %2)" syntax type (->) "(Array %1 %2)"
meta "material_type_arg" type (->), 1 syntax function (@) "(select %1 %2)"
syntax function (@) "(select %1 %2)"
meta "encoding:lskept" function (@) meta "encoding:lskept" function (@)
end end
theory map.Map theory map.Map
meta "encoding:lskept" function get
meta "encoding:lskept" function set
syntax function get "(select %1 %2)" syntax function get "(select %1 %2)"
syntax function set "(store %1 %2 %3)" syntax function set "(store %1 %2 %3)"
meta "encoding:lskept" function get
meta "encoding:lskept" function set
end end
theory map.Const theory map.Const
......
...@@ -76,18 +76,18 @@ end ...@@ -76,18 +76,18 @@ end
(* (*
theory Bool theory Bool
syntax type bool "Bool" syntax type bool "Bool"
syntax function True "true" syntax function True "true"
syntax function False "false" syntax function False "false"
meta "encoding:kept" type bool meta "encoding:kept" type bool
end end
theory bool.Bool theory bool.Bool
syntax function andb "(and %1 %2)" syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)" syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)" syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)" syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)" syntax function implb "(=> %1 %2)"
end end
theory bool.Ite theory bool.Ite
......
...@@ -81,11 +81,3 @@ theory real.Real ...@@ -81,11 +81,3 @@ theory real.Real
remove prop NonTrivialRing remove prop NonTrivialRing
end end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
...@@ -158,7 +158,7 @@ theory bv.BV8 ...@@ -158,7 +158,7 @@ theory bv.BV8
end end
theory bv.BVConverter_Gen theory bv.BVConverter_Gen
remove allprops remove allprops
end end
theory bv.BVConverter_32_64 theory bv.BVConverter_32_64
......
...@@ -116,7 +116,7 @@ theory bv.BV8 ...@@ -116,7 +116,7 @@ theory bv.BV8
end end
theory bv.BVConverter_Gen theory bv.BVConverter_Gen
remove allprops remove allprops
end end
theory bv.BVConverter_32_64 theory bv.BVConverter_32_64
......
...@@ -22,13 +22,13 @@ unknown "^\\(unknown\\|sat\\|Fail\\)$" "" ...@@ -22,13 +22,13 @@ unknown "^\\(unknown\\|sat\\|Fail\\)$" ""
time "why3cpulimit time : %s s" time "why3cpulimit time : %s s"
valid "^unsat$" valid "^unsat$"
theory BuiltIn theory BuiltIn
syntax type int "Int" syntax type int "Int"
syntax type real "Real" syntax type real "Real"
syntax predicate (=) "(= %1 %2)" syntax predicate (=) "(= %1 %2)"
meta "encoding:ignore_polymorphism_ls" predicate (=)
meta "encoding:kept" type int meta "encoding:kept" type int
meta "encoding:ignore_polymorphism_ls" predicate (=)
end end
theory int.Int theory int.Int
...@@ -40,7 +40,7 @@ theory int.Int ...@@ -40,7 +40,7 @@ theory int.Int
syntax function (+) "(+ %1 %2)" syntax function (+) "(+ %1 %2)"
syntax function (-) "(- %1 %2)" syntax function (-) "(- %1 %2)"
syntax function ( * ) "(* %1 %2)" syntax function (*) "(* %1 %2)"
syntax function (-_) "(- %1)" syntax function (-_) "(- %1)"
syntax predicate (<=) "(<= %1 %2)" syntax predicate (<=) "(<= %1 %2)"
...@@ -78,7 +78,7 @@ theory real.Real ...@@ -78,7 +78,7 @@ theory real.Real
syntax function (+) "(+ %1 %2)" syntax function (+) "(+ %1 %2)"
syntax function (-) "(- %1 %2)" syntax function (-) "(- %1 %2)"
syntax function ( * ) "(* %1 %2)" syntax function (*) "(* %1 %2)"
syntax function (/) "(/ %1 %2)" syntax function (/) "(/ %1 %2)"
syntax function (-_) "(- %1)" syntax function (-_) "(- %1)"
syntax function inv "(/ 1.0 %1)" syntax function inv "(/ 1.0 %1)"
...@@ -113,18 +113,19 @@ theory real.Real ...@@ -113,18 +113,19 @@ theory real.Real
end end
theory Bool theory Bool
syntax type bool "Bool" syntax type bool "Bool"
syntax function True "true" syntax function True "true"
syntax function False "false" syntax function False "false"
meta "encoding:kept" type bool
meta "encoding:kept" type bool
end end
theory bool.Bool theory bool.Bool
syntax function andb "(and %1 %2)" syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)" syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)" syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)" syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)" syntax function implb "(=> %1 %2)"
end end
theory bool.Ite theory bool.Ite
...@@ -143,17 +144,17 @@ end ...@@ -143,17 +144,17 @@ end
theory HighOrd theory HighOrd
syntax type (->) "(Array %1 %2)" syntax type (->) "(Array %1 %2)"
meta "material_type_arg" type (->), 1
syntax function (@) "(select %1 %2)" syntax function (@) "(select %1 %2)"
meta "encoding:lskept" function (@)
meta "encoding:lskept" function (@)
meta "encoding:ignore_polymorphism_ts" type (->) meta "encoding:ignore_polymorphism_ts" type (->)
meta "encoding:ignore_polymorphism_ls" function (@)
end end
theory map.Map theory map.Map
syntax function get "(select %1 %2)" syntax function get "(select %1 %2)"
syntax function set "(store %1 %2 %3)" syntax function set "(store %1 %2 %3)"
meta "encoding:lskept" function get meta "encoding:lskept" function get
meta "encoding:lskept" function set meta "encoding:lskept" function set
meta "encoding:ignore_polymorphism_ls" function get meta "encoding:ignore_polymorphism_ls" function get
......
...@@ -310,10 +310,3 @@ end ...@@ -310,10 +310,3 @@ end
theory tptp.RatToReal theory tptp.RatToReal
syntax function to_real "$to_real(%1)" syntax function to_real "$to_real(%1)"
end end
(*
Local Variables:
mode: why
compile-command: "unset LANG; make -C .. bench"
End:
*)
...@@ -299,10 +299,3 @@ end ...@@ -299,10 +299,3 @@ end
theory tptp.RatToReal theory tptp.RatToReal
syntax function to_real "$to_real(%1)" syntax function to_real "$to_real(%1)"
end end
(*
Local Variables:
mode: why
compile-command: "unset LANG; make -C .. bench"
End:
*)
...@@ -32,18 +32,11 @@ transformation "encoding_sort" ...@@ -32,18 +32,11 @@ transformation "encoding_sort"
(* (*
disabled: veriT seems more efficient with the axiomatic version disabled: veriT seems more efficient with the axiomatic version
theory int.EuclideanDivision theory int.EuclideanDivision
syntax function div "(div %1 %2)" syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)" syntax function mod "(mod %1 %2)"
remove prop Mod_bound remove prop Mod_bound
remove prop Div_mod remove prop Div_mod
remove prop Mod_1 remove prop Mod_1
remove prop Div_1 remove prop Div_1
end end
*) *)
(*
Local Variables:
mode: why3
compile-command: "unset LANG; make -C .. bench"
End:
*)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment