separate symbol discrimination from polymorphism encoding

Makefile.in

@@ -125,9 +125,8 @@ LIB_TRANSFORM = simplify_recursive_definition simplify_formula \
 		inlining split_goal \
 		eliminate_definition eliminate_algebraic \
 		eliminate_inductive eliminate_let eliminate_if \
-		encoding_distinction \
-		encoding_enumeration encoding \
-		libencoding encoding_select \
+		encoding_enumeration encoding libencoding \
+		encoding_distinction encoding_select \
 		encoding_decorate encoding_bridge \
 		encoding_explicit encoding_guard encoding_sort \
 		encoding_instantiate simplify_array filter_trigger \

bench/encoding/create_bench.sh

@@ -2,13 +2,13 @@
 
 PROVER=$1
 SELECT_INST=Inst_$2
-SELECT_KEPT=Kept_$3
-SELECT_LSKEPT=Lskept_$4
-PRODUCT_MODE=Product_$5
+SELECT_LSKEPT=Lskept_$3
+SELECT_LSINST=Lsinst_$4
+SELECT_KEPT=Kept_$5
 ENCO_KEPT=Kept_$6
 ENCO_POLY=Poly_$7
 
-BENCH_NAME="${PROVER}_${SELECT_INST}_${SELECT_KEPT}_${SELECT_LSKEPT}_${PRODUCT_MODE}_${ENCO_KEPT}_${ENCO_POLY}"
+BENCH_NAME="${PROVER}_${SELECT_INST}_${SELECT_LSKEPT}_${SELECT_LSINST}_${SELECT_KEPT}_${ENCO_KEPT}_${ENCO_POLY}"
 
 FILE=${BENCH_NAME}.rc
 
@@ -17,9 +17,9 @@ sed template_rc \
     -e "s/@BENCH_NAME@/$BENCH_NAME/" \
     -e "s/@PROVER@/$PROVER/" \
     -e "s/@SELECT_INST@/$SELECT_INST/" \
-    -e "s/@SELECT_KEPT@/$SELECT_KEPT/" \
     -e "s/@SELECT_LSKEPT@/$SELECT_LSKEPT/" \
-    -e "s/@PRODUCT_MODE@/$PRODUCT_MODE/" \
+    -e "s/@SELECT_LSINST@/$SELECT_LSINST/" \
+    -e "s/@SELECT_KEPT@/$SELECT_KEPT/" \
     -e "s/@ENCO_KEPT@/$ENCO_KEPT/" \
     -e "s/@ENCO_POLY@/$ENCO_POLY/" \
     > $FILE
@@ -38,4 +38,4 @@ sed template_rc \
 #     *\) *)
 #         echo "Unknown error"; *)
 #         exit 2 *)
-# esac *)
\ No newline at end of file
+# esac *)

bench/encoding/gen_allbench.sh

 #!/bin/dash
 
 PROVER="z3 cvc3 yices"
-SELECT_INST="nothing goal context"
-SELECT_KEPT="nothing goal context"
-SELECT_LSKEPT="nothing goal context"
-PRODUCT_MODE="nothing only_kept some_kept"
+SELECT_INST="none goal all"
+SELECT_LSKEPT="none goal all"
+SELECT_LSINST="none goal all"
+SELECT_KEPT="none goal all"
 ENCO_KEPT="twin partial"
 ENCO_POLY="deco explicit guard"
 
@@ -12,10 +12,10 @@ dirname=$(dirname $0)
 
 for P in $PROVER; do
 for SI in $SELECT_INST; do
+for SLK in $SELECT_LSKEPT; do
+for SLI in $SELECT_LSINST; do
 for SK in $SELECT_KEPT; do
-for SL in $SELECT_LSKEPT; do
-for PM in $PRODUCT_MODE; do
 for EK in $ENCO_KEPT; do
 for EP in $ENCO_POLY; do
-$dirname/create_bench.sh $P $SI $SK $SL $PM $EK $EP
-done done done done done done done
\ No newline at end of file
+$dirname/create_bench.sh $P $SI $SLK $SLI $SK $EK $EP
+done done done done done done done

bench/encoding/meta.why

@@ -23,52 +23,52 @@ theory Poly_deco
   meta "enco_poly" "decorate"
 end
 
-theory Inst_nothing
-  meta "select_inst" "nothing"
+theory Inst_none
+  meta "select_inst" "none"
 end
 
 theory Inst_goal
   meta "select_inst" "goal"
 end
 
-theory Inst_context
+theory Inst_all
   meta "select_inst" "all"
 end
 
-theory Kept_nothing
-  meta "select_kept" "nothing"
+theory Lskept_none
+  meta "select_lskept" "none"
 end
 
-theory Kept_goal
-  meta "select_kept" "goal"
+theory Lskept_goal
+  meta "select_lskept" "goal"
 end
 
-theory Kept_context
-  meta "select_kept" "all"
+theory Lskept_all
+  meta "select_lskept" "all"
 end
 
-theory Lskept_nothing
-  meta "select_lskept" "nothing"
+theory Lsinst_none
+  meta "select_lsinst" "none"
 end
 
-theory Lskept_goal
-  meta "select_lskept" "goal"
+theory Lsinst_goal
+  meta "select_lsinst" "goal"
 end
 
-theory Lskept_context
-  meta "select_lskept" "all"
+theory Lsinst_all
+  meta "select_lsinst" "all"
 end
 
-theory Product_nothing
-  meta "completion_mode" "nothing"
+theory Kept_none
+  meta "select_kept" "none"
 end
 
-theory Product_only_kept
-  meta "completion_mode" "only_kept"
+theory Kept_goal
+  meta "select_kept" "goal"
 end
 
-theory Product_some_kept
-  meta "completion_mode" "some_kept"
+theory Kept_all
+  meta "select_kept" "all"
 end
 
 theory KeptIntReal
@@ -76,4 +76,4 @@ theory KeptIntReal
   use real.Real
   meta "encoding : kept" type Int.int
   meta "encoding : kept" type Real.real
-end
\ No newline at end of file
+end

bench/encoding/template_rc

@@ -2,9 +2,9 @@
 prover = "@PROVER@"
 loadpath = "."
 use = "meta.@SELECT_INST@"
-use = "meta.@SELECT_KEPT@"
 use = "meta.@SELECT_LSKEPT@"
-use = "meta.@PRODUCT_MODE@"
+use = "meta.@SELECT_LSINST@"
+use = "meta.@SELECT_KEPT@"
 use = "meta.@ENCO_KEPT@"
 use = "meta.@ENCO_POLY@"
 

drivers/alt_ergo.drv

@@ -13,7 +13,7 @@ time "Valid (%s)"
 time "why3cpulimit time : %s s"
 
 (* À discuter *)
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

drivers/alt_ergo_smt2.drv

@@ -9,7 +9,7 @@ valid "^unsat"
 unknown "^\\(unknown\\|sat\\|Fail\\)" "Unknown"
 time "why3cpulimit time : %s s"
 
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

drivers/coq.drv

@@ -11,7 +11,7 @@ prelude "(* This file is generated by Why3's Coq driver *)"
 prelude "(* Beware! Only edit allowed sections below    *)"
 
 (* À discuter *)
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

drivers/cvc3_bare.drv

@@ -10,7 +10,7 @@ unknown "Unknown." ""
 time "why3cpulimit time : %s s"
 
 (* À discuter *)
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"
@@ -21,6 +21,7 @@ transformation "eliminate_algebraic_smt"
 transformation "simplify_formula"
 (*transformation "simplify_trivial_quantification"*)
 
+transformation "discriminate"
 transformation "encoding_smt"
 
 theory BuiltIn

drivers/discrimination.gen

 theory BuiltIn
   meta "select_inst" "goal"
-  meta "select_kept" "goal"
-  meta "select_lskept" "nothing"
-  meta "completion_mode" "only_kept"
+  meta "select_lskept" "none"
+  meta "select_lsinst" "goal"
+  meta "select_kept" "none"
 end
 

drivers/gappa.drv

@@ -11,7 +11,7 @@ unknown "no contradiction was found\\|some enclosures were not satisfied" "Unkno
 time "why3cpulimit time : %s s"
 fail "Error: \\(.*\\)" "\\1"
 
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 transformation "eliminate_builtin"
 transformation "inline_all"

drivers/simplify.drv

@@ -9,7 +9,7 @@ valid "\\bValid\\b"
 unknown "\\bInvalid\\b" "Unknown"
 time "why3cpulimit time : %s s"
 
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

drivers/tptp.drv

@@ -18,7 +18,7 @@ time "why3cpulimit time : %s s"
 
 (* to be improved *)
 
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

drivers/vampire.drv

@@ -18,7 +18,7 @@ time "why3cpulimit time : %s s"
 
 (* to be improved *)
 
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

drivers/verit.drv

@@ -10,7 +10,7 @@ unknown "^\\(unknown\\|sat\\)" "Unknown"
 time "why3cpulimit time : %s s"
 
 (* À discuter *)
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

drivers/yices_bare.drv

@@ -10,7 +10,7 @@ unknown "\\bunknown\\b\\|\\bsat\\b\\|feature not supported: non linear problem"
 time "why3cpulimit time : %s s"
 
 (* À discuter *)
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"
@@ -21,6 +21,7 @@ transformation "eliminate_algebraic_smt"
 transformation "simplify_formula"
 (*transformation "simplify_trivial_quantification"*)
 
+transformation "discriminate"
 transformation "encoding_smt"
 transformation "encoding_sort"
 

drivers/z3_bare.drv

@@ -12,7 +12,7 @@ time "why3cpulimit time : %s s"
 
 
 (* À discuter *)
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"
@@ -22,6 +22,8 @@ transformation "eliminate_algebraic_smt"
 
 transformation "simplify_formula"
 (*transformation "simplify_trivial_quantification"*)
+
+transformation "discriminate"
 transformation "encoding_smt"
 
 theory BuiltIn

drivers/z3_smtv1.drv

@@ -11,7 +11,7 @@ time "why3cpulimit time : %s s"
 
 
 (* À discuter *)
-transformation "simplify_recursive_definition"
+(*transformation "simplify_recursive_definition"*)
 transformation "inline_trivial"
 
 transformation "eliminate_builtin"

src/core/trans.ml

@@ -38,7 +38,6 @@ let identity   x =  x
 let identity_l x = [x]
 
 let return x = fun _ -> x
-let bind f g task = g (f task) task
 
 let conv_res c f x = c (f x)
 
@@ -57,6 +56,8 @@ end)
 
 let store fn = Wtask.memoize_option 63 fn
 
+let bind f g = store (fun task -> g (f task) task)
+
 let fold fn v =
   let h = Wtask.create 63 in
   let rewind acc task =
@@ -85,9 +86,8 @@ let fold fn v =
 let fold_l fn v = fold (fun task -> list_apply (fn task)) [v]
 
 let fold_map   fn v t = conv_res snd            (fold   fn (v, t))
-(* We keep the order is important for the user. So we use
-   List.map is instead of List.map_rev *)
 let fold_map_l fn v t = conv_res (List.map snd) (fold_l fn (v, t))
+(* we use List.map instead of List.map_rev to preserve the order *)
 
 let gen_decl add fn =
   let fn = Wdecl.memoize 63 fn in
@@ -136,7 +136,7 @@ let rewriteTF fnT fnF = rewrite (TermTF.t_select fnT fnF)
 
 let gen_add_decl add decls = function
   | Some { task_decl = { td_node = Decl d }; task_prev = prev } ->
-    add_decl (List.fold_left add prev decls) d
+      add_decl (List.fold_left add prev decls) d
   | _ -> assert false
 
 let add_decls  = gen_add_decl add_decl

src/core/trans.mli

@@ -49,14 +49,11 @@ val seq_l : task tlist list -> task tlist
 val fold   : (task_hd -> 'a -> 'a     ) -> 'a -> 'a trans
 val fold_l : (task_hd -> 'a -> 'a list) -> 'a -> 'a tlist
 
-val fold_map   : (task_hd -> 'a * task -> ('a * task)) ->
-                                      'a -> task -> task trans
+val fold_map   : (task_hd -> 'a * 'b -> ('a * 'b)     ) -> 'a -> 'b -> 'b trans
+val fold_map_l : (task_hd -> 'a * 'b -> ('a * 'b) list) -> 'a -> 'b -> 'b tlist
 
-val fold_map_l : (task_hd -> 'a * task -> ('a * task) list) ->
-                                      'a -> task -> task tlist
-
-val decl   : (decl -> decl list     ) -> task -> task trans
 (** [decl f acc [d1;..;dn]] returns acc@f d1@..@f dn *)
+val decl   : (decl -> decl list     ) -> task -> task trans
 val decl_l : (decl -> decl list list) -> task -> task tlist
 
 val tdecl   : (decl -> tdecl list     ) -> task -> task trans