Redefine 'Stdlib.raise' in the 'Landmark' to allow using landmark wit…

…h -no-stdlib (as 'raise' is used to wrap exception in the generated code).

CHANGES.md

@@ -4,6 +4,7 @@ version 1.3, 6 dec 2018
 * migrate to opam 2.0
 * adds two new primitives: push/pop_profiling_state
 * prepare migration for Pervasives deprecation
+* redefine 'Stdlib.raise' in the 'Landmark' to allow using landmark with -no-stdlib (as 'raise' is used to wrap exception in the generated code).
 
 version 1.2, 20 may 2018
 ------------------------

ppx/mapper.ml

@@ -93,18 +93,7 @@ let new_landmark landmark_name loc =
 
 let qualified ctx name = String.concat "." (List.rev (name :: ctx))
 
-let raise_ident =
-  let stdlib_raise = "Stdlib.raise" in
-  try
-    let major, minor =
-      Scanf.sscanf Sys.ocaml_version "%d.%d" (fun major minor -> major, minor)
-    in
-    if major = 4 && minor < 7 then
-      "Pervasives.raise"
-    else
-      stdlib_raise
-  with Scanf.Scan_failure _ -> stdlib_raise
-
+let raise_ident = "Landmark.raise"
 
 let wrap_landmark ctx landmark_name loc expr =
   let landmark_name = qualified ctx landmark_name in

src/landmark.ml

@@ -815,3 +815,4 @@ let () = match Sys.getenv "OCAML_LANDMARKS" with
     try start_profiling ~profiling_options:(parse_env_options str) ()
     with Exit -> ()
 
+external raise : exn -> 'a = "%raise"

src/landmark.mli

@@ -146,4 +146,7 @@ val push_profiling_state: unit -> unit
 (** Save the state of the profiler on a stack to be retrieved later by [pop_profiling_state ()]. *)
 
 val pop_profiling_state: unit -> unit
-(** See [push_profiling_state ()]. *)
+(** See [push_profiling_state ()]. *)
+
+external raise : exn -> 'a = "%raise"
+(** This a redefinition of [Stdlib.raise] to allow generated code to work with -no-stdlib.*)