add rec decl/def to ML #4563

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/api/ml/z3.ml

@@ -263,6 +263,8 @@ sig
   end
   val mk_func_decl : context -> Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
   val mk_func_decl_s : context -> string -> Sort.sort list -> Sort.sort -> func_decl
+  val mk_rec_fun : context > Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
+  val mk_rec_fun_s : context > string -> Sort.sort list -> Sort.sort -> func_decl
   val mk_fresh_func_decl : context -> string -> Sort.sort list -> Sort.sort -> func_decl
   val mk_const_decl : context -> Symbol.symbol -> Sort.sort -> func_decl
   val mk_const_decl_s : context -> string -> Sort.sort -> func_decl
@@ -338,6 +340,15 @@ end = struct
   let mk_func_decl_s (ctx:context) (name:string) (domain:Sort.sort list) (range:Sort.sort) =
     mk_func_decl ctx (Symbol.mk_string ctx name) domain range
 
+  let mk_rec_fun (ctx:context) (name:Symbol.symbol) (domain:Sort.sort list) (range:Sort.sort) =
+    Z3native.mk_rec_fun ctx name (List.length domain) domain range
+
+  let mk_rec_fun_s (ctx:context) (name:string) (domain:Sort.sort list) (range:Sort.sort) =
+    mk_rec_fun ctx (Symbol.mk_string ctx name) domain range
+
+  let add_rec_def (ctx:context) (f:func_decl) (args:Expr.expr list) (body:Expr.expr)
+    Z3native.add_rec_def ctx f (List.length args) args body
+
   let mk_fresh_func_decl (ctx:context) (prefix:string) (domain:Sort.sort list) (range:Sort.sort) =
     Z3native.mk_fresh_func_decl ctx prefix (List.length domain) domain range
 

src/api/ml/z3.mli

@@ -326,10 +326,22 @@ sig
 
   (** Creates a new function declaration. *)
   val mk_func_decl_s : context -> string -> Sort.sort list -> Sort.sort -> func_decl
-  (** Creates a fresh function declaration with a name prefixed with a prefix string. *)
 
+  (** Creates a function declaration that can be used in a recursive function definition.
+      {!add_rec_def} *)
+  val mk_rec_fun : context > Symbol.symbol -> Sort.sort list -> Sort.sort -> func_decl
+
+  (** Creates a function declaration that can be used in a recursive function definition.
+      {!add_rec_def} *)
+  val mk_rec_fun_s : context > string -> Sort.sort list -> Sort.sort -> func_decl
+
+  (** Registers a recursive function definition *)
+  val add_rec_def : context -> func_decl -> Expr.expr list -> Expr.expr -> unit
+
+  (** Creates a fresh function declaration with a name prefixed with a prefix string. *)
   val mk_fresh_func_decl : context -> string -> Sort.sort list -> Sort.sort -> func_decl
 
+
   (** Creates a new constant function declaration. *)
   val mk_const_decl : context -> Symbol.symbol -> Sort.sort -> func_decl
 

src/util/bit_vector.h

@@ -16,8 +16,7 @@ Author:
 Revision History:
 
 --*/
-#ifndef BIT_VECTOR_H_
+#pragma once
-#define BIT_VECTOR_H_
 
 #include<string.h>
 #include "util/debug.h"
@@ -251,5 +250,4 @@ public:
     }
 };
 
-#endif /* BIT_VECTOR_H_ */