mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-ml/protocol_version_header: drop 0.14.0
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
This commit is contained in:
@@ -1,63 +0,0 @@
|
||||
commit a4422ecd7e0677569533b1dae07924f5d786e8f6 (HEAD, origin/upgrade-ppxlib-0.18.0)
|
||||
Author: Nathan Rebours <nathan.p.rebours@gmail.com>
|
||||
Date: Mon Oct 5 18:35:26 2020 +0200
|
||||
|
||||
Make ppx_optcomp compatible with ppxlib.0.18.0
|
||||
|
||||
ppxlib.0.18.0 upgrades to the 4.11 AST which results in a change
|
||||
in string constants representation. This PR makes ppx_optcomp
|
||||
compatible with the latest ppxlib.
|
||||
|
||||
You might want for the actual release of ppxlib.0.18.0 before merging
|
||||
this!
|
||||
|
||||
Signed-off-by: Nathan Rebours <nathan.p.rebours@gmail.com>
|
||||
|
||||
diff --git a/ppx_optcomp.opam b/ppx_optcomp.opam
|
||||
index 20eb7c5..cbe8b5c 100644
|
||||
--- a/ppx_optcomp.opam
|
||||
+++ b/ppx_optcomp.opam
|
||||
@@ -15,7 +15,7 @@ depends: [
|
||||
"base" {>= "v0.14" & < "v0.15"}
|
||||
"stdio" {>= "v0.14" & < "v0.15"}
|
||||
"dune" {>= "2.0.0"}
|
||||
- "ppxlib" {>= "0.11.0"}
|
||||
+ "ppxlib" {>= "0.18.0"}
|
||||
]
|
||||
synopsis: "Optional compilation for OCaml"
|
||||
description: "
|
||||
diff --git a/src/interpreter.ml b/src/interpreter.ml
|
||||
index f1da14b..1c6d726 100644
|
||||
--- a/src/interpreter.ml
|
||||
+++ b/src/interpreter.ml
|
||||
@@ -241,7 +241,7 @@ let rec eval env e : Value.t =
|
||||
match e.pexp_desc with
|
||||
| Pexp_constant (Pconst_integer (x, None)) -> Int (parse_int loc x)
|
||||
| Pexp_constant (Pconst_char x ) -> Char x
|
||||
- | Pexp_constant (Pconst_string (x, _ )) -> String x
|
||||
+ | Pexp_constant (Pconst_string (x, _, _ )) -> String x
|
||||
|
||||
| Pexp_construct ({ txt = Lident "true" ; _ }, None) -> Bool true
|
||||
| Pexp_construct ({ txt = Lident "false"; _ }, None) -> Bool false
|
||||
@@ -361,7 +361,7 @@ and bind env patt value =
|
||||
|
||||
| Ppat_constant (Pconst_integer (x, None)), Int y when parse_int loc x = y -> env
|
||||
| Ppat_constant (Pconst_char x ), Char y when Char.equal x y -> env
|
||||
- | Ppat_constant (Pconst_string (x, _ )), String y when String.equal x y -> env
|
||||
+ | Ppat_constant (Pconst_string (x, _, _ )), String y when String.equal x y -> env
|
||||
|
||||
| Ppat_construct ({ txt = Lident "true" ; _ }, None), Bool true -> env
|
||||
| Ppat_construct ({ txt = Lident "false"; _ }, None), Bool false -> env
|
||||
diff --git a/src/ppx_optcomp.ml b/src/ppx_optcomp.ml
|
||||
index a2573de..d87ea24 100644
|
||||
--- a/src/ppx_optcomp.ml
|
||||
+++ b/src/ppx_optcomp.ml
|
||||
@@ -81,7 +81,7 @@ module Ast_utils = struct
|
||||
let get_string ~loc payload =
|
||||
let e = get_expr ~loc payload in
|
||||
match e with
|
||||
- | { pexp_desc = Pexp_constant (Pconst_string (x, _ )); _ } -> x
|
||||
+ | { pexp_desc = Pexp_constant (Pconst_string (x, _, _ )); _ } -> x
|
||||
| _ -> Location.raise_errorf ~loc "optcomp: invalid directive syntax, expected string"
|
||||
|
||||
end
|
||||
@@ -1,4 +1,3 @@
|
||||
DIST protocol_version_header-0.14.0.tar.gz 6524 BLAKE2B 3463cfbfa2faf0573dec57e8d1eae5ed47f2210c7eb3872fcb5a9206bf65cc22f184944f4c624a17e44e267f3b0443f8e4fe33e8d40157e9f5afb68f0b7b5e4e SHA512 50f58d79a2c92a2f7b9f1cd54b548ae53649bd876f77a017b1483fda53cd1b398dbef7e992dcb283796d035fa361424c9529244b73d33d9ff2699dae70b6410a
|
||||
DIST protocol_version_header-0.15.0.tar.gz 7704 BLAKE2B 208254706a2d8ae9f77a9c9c40bfd8af34585a7e1f201338d888b12f804139868987532db9b4f862c659e3101c5ed493bb782f64ed251030e235937beb419d65 SHA512 1c28fbe26155dc5d780ce111725b21b95773d0a0bc3219a37e94b7c920c18e55fa33b31156f3ab3c02ae403c7f667f009f3ef7a965cadf7177c857bd71bd4956
|
||||
DIST protocol_version_header-0.16.0.tar.gz 9189 BLAKE2B d61ebb49e15d47e76fc01911a6c9e5fcacb05bbee39cc5e40557c8882226edb8d2b78eed0c23a14e9241961511412f44f5522d146851ee0e3ace85b9f1b20838 SHA512 ac11dd81f4afb47ad670919e2b3ea49a7e05d193e45369f145711b2266fc54c8eea180cba285effecdc2a59e1cff65c59acd182fa3d88191e9813855dea370c7
|
||||
DIST protocol_version_header-0.17.0.tar.gz 9374 BLAKE2B cff78b7fa842b2642a6b3f997cab8072868c51898a920792ba644dfdbadb28933b663d71ed7c6ddfc586b65b0cd9c1b90f554c82a2742435d39ed025e286f1c3 SHA512 593fe348fa9aad953d0adc208fa77e7384fb58ea9e69d4dd7d8fba6c51001e77f5d22a2dc6c4501fcea46d290520ad2c6d301d8c9d8232cf4281b767e4de8de7
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit dune
|
||||
|
||||
DESCRIPTION="Protocol aware version negotiation for OCaml"
|
||||
HOMEPAGE="https://github.com/janestreet/protocol_version_header"
|
||||
SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="+ocamlopt"
|
||||
|
||||
RDEPEND="
|
||||
dev-ml/core_kernel:=
|
||||
dev-ml/ppx_jane:=
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
Reference in New Issue
Block a user