Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-ppx_optcomp for openSUSE:Factory checked in at 2021-09-29 20:18:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-ppx_optcomp (Old) and /work/SRC/openSUSE:Factory/.ocaml-ppx_optcomp.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-ppx_optcomp" Wed Sep 29 20:18:34 2021 rev:2 rq:921276 version:0.14.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-ppx_optcomp/ocaml-ppx_optcomp.changes 2021-04-29 01:37:51.062531719 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-ppx_optcomp.new.1899/ocaml-ppx_optcomp.changes 2021-09-29 20:19:38.939052379 +0200 @@ -1,0 +2,6 @@ +Sat Sep 11 12:34:56 UTC 2021 - oher...@suse.de + +- Update to version 0.14.3 + no changelog provided + +------------------------------------------------------------------- Old: ---- ocaml-ppx_optcomp-0.14.1.tar.xz New: ---- ocaml-ppx_optcomp-0.14.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-ppx_optcomp.spec ++++++ --- /var/tmp/diff_new_pack.imZY1I/_old 2021-09-29 20:19:39.371053006 +0200 +++ /var/tmp/diff_new_pack.imZY1I/_new 2021-09-29 20:19:39.375053011 +0200 @@ -17,7 +17,7 @@ Name: ocaml-ppx_optcomp -Version: 0.14.1 +Version: 0.14.3 Release: 0 %{?ocaml_preserve_bytecode} Summary: Optional compilation for OCaml @@ -26,9 +26,9 @@ BuildRoot: %_tmppath/%name-%version-build URL: https://opam.ocaml.org/packages/ppx_optcomp Source0: %{name}-%{version}.tar.xz -BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20210409 -BuildRequires: ocaml(ocaml_base_version) >= 4.04 +BuildRequires: ocaml-dune >= 2.0 +BuildRequires: ocaml-rpm-macros >= 20210911 +BuildRequires: ocaml(ocaml_base_version) >= 4.08 BuildRequires: ocamlfind(base) BuildRequires: ocamlfind(compiler-libs.common) BuildRequires: ocamlfind(ppxlib) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.imZY1I/_old 2021-09-29 20:19:39.399053046 +0200 +++ /var/tmp/diff_new_pack.imZY1I/_new 2021-09-29 20:19:39.399053046 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> <param name="filename">ocaml-ppx_optcomp</param> - <param name="revision">8f30ac19cc93996e4ade8993baafafd94f3a77cb</param> + <param name="revision">a4429abcad42230e8cb6a86bdf3462d229169482</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/janestreet/ppx_optcomp.git</param> ++++++ ocaml-ppx_optcomp-0.14.1.tar.xz -> ocaml-ppx_optcomp-0.14.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ppx_optcomp-0.14.1/.gitignore new/ocaml-ppx_optcomp-0.14.3/.gitignore --- old/ocaml-ppx_optcomp-0.14.1/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/ocaml-ppx_optcomp-0.14.3/.gitignore 2021-08-16 12:48:02.000000000 +0200 @@ -0,0 +1,5 @@ +_build +*.install +*.merlin +_opam + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ppx_optcomp-0.14.1/src/cparser.ml new/ocaml-ppx_optcomp-0.14.3/src/cparser.ml --- old/ocaml-ppx_optcomp-0.14.1/src/cparser.ml 2020-10-30 20:41:33.000000000 +0100 +++ new/ocaml-ppx_optcomp-0.14.3/src/cparser.ml 2021-08-16 12:48:02.000000000 +0200 @@ -6,7 +6,7 @@ module Parsing = Caml.Parsing -type lexer = Lexing.lexbuf -> Parser.token +type lexer = Lexing.lexbuf -> Ocaml_common.Parser.token (* +---------------------------------------------------------------+ | Parsing of directives | @@ -28,9 +28,9 @@ ;; let fetch_directive_argument (lexer : lexer) lexbuf = - let rec loop acc (brackets : Parser.token list) = + let rec loop acc (brackets : Ocaml_common.Parser.token list) = match lexer lexbuf, brackets with - | EOF, _ | EOL, [] -> located Parser.EOF lexbuf :: acc + | EOF, _ | EOL, [] -> located Ocaml_common.Parser.EOF lexbuf :: acc | (EOL | COMMENT _), _ -> loop acc brackets | token, _ -> let acc = located token lexbuf :: acc in @@ -58,7 +58,7 @@ | [] -> None | tokens -> let tokens = ref tokens in - let fake_lexer (lexbuf : Lexing.lexbuf) : Parser.token = + let fake_lexer (lexbuf : Lexing.lexbuf) : Ocaml_common.Parser.token = match !tokens with | [] -> EOF | token :: rest -> @@ -69,10 +69,10 @@ in let fake_lexbuf = Lexing.from_function (fun _ _ -> assert false) in fake_lexbuf.lex_curr_p <- start_pos; - match parse Parser.implementation fake_lexer fake_lexbuf with + match parse Ocaml_common.Parser.implementation fake_lexer fake_lexbuf with | [] -> None | [st] -> - assert_no_attributes_in#structure_item st; + assert_no_attributes_in#structure (Ppxlib.Selected_ast.Of_ocaml.copy_structure [st]); Some st | _ :: st :: _ -> Location.raise_errorf ~loc:st.pstr_loc "optcomp: too many structure items" @@ -83,7 +83,7 @@ let arg = fetch_directive_argument lexer lexbuf in let loc = { token.loc with loc_end = Lexing.lexeme_end_p lexbuf } in let payload = match arg with - | Some st_item -> PStr [st_item] + | Some st_item -> PStr (Ppxlib.Selected_ast.Of_ocaml.copy_structure [st_item]) | None -> PStr [] in match token.txt with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-ppx_optcomp-0.14.1/src/interpreter.ml new/ocaml-ppx_optcomp-0.14.3/src/interpreter.ml --- old/ocaml-ppx_optcomp-0.14.1/src/interpreter.ml 2020-10-30 20:41:33.000000000 +0100 +++ new/ocaml-ppx_optcomp-0.14.3/src/interpreter.ml 2021-08-16 12:48:02.000000000 +0200 @@ -37,6 +37,18 @@ (fun major minor patchlevel -> Tuple [Int major; Int minor; Int patchlevel]) ;; + let config_bool name = + Bool + (Ocaml_common.Config.config_var name + |> Option.map ~f:Bool.of_string + |> Option.value ~default:false) + ;; + + + let flambda_backend = config_bool "flambda_backend";; + + let flambda2 = config_bool "flambda2";; + let rec to_expression loc t = match t with | Bool x -> ebool ~loc x @@ -158,6 +170,14 @@ ; txt = "ocaml_version" }, Value.ocaml_version + ; { loc = Location.none + ; txt = "flambda_backend" + }, + Value.flambda_backend + ; { loc = Location.none + ; txt = "flambda2" + }, + Value.flambda2 ] let short_loc_string (loc : Location.t) =