diff options
| author | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
|---|---|---|
| committer | Michael Schmidt <github@mschmidt.me> | 2016-08-17 16:32:56 +0200 |
| commit | e0f0f573a4a8fc1f564a31388afa9c23e48bb016 (patch) | |
| tree | b7c004b3aae01c79bef8c8914e759a1e3ce358f7 /cparser/Parse.ml | |
| parent | 18fcf2ffef8b4ba5eb0624b15371e93b4ac88cfe (diff) | |
| parent | e2b4459ccd1b0f8436cb70a631772d715e642dcd (diff) | |
| download | compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.tar.gz compcert-e0f0f573a4a8fc1f564a31388afa9c23e48bb016.zip | |
fix merge conflicts
Diffstat (limited to 'cparser/Parse.ml')
| -rw-r--r-- | cparser/Parse.ml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cparser/Parse.ml b/cparser/Parse.ml index c125e653..3f60ebb4 100644 --- a/cparser/Parse.ml +++ b/cparser/Parse.ml @@ -74,6 +74,7 @@ let preprocessed_file transfs name sourcefile = | Parser.Parser.Inter.Timeout_pr -> assert false | Parser.Parser.Inter.Parsed_pr (ast, _ ) -> ast) in let p1 = Timing.time "Elaboration" Elab.elab_file ast in + Cerrors.raise_on_errors (); Timing.time2 "Emulations" transform_program t p1 name with | Cerrors.Abort -> |