simplify_array en tant que transformation builtin au lieu de plugin

Makefile.in

@@ -106,7 +106,8 @@ LIB_TRANSFORM = simplify_recursive_definition simplify_formula inlining \
 		split_conjunction encoding_decorate \
 		eliminate_definition eliminate_algebraic \
 		eliminate_inductive eliminate_let eliminate_if \
-		explicit_polymorphism simple_types encoding_instantiate
+		explicit_polymorphism simple_types encoding_instantiate \
+		simplify_array
 
 
 LIB_PRINTER = print_real alt_ergo why3 smt coq tptp simplify gappa
@@ -538,7 +539,7 @@ bench:: bin/why.@OCAMLBEST@ bin/whyml.@OCAMLBEST@ $(TOOLS) $(DRIVERS)
 	    "bin/why.@OCAMLBEST@" \
 	    "bin/whyml.@OCAMLBEST@"
 
-BENCH_PLUGINS_CMO := helloworld.cmo simplify_array.cmo
+BENCH_PLUGINS_CMO := helloworld.cmo
 BENCH_PLUGINS_CMO := $(addprefix bench/plugins/,$(BENCH_PLUGINS_CMO))
 BENCH_PLUGINS_CMXS := $(BENCH_PLUGINS_CMO:.cmo=.cmxs)
 
@@ -547,8 +548,6 @@ bench_plugins:: $(BENCH_PLUGINS_CMO) $(BENCH_PLUGINS_CMXS) byte $(TOOLS)
 	tests/test-jcf.why -T Test -G G
 	bin/why.$(OCAMLBEST) -D bench/plugins/helloworld.drv  \
 	tests/test-jcf.why -T Test -G G
-	bin/why.$(OCAMLBEST) -D bench/plugins/simplify_array.drv \
-	tests/test-jcf.why -T Test_simplify_array -G G
 
 ###############
 # test targets

bench/plugins/simplify_array.ml → src/transform/simplify_array.ml

@@ -17,7 +17,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-open Why
 open Term
 open Theory
 open Env
@@ -31,7 +30,7 @@ let make_rt_rf env =
   let array  = 
     try
       find_theory env prelude array
-    with TheoryNotFound (l,s) -> 
+    with TheoryNotFound (_,s) -> 
       Format.eprintf "The theory %s is unknown" s; 
       exit 1 in 
   let store  = (ns_find_ls array.th_export store).ls_name in
@@ -49,8 +48,8 @@ let make_rt_rf env =
   
 let t =
   Register.store_env
-  (fun () env ->
+  (fun env ->
      let rt,rf = make_rt_rf env in
      Trans.rewrite rt rf None)
 
-let () = Driver.register_transform "simplify_array" t
+let () = Register.register_transform "simplify_array" t