diff --git a/frenetic.opam b/frenetic.opam index 0be484e63..94d679e8e 100644 --- a/frenetic.opam +++ b/frenetic.opam @@ -38,7 +38,7 @@ depends: [ "ppx_metaquot" "ppx_sexp_conv" "ppx_tools_versioned" - "sedlex" + "sedlex" {>= "1.99.4"} "sexplib" "tcpip" "yojson" {>= "1.2.0"} diff --git a/src/lib/netkat/Lexer.cppo.sedlex.ml b/src/lib/netkat/Lexer.cppo.ml similarity index 100% rename from src/lib/netkat/Lexer.cppo.sedlex.ml rename to src/lib/netkat/Lexer.cppo.ml diff --git a/src/lib/netkat/jbuild b/src/lib/netkat/jbuild index 867870506..aae208a7a 100644 --- a/src/lib/netkat/jbuild +++ b/src/lib/netkat/jbuild @@ -20,19 +20,15 @@ (deps (Tokens.mly)) (action (run ${bin:menhir} --only-tokens --infer ${<})))) -;; generate lexer -- temporary hack while ppx_sedlex and ppx_import are incompatible with jbuilder!! +;; generate lexer -- temporary hack while ppx_import is incompatible with jbuilder!! (rule - ((targets (Lexer.sedlex.ml)) - (deps (Lexer.cppo.sedlex.ml Tokens.ml)) + ((targets (Lexer.ml)) + (deps (Lexer.cppo.ml Tokens.ml)) (action (run ${bin:cppo} ${<} -n -o ${@})))) (rule ((targets (Lexer.mli)) (deps (Lexer.cppo.mli Tokens.ml)) (action (run ${bin:cppo} ${<} -n -o ${@})))) -(rule - ((targets (Lexer.ml)) - (deps (Lexer.sedlex.ml)) - (action (run ${lib:sedlex:ppx_sedlex} ${<} -o ${@})))) ;; generate parser (menhir @@ -70,6 +66,7 @@ ppx_fields_conv ppx_sexp_conv ppx_hash + sedlex.ppx ocaml-migrate-parsetree.driver-main -no-check ))) (flags (:standard -safe-string))