Skip to content

Commit

Permalink
Merge pull request #89 from mjustus/master
Browse files Browse the repository at this point in the history
Support for OCaml 4.08
  • Loading branch information
toots committed Feb 8, 2020
2 parents e4f029b + 1971ebc commit 25c0dbd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2.2
* Support for OCaml 4.08

2.1
* GPR#78: Auto-generate unicode data

Expand Down
4 changes: 2 additions & 2 deletions sedlex.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/syntax/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/syntax/ppx_sedlex.ml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 25c0dbd

Please sign in to comment.