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

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
end
theory int.EuclideanDivision
(* protection against wrong semantics for negative arguments
......@@ -46,11 +45,3 @@ theory int.ComputerDivision
syntax function mod "safe_comp_mod(%1,%2)"
end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
......@@ -170,8 +170,6 @@ end
theory HighOrd
syntax type (->) "(%1,%2) farray"
meta "material_type_arg" type (->), 1
syntax function (@) "(%1[%2])"
end
......
......@@ -5,12 +5,3 @@ import "alt_ergo.drv"
theory BuiltIn
meta "printer_option" "show_labels"
end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
......@@ -109,11 +109,3 @@ theory real.Real
remove prop ZeroLessOne
end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
......@@ -135,33 +135,33 @@ theory real.FromInt
end
theory Bool
syntax type bool "BITVECTOR(1)"
syntax function True "0bin1"
syntax function False "0bin0"
meta "encoding:kept" type bool
syntax type bool "BITVECTOR(1)"
syntax function True "0bin1"
syntax function False "0bin0"
meta "encoding:kept" type bool
end
theory bool.Bool
syntax function andb "(%1 & %2)"
syntax function orb "(%1 | %2)"
syntax function xorb "(BVXOR(%1,%2))"
syntax function notb "(~ %1)"
syntax function andb "(%1 & %2)"
syntax function orb "(%1 | %2)"
syntax function xorb "(BVXOR(%1,%2))"
syntax function notb "(~ %1)"
end
theory HighOrd
syntax type (->) "(ARRAY %1 OF %2)"
meta "material_type_arg" type (->), 1
syntax function (@) "(%1[%2])"
meta "encoding:lskept" function (@)
end
theory map.Map
meta "encoding:lskept" function get
meta "encoding:lskept" function set
syntax function get "(%1[%2])"
syntax function set "(%1 WITH [%2] := %3)"
meta "encoding:lskept" function get
meta "encoding:lskept" function set
end
import "discrimination.gen"
......@@ -53,12 +53,12 @@ steplimitexceeded "??"
*)
(*
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
*)
......
......@@ -36,11 +36,11 @@ timeout "interrupted by timeout"
CVC4 seems less efficient with its built-in implementation than
with the axiomatic version
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
*)
......@@ -53,12 +53,12 @@ steplimitexceeded "??"
*)
(*
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
*)
......
......@@ -54,21 +54,21 @@ steplimitexceeded "??"
CVC4 division seems to be neither the Euclidean one, nor the Computer one
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
theory int.ComputerDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
*)
......
(* Why driver for Gappa *)
prelude "# this is a prelude for Gappa"
......@@ -178,11 +177,3 @@ theory floating_point.DoubleMultiRounding
meta "instantiate:auto" prop Bounded_value
end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
......@@ -245,24 +245,17 @@ end
theory Bool
syntax type bool "Bool"
syntax function True "True"
syntax function False "False"
meta "encoding:kept" type bool
syntax type bool "Bool"
syntax function True "True"
syntax function False "False"
meta "encoding:kept" type bool
end
theory bool.Bool
syntax function andb "(%1 && %2)"
syntax function orb "(%1 || %2)"
syntax function xorb "Xor[%1, %2]"
syntax function notb "(! %1)"
syntax function implb "Implies[%1, %2]"
syntax function andb "(%1 && %2)"
syntax function orb "(%1 || %2)"
syntax function xorb "Xor[%1, %2]"
syntax function notb "(! %1)"
syntax function implb "Implies[%1, %2]"
end
(*
Local Variables:
mode: why
compile-command: "unset LANG; make -C .. bench"
End:
*)
......@@ -118,18 +118,18 @@ theory real.Real
end
theory Bool
syntax type bool "Bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
syntax type bool "Bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
end
theory bool.Bool
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)"
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)"
end
theory bool.Ite
......@@ -139,12 +139,12 @@ end
(* needs to be checked
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
*)
......@@ -168,18 +168,17 @@ end
theory HighOrd
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 (@)
end
theory map.Map
meta "encoding:lskept" function get
meta "encoding:lskept" function set
syntax function get "(select %1 %2)"
syntax function set "(store %1 %2 %3)"
meta "encoding:lskept" function get
meta "encoding:lskept" function set
end
theory map.Const
......
......@@ -76,18 +76,18 @@ end
(*
theory Bool
syntax type bool "Bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
syntax type bool "Bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
end
theory bool.Bool
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)"
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)"
end
theory bool.Ite
......
......@@ -81,11 +81,3 @@ theory real.Real
remove prop NonTrivialRing
end
(*
Local Variables:
mode: why
compile-command: "make -C .. bench"
End:
*)
......@@ -158,7 +158,7 @@ theory bv.BV8
end
theory bv.BVConverter_Gen
remove allprops
remove allprops
end
theory bv.BVConverter_32_64
......
......@@ -116,7 +116,7 @@ theory bv.BV8
end
theory bv.BVConverter_Gen
remove allprops
remove allprops
end
theory bv.BVConverter_32_64
......
......@@ -22,13 +22,13 @@ unknown "^\\(unknown\\|sat\\|Fail\\)$" ""
time "why3cpulimit time : %s s"
valid "^unsat$"
theory BuiltIn
syntax type int "Int"
syntax type real "Real"
syntax predicate (=) "(= %1 %2)"
meta "encoding:ignore_polymorphism_ls" predicate (=)
meta "encoding:kept" type int
meta "encoding:ignore_polymorphism_ls" predicate (=)
end
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)"
syntax predicate (<=) "(<= %1 %2)"
......@@ -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)"
syntax function inv "(/ 1.0 %1)"
......@@ -113,18 +113,19 @@ theory real.Real
end
theory Bool
syntax type bool "Bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
syntax type bool "Bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
end
theory bool.Bool
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)"
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
syntax function implb "(=> %1 %2)"
end
theory bool.Ite
......@@ -143,17 +144,17 @@ end
theory HighOrd
syntax type (->) "(Array %1 %2)"
meta "material_type_arg" type (->), 1
syntax function (@) "(select %1 %2)"
meta "encoding:lskept" function (@)
meta "encoding:lskept" function (@)
meta "encoding:ignore_polymorphism_ts" type (->)
meta "encoding:ignore_polymorphism_ls" function (@)
end
theory map.Map
syntax function get "(select %1 %2)"
syntax function set "(store %1 %2 %3)"
meta "encoding:lskept" function get
meta "encoding:lskept" function set
meta "encoding:ignore_polymorphism_ls" function get
......
......@@ -310,10 +310,3 @@ end
theory tptp.RatToReal
syntax function to_real "$to_real(%1)"
end
(*
Local Variables:
mode: why
compile-command: "unset LANG; make -C .. bench"
End:
*)
......@@ -299,10 +299,3 @@ end
theory tptp.RatToReal
syntax function to_real "$to_real(%1)"
end
(*
Local Variables:
mode: why
compile-command: "unset LANG; make -C .. bench"
End:
*)
......@@ -32,18 +32,11 @@ transformation "encoding_sort"
(*
disabled: veriT seems more efficient with the axiomatic version
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
*)
(*
Local Variables:
mode: why3
compile-command: "unset LANG; make -C .. bench"
End:
*)
......@@ -27,17 +27,26 @@ theory BuiltIn
syntax type int "int"
syntax type real "real"
syntax predicate (=) "(%1 = %2)"
meta "encoding:ignore_polymorphism_ls" predicate (=)
meta "encoding:kept" type int
meta "encoding:kept" type real
meta "encoding:ignore_polymorphism_ls" predicate (=)
end
theory bool.Ite
meta "encoding:lskept" function ite
meta "encoding:ignore_polymorphism_ls" function ite
end
theory HighOrd
meta "encoding:lskept" function (@)
meta "encoding:ignore_polymorphism_ts" type (->)
meta "encoding:ignore_polymorphism_ls" function (@)
end
theory map.Map
meta "encoding:lskept" function get
meta "encoding:lskept" function set
meta "encoding:ignore_polymorphism_ts" type map
meta "encoding:ignore_polymorphism_ls" function get
meta "encoding:ignore_polymorphism_ls" function ([])
meta "encoding:ignore_polymorphism_ls" function set
......
......@@ -26,11 +26,3 @@ transformation "simplify_formula"
transformation "encoding_smt"
transformation "encoding_sort"
(*
Local Variables:
mode: why3
compile-command: "unset LANG; make -C .. bench"
End:
*)
......@@ -123,34 +123,34 @@ theory real.Real
end
theory Bool
syntax type bool "bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
syntax type bool "bool"
syntax function True "true"
syntax function False "false"
meta "encoding:kept" type bool
end
theory bool.Bool
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function notb "(not %1)"
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function notb "(not %1)"
end
theory HighOrd
syntax type (->) "(-> %1 %2)"
meta "material_type_arg" type (->), 1
syntax function (@) "(%1 %2)"
syntax function (@) "(%1 %2)"
meta "encoding:lskept" function (@)
end
theory map.Map
meta "encoding:lskept" function get
meta "encoding:lskept" function set
syntax function get "(%1 %2)"
syntax function ([]) "(%1 %2)"
syntax function set "(update %1 (%2) %3)"
syntax function ([<-]) "(update %1 (%2) %3)"
meta "encoding:lskept" function get
meta "encoding:lskept" function set
end
theory map.Const
......
......@@ -46,12 +46,12 @@ timeout "interrupted by timeout"
(* div/mod of Z3 seems to be Euclidean Division *)
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
theory real.FromInt
......
......@@ -34,12 +34,12 @@ fail "^(error \"\\(\\(W\\(A\\(R\\(N\\(I\\(N[^G]\\|[^N]\\)\\|[^I]\\)\\|[^N]\\)\\|
(* div/mod of Z3 seems to be Euclidean Division *)
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
theory real.FromInt
......
......@@ -46,12 +46,12 @@ timeout "interrupted by timeout"
(* div/mod of Z3 seems to be Euclidean Division *)
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
theory real.FromInt
......
......@@ -46,12 +46,12 @@ timeout "interrupted by timeout"
(* div/mod of Z3 seems to be Euclidean Division *)
theory int.EuclideanDivision
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
syntax function div "(div %1 %2)"
syntax function mod "(mod %1 %2)"
remove prop Mod_bound
remove prop Div_mod
remove prop Mod_1
remove prop Div_1
end
theory real.FromInt
......
......@@ -116,24 +116,19 @@ end
(*
(* L'encodage des types sommes bloquent cette théorie builtin *)
theory Bool
syntax type bool "bool"
syntax function True "true"
syntax function False "false"
meta "encoding_decorate:kept" type bool
syntax type bool "bool"
syntax function True "true"
syntax function False "false"
meta "encoding_decorate:kept" type bool
end
theory bool.Bool
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
syntax function andb "(and %1 %2)"
syntax function orb "(or %1 %2)"
syntax function xorb "(xor %1 %2)"
syntax function notb "(not %1)"
end
*)
(*
Local Variables:
mode: why
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