diff --git a/src/usexp/dune_lexer.mll b/src/usexp/dune_lexer.mll index 2c3a10a2..4803c4de 100644 --- a/src/usexp/dune_lexer.mll +++ b/src/usexp/dune_lexer.mll @@ -1,5 +1,5 @@ { -open Lexer0 +open Lexer_shared type block_string_line_kind = | With_escape_sequences diff --git a/src/usexp/jbuild_lexer.mll b/src/usexp/jbuild_lexer.mll index 4cfade63..0cc57a5f 100644 --- a/src/usexp/jbuild_lexer.mll +++ b/src/usexp/jbuild_lexer.mll @@ -1,5 +1,5 @@ { - open Lexer0 + open Lexer_shared (* The difference between the old and new syntax is that the old syntax allows backslash following by any characters other than 'n', diff --git a/src/usexp/lexer.ml b/src/usexp/lexer.ml index aff4e6d2..50f62541 100644 --- a/src/usexp/lexer.ml +++ b/src/usexp/lexer.ml @@ -1,4 +1,4 @@ -include Lexer0 +include Lexer_shared let token = Dune_lexer.token let jbuild_token = Jbuild_lexer.token diff --git a/src/usexp/lexer0.ml b/src/usexp/lexer_shared.ml similarity index 99% rename from src/usexp/lexer0.ml rename to src/usexp/lexer_shared.ml index b361acc2..ee1cf5ba 100644 --- a/src/usexp/lexer0.ml +++ b/src/usexp/lexer_shared.ml @@ -1,4 +1,3 @@ - module Token = struct type t = | Atom of Atom.t diff --git a/src/usexp/lexer0.mli b/src/usexp/lexer_shared.mli similarity index 100% rename from src/usexp/lexer0.mli rename to src/usexp/lexer_shared.mli