haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run ppx preprocessors for both "input" and "input-multi" commands 

Fix #192
This commit is contained in:
Deokhwan Kim 2017-04-19 17:34:49 -04:00 committed by Jérémie Dimino
parent a9696b7ea3
commit 5e419e3f82
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/lib/uTop_main.ml
View File

@ -80,6 +80,21 @@ let convert_locs str locs = List.map (fun (a, b) -> (index_of_offset str a, inde
| The read-line class | | The read-line class |
+-----------------------------------------------------------------+ *) +-----------------------------------------------------------------+ *)
#if OCAML_VERSION >= (4, 04, 0)
let ast_impl_kind = Pparse.Structure
#elif OCAML_VERSION >= (4, 02, 0)
let ast_impl_kind = Config.ast_impl_magic_number
#endif
let preprocess input =
match input with
#if OCAML_VERSION >= (4, 02, 0)
| Parsetree.Ptop_def pstr ->
Parsetree.Ptop_def
(Pparse.apply_rewriters ~tool_name:"ocaml" ast_impl_kind pstr)
#endif
| _ -> input
let parse_input_multi input = let parse_input_multi input =
let buf = Buffer.create 32 in let buf = Buffer.create 32 in
let result = let result =
@ -89,47 +104,33 @@ let parse_input_multi input =
| UTop.Error (locs, msg) -> | UTop.Error (locs, msg) ->
UTop.Error (convert_locs input locs, "Error: " ^ msg ^ "\n") UTop.Error (convert_locs input locs, "Error: " ^ msg ^ "\n")
| UTop.Value phrases -> | UTop.Value phrases ->
(UTop.Value phrases)) try
UTop.Value (List.map preprocess phrases)
with Pparse.Error error ->
Pparse.report_error Format.str_formatter error;
UTop.Error ([], "Error: " ^ Format.flush_str_formatter () ^ "\n"))
in in
(result, Buffer.contents buf) (result, Buffer.contents buf)
#if OCAML_VERSION >= (4, 04, 0)
let ast_impl_kind = Pparse.Structure
#elif OCAML_VERSION >= (4, 02, 0)
let ast_impl_kind = Config.ast_impl_magic_number
#endif
let parse_and_check input eos_is_error = let parse_and_check input eos_is_error =
let buf = Buffer.create 32 in let buf = Buffer.create 32 in
let preprocess input =
match input with
#if OCAML_VERSION >= (4, 02, 0)
| UTop.Value (Parsetree.Ptop_def pstr) ->
begin try
let pstr = Pparse.apply_rewriters ~tool_name:"ocaml"
ast_impl_kind pstr in
UTop.Value (Parsetree.Ptop_def pstr)
with Pparse.Error error ->
Pparse.report_error Format.str_formatter error;
let err_string = Format.flush_str_formatter () in
UTop.Error ([], err_string)
end
#endif
| _ -> input
in
let result = let result =
UTop.collect_formatters buf [Format.err_formatter] UTop.collect_formatters buf [Format.err_formatter]
(fun () -> (fun () ->
match preprocess (!UTop.parse_toplevel_phrase input eos_is_error) with match !UTop.parse_toplevel_phrase input eos_is_error with
| UTop.Error (locs, msg) -> | UTop.Error (locs, msg) ->
let msg = "Error: " ^ msg in UTop.Error (convert_locs input locs, "Error: " ^ msg ^ "\n")
UTop.Error (convert_locs input locs, msg ^ "\n")
| UTop.Value phrase -> | UTop.Value phrase ->
match UTop.check_phrase phrase with try
| None -> let phrase = preprocess phrase in
UTop.Value phrase match UTop.check_phrase phrase with
| Some (locs, msg) -> | None ->
UTop.Error (convert_locs input locs, msg)) UTop.Value phrase
| Some (locs, msg) ->
UTop.Error (convert_locs input locs, msg)
with Pparse.Error error ->
Pparse.report_error Format.str_formatter error;
UTop.Error ([], "Error: " ^ Format.flush_str_formatter () ^ "\n"))
in in
(result, Buffer.contents buf) (result, Buffer.contents buf)