added -threads and -vmthreads option information to the ppx context (ocaml#1336)

Author: camlspotter

Changes

@@ -253,6 +253,10 @@ Working version
 - GPR#1333: turn off warning 40 by default
   (Leo White)
 
+- GPR#1336: -thread and -vmthread option information is propagated to
+  PPX rewriters.
+  (Jun Furuse, review by Alain Frisch)
+
 ### Other libraries:
 
 - GPR#1178: remove the Num library for arbitrary-precision arithmetic.

parsing/ast_mapper.ml

@@ -725,6 +725,8 @@ module PpxContext = struct
         lid "open_modules", make_list make_string !Clflags.open_modules;
         lid "for_package",  make_option make_string !Clflags.for_package;
         lid "debug",        make_bool !Clflags.debug;
+        lid "use_threads",  make_bool !Clflags.use_threads;
+        lid "use_vmthreads", make_bool !Clflags.use_vmthreads;
         get_cookies ()
       ]
     in
@@ -791,6 +793,10 @@ module PpxContext = struct
           Clflags.for_package := get_option get_string payload
       | "debug" ->
           Clflags.debug := get_bool payload
+      | "use_threads" ->
+          Clflags.use_threads := get_bool payload
+      | "use_vmthreads" ->
+          Clflags.use_vmthreads := get_bool payload
       | "cookies" ->
           let l = get_list (get_pair get_string (fun x -> x)) payload in
           cookies :=

testsuite/tests/ppx-contexts/Makefile

@@ -0,0 +1,26 @@
+BASEDIR=../..
+
+INCLUDES=\
+  -I $(OTOPDIR)/parsing \
+  -I $(OTOPDIR)/utils \
+  -I $(OTOPDIR)compilerlibs
+
+.PHONY: run
+run: program$(EXE) test.reference
+	@echo " ... testing -thread and -vmthread are propagated to PPX:"
+	$(OCAMLC) -c -thread -ppx '$(OCAMLRUN) ./program$(EXE)' test.ml 2> test.result
+	$(OCAMLC) -c -vmthread -ppx '$(OCAMLRUN) ./program$(EXE)' test.ml 2>> test.result
+	@$(DIFF) test.reference test.result >/dev/null \
+	&& echo " => passed" || echo " => failed"
+
+program$(EXE): program.ml Makefile
+	$(OCAMLC) -o $@ $(INCLUDES) -I ../../../compilerlibs ocamlcommon.cma ./program.ml
+
+.PHONY: promote
+promote: defaultpromote
+
+.PHONY: clean
+clean: defaultclean
+	@rm -f program$(EXE) test.result *.cm*
+
+include $(BASEDIR)/makefiles/Makefile.common

testsuite/tests/ppx-contexts/program.ml

@@ -0,0 +1,10 @@
+(* A simple PPX *)
+
+open Ast_mapper
+
+let () =
+  register "test" (fun _ ->
+      Printf.eprintf "use_threads=%b\n" !Clflags.use_threads;
+      Printf.eprintf "use_vmthreads=%b\n" !Clflags.use_vmthreads;
+      default_mapper);
+

testsuite/tests/ppx-contexts/test.ml

@@ -0,0 +1 @@
+(* empty *)

testsuite/tests/ppx-contexts/test.reference

@@ -0,0 +1,4 @@
+use_threads=true
+use_vmthreads=false
+use_threads=false
+use_vmthreads=true