Commit 45af10b3 authored by Xavier Leroy's avatar Xavier Leroy
Browse files

Refactor cparser/Parse.ml

- Use pipeline notation `|>` for legibility and better GC behavior
  (in bytecode at least).
- Introduce auxiliary functions.
- Remove useless function parameters.
- Fix the timing of the "Emulations" pass
  (because of an extra parameter, what was timed took zero time).
parent e6744b2b
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
module CharSet = Set.Make(struct type t = char let compare = compare end) module CharSet = Set.Make(struct type t = char let compare = compare end)
let transform_program t p name = let transform_program t p =
let run_pass pass flag p = let run_pass pass flag p =
if CharSet.mem flag t then begin if CharSet.mem flag t then begin
let p = pass p in let p = pass p in
...@@ -26,12 +26,12 @@ let transform_program t p name = ...@@ -26,12 +26,12 @@ let transform_program t p name =
end else end else
p p
in in
let p1 = (run_pass StructPassing.program 's' p
(run_pass PackedStructs.program 'p' |> run_pass Bitfields.program 'f'
(run_pass Unblock.program 'b' |> run_pass Unblock.program 'b'
(run_pass Bitfields.program 'f' |> run_pass PackedStructs.program 'p'
p)))) in |> run_pass StructPassing.program 's'
Rename.program p1 |> Rename.program
let parse_transformations s = let parse_transformations s =
let t = ref CharSet.empty in let t = ref CharSet.empty in
...@@ -52,35 +52,33 @@ let read_file sourcefile = ...@@ -52,35 +52,33 @@ let read_file sourcefile =
close_in ic; close_in ic;
text text
let parse_string name text =
let log_fuel = Camlcoq.Nat.of_int 50 in
match
Parser.translation_unit_file log_fuel (Lexer.tokens_stream name text)
with
| Parser.MenhirLibParser.Inter.Parsed_pr (ast, _ ) ->
(ast: Cabs.definition list)
| _ -> (* Fail_pr or Fail_pr_full or Timeout_pr, depending
on the version of Menhir.
Fail_pr{,_full} means that there's an inconsistency
between the pre-parser and the parser.
Timeout_pr means that we ran for 2^50 steps. *)
Diagnostics.fatal_error Diagnostics.no_loc "internal error while parsing"
let preprocessed_file transfs name sourcefile = let preprocessed_file transfs name sourcefile =
Diagnostics.reset(); Diagnostics.reset();
let check_errors x =
Diagnostics.check_errors(); x in
(* Reading the whole file at once may seem costly, but seems to be (* Reading the whole file at once may seem costly, but seems to be
the simplest / most robust way of accessing the text underlying the simplest / most robust way of accessing the text underlying
a range of positions. This is used when printing an error message. a range of positions. This is used when printing an error message.
Plus, I note that reading the whole file into memory leads to a Plus, I note that reading the whole file into memory leads to a
speed increase: "make -C test" speeds up by 3 seconds out of 40 speed increase: "make -C test" speeds up by 3 seconds out of 40
on my machine. *) on my machine. *)
let text = read_file sourcefile in read_file sourcefile
let p = |> Timing.time2 "Parsing" parse_string name
let t = parse_transformations transfs in |> Timing.time "Elaboration" Elab.elab_file
let log_fuel = Camlcoq.Nat.of_int 50 in |> check_errors
let ast : Cabs.definition list = |> Timing.time2 "Emulations" transform_program (parse_transformations transfs)
(match Timing.time "Parsing" |> check_errors
(* The call to Lexer.tokens_stream results in the pre
parsing of the entire file. This is non-negligeabe,
so we cannot use Timing.time2 *)
(fun () ->
Parser.translation_unit_file log_fuel (Lexer.tokens_stream name text)) ()
with
| Parser.MenhirLibParser.Inter.Parsed_pr (ast, _ ) -> ast
| _ -> (* Fail_pr or Fail_pr_full or Timeout_pr, depending
on the version of Menhir.
Fail_pr{,_full} means that there's an inconsistency
between the pre-parser and the parser.
Timeout_pr means that we ran for 2^50 steps. *)
Diagnostics.fatal_error Diagnostics.no_loc "internal error while parsing") in
let p1 = Timing.time "Elaboration" Elab.elab_file ast in
Diagnostics.check_errors ();
Timing.time2 "Emulations" transform_program t p1 name in
Diagnostics.check_errors();
p
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment