Merge pull request #360 from LPCIC/fix-old-ocaml

fix old ocaml

Author: gares

dune-project

@@ -1,3 +1,3 @@
-(lang dune 2.8)
+(lang dune 2.9)
 (name elpi)
 (using menhir 2.0)

elpi.opam

@@ -16,7 +16,8 @@ x-maintenance-intent: ["(latest)"]
 depends: [
   "ocaml" {>= "4.13.0" }
   "stdlib-shims"
-  "ppxlib" {>= "0.36.0"}
+  "ppxlib" {>= "0.12.0"}
+  "ppx_optcomp"
   "menhir" {>= "20211230" }
   "re" {>= "1.7.2"}
   "ppx_deriving" {>= "4.3"}

trace/ppx/dune

@@ -1,10 +1,27 @@
 (library
-  (name trace_ppx)
-  (public_name elpi.trace.ppx)
-  (libraries ppxlib)
-  (preprocess (pps ppxlib.metaquot))
-  (kind ppx_rewriter)
-  (ppx_runtime_libraries elpi.trace.runtime)
-  (modules trace_ppx)
-  (optional)
-)
+ (name trace_ppx)
+ (public_name elpi.trace.ppx)
+ (libraries ppxlib)
+ (preprocessor_deps trace_ppx_config.mlh)
+ (preprocess
+  (pps ppxlib.metaquot ppx_optcomp))
+ (kind ppx_rewriter)
+ (ppx_runtime_libraries elpi.trace.runtime)
+ (modules trace_ppx)
+ (optional))
+
+(rule
+ (target trace_ppx_config.mlh)
+ (action
+  (with-stdout-to
+   %{target}
+   (progn
+    (echo "(* Automatically generated, don't edit *)\n")
+    (echo "[%%define ppxlib ")
+    (run ./version_parser.exe %{version:ppxlib})
+    (echo "]\n")))))
+
+(executable
+ (name version_parser)
+ (modules version_parser)
+ (libraries str))

trace/ppx/trace_ppx.ml

@@ -45,6 +45,8 @@
 
 *)
 
+[%%import "trace_ppx_config.mlh"]
+
 open Ppxlib
 open Ast_builder.Default
 
@@ -173,7 +175,11 @@ let map_trace = object(self)
         let args = List.map (fun (x,y) -> x, self#expression y) args in
         if args = [] then hd
         else { e with pexp_desc = Pexp_apply (hd,args)}
-    | Pexp_function (params, constraint_, rest) when not !enabled ->
+    | Pexp_fun(_,_,pat,rest) [@if ppxlib < (0,36,0)] when not !enabled ->
+        let has_iftrace { ppat_attributes = l; _ } = has_iftrace_attribute l in
+        if has_iftrace pat then self#expression rest
+        else e
+    | Pexp_function (params, constraint_, rest) [@if ppxlib >= (0,36,0)] when not !enabled ->
         let has_iftrace_pat { ppat_attributes = l; _ } = has_iftrace_attribute l in
         let does_not_have_iftrace_param = function
           | { pparam_desc = Pparam_val (_, _, pat); _ } -> not (has_iftrace_pat pat)

trace/ppx/version_parser.ml

@@ -0,0 +1,19 @@
+let is_number x = try let _ = int_of_string x in true with _ -> false ;;
+
+let main () =
+  let v = Sys.argv.(1) in
+  let v' = Str.(replace_first (regexp "^v") "" v) in     (* v1.20... -> 1.20... *)
+  let v' = Str.(replace_first (regexp "\\(-\\|\\+\\).*$") "" v') in  (* ...-10-fjdnfs -> ... *)
+  let l = String.split_on_char '.' v' in
+  (* sanitization *)
+  let l =
+    match l with
+    | n1 :: n2 :: n3 :: _ when is_number n1 && is_number n2 && is_number n3 -> [n1;n2;n3]
+    | [_;_] as l when List.for_all is_number l -> l @ ["0"]
+    | [_] as l when List.for_all is_number l -> l @ ["0";"0"]
+    | _ -> ["99";"99";"99"] in
+  let open Format in
+  printf "(%a)%!" (pp_print_list ~pp_sep:(fun fmt () -> pp_print_string fmt ", ") pp_print_string) l
+;;
+
+main ()