matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #898 from rgrinberg/fix-lexer-include 

Select lexer based on dune vs jbuild
This commit is contained in:
Rudi Grinberg 2018-06-20 18:22:26 +06:30 committed by GitHub
parent 94c921f9c4 a033ddb894
commit 2ed5f3fcfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jbuild.ml
View File

@ -1354,7 +1354,7 @@ module Stanzas = struct
exception Include_loop of Path.t * (Loc.t * Path.t) list
let rec parse stanza_parser ~current_file ~include_stack sexps =
let rec parse stanza_parser ~lexer ~current_file ~include_stack sexps =
List.concat_map sexps ~f:(Sexp.Of_sexp.parse stanza_parser Univ_map.empty)
|> List.concat_map ~f:(function
| Include (loc, fn) ->
@ -1366,20 +1366,22 @@ module Stanzas = struct
(Path.to_string_maybe_quoted current_file);
if List.exists include_stack ~f:(fun (_, f) -> f = current_file) then
raise (Include_loop (current_file, include_stack));
let sexps = Io.Sexp.load current_file ~mode:Many in
parse stanza_parser sexps ~current_file ~include_stack
let sexps = Io.Sexp.load ~lexer current_file ~mode:Many in
parse stanza_parser sexps ~lexer ~current_file ~include_stack
| stanza -> [stanza])
let parse ~file ~kind (project : Dune_project.t) sexps =
let stanza_parser =
Dune_project.set project
(match (kind : File_tree.Dune_file.Kind.t) with
| Jbuild -> jbuild_parser
| Dune -> project.stanza_parser)
let (stanza_parser, lexer) =
let (parser, lexer) =
match (kind : File_tree.Dune_file.Kind.t) with
| Jbuild -> (jbuild_parser, Usexp.Lexer.jbuild_token)
| Dune -> (project.stanza_parser, Usexp.Lexer.token)
in
(Dune_project.set project parser, lexer)
in
let stanzas =
try
parse stanza_parser sexps ~include_stack:[] ~current_file:file
parse stanza_parser sexps ~lexer ~include_stack:[] ~current_file:file
with
| Include_loop (_, []) -> assert false
| Include_loop (file, last :: rest) ->