native syntax for yices

Warning since 7efae3f8 yices doesn't
work with real since in assoc_mul_div a variable is the denominator.
Yices refuse that.

Makefile.in

@@ -134,7 +134,7 @@ LIB_TRANSFORM = simplify_recursive_definition simplify_formula \
 	        eval_match
 
 LIB_PRINTER = print_real alt_ergo why3printer smtv1 smtv2 \
-		coq tptp simplify gappa cvc3
+		coq tptp simplify gappa cvc3 yices
 
 LIBMODULES = src/config \
 	      $(addprefix src/util/, $(LIB_UTIL)) \

drivers/yices_bare.drv

@@ -2,8 +2,8 @@
 
 prelude ";;; this is a prelude for Yices "
 
-printer "smtv1"
-filename "%f-%t-%g.smt"
+printer "yices"
+filename "%f-%t-%g.ycs"
 
 valid "\\bunsat\\b"
 unknown "\\bunknown\\b\\|\\bsat\\b\\|feature not supported: non linear problem" "Unknown"
@@ -23,11 +23,10 @@ transformation "simplify_formula"
 
 transformation "discriminate"
 transformation "encoding_smt"
-transformation "encoding_sort"
 
 theory BuiltIn
-  syntax type int   "Int"
-  syntax type real  "Real"
+  syntax type int   "int"
+  syntax type real  "real"
   syntax predicate (=)  "(= %1 %2)"
 
   meta "encoding : kept" type int
@@ -115,13 +114,12 @@ theory bool.Bool
    syntax function False "false"
    syntax function andb  "(and %1 %2)"
    syntax function orb   "(or %1 %2)"
-   syntax function xorb  "(xor %1 %2)"
    syntax function notb  "(not %1)"
    meta cloned "encoding_decorate : kept" type bool
 end
 *)
 
-(*
+
 theory int.EuclideanDivision
    syntax function div "(div %1 %2)"
    syntax function mod "(mod %1 %2)"
@@ -130,7 +128,20 @@ theory int.EuclideanDivision
    remove prop Mod_1
    remove prop Div_1
 end
-*)
+
+
+
+theory map.Map
+  syntax type map "(-> %1 %2)"
+  meta "encoding : lskept" function get
+  meta "encoding : lskept" function set
+  meta "encoding : lskept" function const
+
+  syntax function get   "(%1 %2)"
+  syntax function set   "(update %1 (%2) %3)"
+end
+
+
 (*
 Local Variables:
 mode: why

share/provers-detection-data.conf.in

@@ -48,7 +48,7 @@ version_regexp = "[Yices ]*\\([^ \n]+\\)"
 version_ok = "1.0.27"
 version_old = "1.0.17"
 version_old = "1.0.24"
-command = "@LOCALBIN@why3-cpulimit %t %m -s %e -smt"
+command = "@LOCALBIN@why3-cpulimit %t %m -s %e"
 driver = "drivers/yices.drv"
 
 [ATP eprover]

src/driver/whyconf.ml

@@ -27,10 +27,11 @@ open Rc
   - 2
   - 5 cvc3 native
   - 6 driver renaming
+  - 7 yices native
 
 If a configuration doesn't contain the actual magic number we don't use it.*)
 
-let magicnumber = 6
+let magicnumber = 7
 
 exception WrongMagicNumber