Change the names of parse_cvc4_z3_model* to Parse_smtv2_model*.

Makefile.in

@@ -133,8 +133,8 @@ LIBGENERATED = src/util/config.ml \
 	       src/parser/parser.mli src/parser/parser.ml \
 	       src/driver/driver_parser.mli src/driver/driver_parser.ml \
 	       src/driver/driver_lexer.ml \
-               src/driver/parse_cvc4_z3_model_parser.mli src/driver/parse_cvc4_z3_model_parser.ml \
-               src/driver/parse_cvc4_z3_model_lexer.ml \
+               src/driver/parse_smtv2_model_parser.mli src/driver/parse_smtv2_model_parser.ml \
+               src/driver/parse_smtv2_model_lexer.ml \
 	       src/session/compress.ml src/session/xml.ml \
 	       src/session/strategy_parser.ml \
 	       lib/ocaml/why3__BigInt_compat.ml
@@ -149,7 +149,7 @@ LIB_CORE = ident ty term pattern decl theory \
 
 LIB_DRIVER = call_provers driver_ast driver_parser driver_lexer driver \
 	     whyconf autodetection \
-             parse_cvc4_z3_model_parser parse_cvc4_z3_model_lexer parse_cvc4_z3_model
+             parse_smtv2_model_parser parse_smtv2_model_lexer parse_smtv2_model
 
 LIB_MLW = ity expr dexpr
 

drivers/cvc4_15.drv

@@ -24,7 +24,7 @@ transformation "introduce_premises"
 transformation "intro_projections_counterexmp"
 
 (* Counterexamples: set model parser *)
-model_parser "cvc4_z3"
+model_parser "smtv2"
 
 import "smt-libv2.drv"
 import "smt-libv2-bv.gen"

drivers/cvc4_bare.drv

@@ -20,7 +20,7 @@ prelude "(set-option :produce-models true)"
 transformation "introduce_premises"
 
 (* Counterexamples: set model parser *)
-model_parser "cvc4_z3"
+model_parser "smtv2"
 
 import "smt-libv2.drv"
 

drivers/z3_432.drv

@@ -13,7 +13,7 @@ transformation "introduce_premises"
 transformation "intro_projections_counterexmp"
 
 (* Counterexamples: set model parser *)
-model_parser "cvc4_z3"
+model_parser "smtv2"
 
 
 import "smt-libv2.drv"

src/driver/parse_cvc4_z3_model.ml → src/driver/parse_smtv2_model.ml

@@ -17,7 +17,7 @@ open Term
 open Model_parser
 open Lexing
 
-let debug = Debug.register_info_flag "parse_cvc4_z3_model"
+let debug = Debug.register_info_flag "parse_smtv2_model"
   ~desc:"Print@ debugging@ messages@ about@ parsing@ model@ \
          returned@ from@ cvc4@ or@ z3."
 
@@ -88,14 +88,14 @@ let get_position lexbuf =
 let do_parsing model =
   let lexbuf = Lexing.from_string model in
   try
-    Parse_cvc4_z3_model_parser.output Parse_cvc4_z3_model_lexer.token lexbuf
+    Parse_smtv2_model_parser.output Parse_smtv2_model_lexer.token lexbuf
   with
-  | Parse_cvc4_z3_model_lexer.SyntaxError -> 
+  | Parse_smtv2_model_lexer.SyntaxError -> 
     Warning.emit 
       ~loc:(get_position lexbuf)
       "Error@ during@ lexing@ of@ smtlib@ model:@ unexpected character";
     []
-  | Parse_cvc4_z3_model_parser.Error ->
+  | Parse_smtv2_model_parser.Error ->
     begin
       let loc = get_position lexbuf in
       Warning.emit ~loc:loc "Error@ during@ parsing@ of@ smtlib@ model";
@@ -121,5 +121,5 @@ let parse input printer_mapping =
   | Not_found -> [] 
 
     
-let () = register_model_parser "cvc4_z3" parse
+let () = register_model_parser "smtv2" parse
   ~desc:"Parser@ for@ the@ model@ of@ cv4@ and@ z3."

src/driver/parse_cvc4_z3_model_lexer.mll → src/driver/parse_smtv2_model_lexer.mll

 {
-  open Parse_cvc4_z3_model_parser
+  open Parse_smtv2_model_parser
   exception SyntaxError
 }
 

src/driver/parse_cvc4_z3_model_parser.mly → src/driver/parse_smtv2_model_parser.mly

@@ -104,3 +104,4 @@ array:
 
 array_skipped_part:
 | LPAREN term_list RPAREN {}
+