(* Define a goal name which the body may use. *)
let goalname = $str:name$ in
+ _enter_goal goalname;
+
(* Source location. *)
let goalloc = $str:goalloc$ in
$body$ ;
_call_onruns ();
_call_onsuccesses ();
+ _leave_goal goalname;
(* Avoid a compiler warning: *)
ignore (goalname); ignore (goalloc)
* ordinary function exit.
*)
| Goal_result Goal_OK ->
+ _leave_goal goalname;
_call_onsuccesses ();
()
| exn ->
+ _leave_goal goalname;
_call_onfails exn;
raise exn
>> in
let () = publish $str:name$ (
function
| [] ->
- Goaljobs.require $lid:gname$
+ Goaljobs.require $str:name$ $lid:gname$
| _ ->
failwith (Printf.sprintf "goal '%s' does not take any arguments"
$str:name$);
let rec rewrite = function
| ExApp (_loc, ExId (_loc1, IdLid (_loc2, name)), right) ->
let gname = "goal_" ^ name in
- ExApp (_loc, ExId (_loc1, IdLid (_loc2, gname)), right)
+ ExApp (_loc, ExId (_loc1, IdLid (_loc2, gname)), right), name
+
| ExApp (_loc, (ExApp _ as expr), right) ->
- ExApp (_loc, rewrite expr, right)
+ let expr, name = rewrite expr in
+ ExApp (_loc, expr, right), name
+
| _ ->
locfail _loc "require (...) expression must contain a call to a goal"
in
- let expr = rewrite expr in
- <:expr< Goaljobs.require (fun () -> $expr$) >>
+ let expr, name = rewrite expr in
+ <:expr< Goaljobs.require $str:name$ (fun () -> $expr$) >>
;;