From b06d75dae2a03f2abfa4533cb6a51ad3d7c2ac37 Mon Sep 17 00:00:00 2001 From: Justus Matthiesen Date: Fri, 31 Jan 2020 15:38:37 +0000 Subject: [PATCH 1/4] Bump ppx_tools_versioned --- sedlex.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sedlex.opam b/sedlex.opam index 57397b84..ce5383cd 100644 --- a/sedlex.opam +++ b/sedlex.opam @@ -26,7 +26,7 @@ build: [ depends: [ "ocaml" {>= "4.02.3"} "dune" {>= "1.8"} - "ppx_tools_versioned" + "ppx_tools_versioned" {>= "5.2.3"} "ocaml-migrate-parsetree" "gen" "uchar" From 6c15cc420b46d13c2f725bd02543642ed45698d2 Mon Sep 17 00:00:00 2001 From: Justus Matthiesen Date: Fri, 31 Jan 2020 15:43:27 +0000 Subject: [PATCH 2/4] Use OCaml 4.08 syntax --- src/syntax/dune | 4 ++-- src/syntax/ppx_sedlex.ml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/syntax/dune b/src/syntax/dune index 0e952ff8..5d908022 100644 --- a/src/syntax/dune +++ b/src/syntax/dune @@ -2,10 +2,10 @@ (name sedlex_ppx) (public_name sedlex.ppx) (kind ppx_rewriter) - (libraries ppx_tools_versioned.metaquot_405 ocaml-migrate-parsetree sedlex) + (libraries ppx_tools_versioned.metaquot_408 ocaml-migrate-parsetree sedlex) (ppx_runtime_libraries sedlex) (preprocess - (pps ppx_tools_versioned.metaquot_405)) + (pps ppx_tools_versioned.metaquot_408)) (flags (:standard -w -9))) (rule diff --git a/src/syntax/ppx_sedlex.ml b/src/syntax/ppx_sedlex.ml index e6d69069..822a5289 100644 --- a/src/syntax/ppx_sedlex.ml +++ b/src/syntax/ppx_sedlex.ml @@ -4,15 +4,15 @@ open Longident open Migrate_parsetree -open Ast_405 +open Ast_408 open Parsetree open Asttypes open Ast_helper -open Ast_convenience_405 +open Ast_convenience_408 -module Ast_mapper_class = Ast_mapper_class_405 +module Ast_mapper_class = Ast_mapper_class_408 -let ocaml_version = Versions.ocaml_405 +let ocaml_version = Versions.ocaml_408 module Cset = Sedlex_cset From 799ff51070d08a5148e4ed2a7fd417a6b9814a0c Mon Sep 17 00:00:00 2001 From: Justus Matthiesen Date: Fri, 31 Jan 2020 15:45:21 +0000 Subject: [PATCH 3/4] Update changelog --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 9f897745..b75f0309 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +2.2 + * Support for OCaml 4.08 + 2.1 * GPR#78: Auto-generate unicode data From 1971ebcfbc43e9f9a2428364f9a75d7e960f3b32 Mon Sep 17 00:00:00 2001 From: Justus Matthiesen Date: Fri, 31 Jan 2020 16:03:45 +0000 Subject: [PATCH 4/4] Bump version to 2.2 --- sedlex.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sedlex.opam b/sedlex.opam index ce5383cd..e379d2d2 100644 --- a/sedlex.opam +++ b/sedlex.opam @@ -7,7 +7,7 @@ Unicode. Unlike ocamllex, sedlex allows lexer specifications within regular OCaml source files. Lexing specific constructs are provided via a ppx syntax extension. " -version: "2.1" +version: "2.2" license: "MIT" doc: "https://ocaml-community.github.io/sedlex/index.html" maintainer: "Alain Frisch "