diff options
| author |  Pierre Letouzey <pierre.letouzey@inria.fr> | 2016-06-21 16:24:01 +0200 |
|---|---|---|
| committer | Pierre Letouzey <pierre.letouzey@inria.fr> | 2016-06-21 18:58:48 +0200 |
| commit | a1a86e6572bbae9e515cc72d7072322e5a11b49e (patch) | |
| tree | f298d35f811e493a07444844db9c322cbf2d28ab | |
| parent | 6c34cc04f5bf58973bfa1f5626b8f989a42da97c (diff) | |
Parsing/compat.ml4: avoid "let open" syntax, unsupported by my camlp5 6.11
| -rw-r--r-- | parsing/compat.ml4 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/parsing/compat.ml4 b/parsing/compat.ml4 index 9eb07990e..ef651f810 100644 --- a/parsing/compat.ml4 +++ b/parsing/compat.ml4 @@ -33,7 +33,7 @@ let make_loc fname line_nb bol_pos bp ep = Ploc.make_loc fname line_nb bol_pos ( (* Update a loc without allocating an intermediate pair *) let set_loc_pos loc bp ep = - let open Ploc in sub loc (bp - first_pos loc) (ep - bp) + Ploc.sub loc (bp - Ploc.first_pos loc) (ep - bp) (* Increase line number by 1 and update position of beginning of line *) let bump_loc_line loc bol_pos = @@ -82,28 +82,25 @@ let to_coqloc loc = let make_loc fname line_nb bol_pos start stop = CompatLoc.of_tuple (fname, line_nb, bol_pos, start, line_nb, bol_pos, stop, false) +open CompatLoc + let set_loc_pos loc bp ep = - let open CompatLoc in of_tuple (file_name loc, start_line loc, start_bol loc, bp, stop_line loc, stop_bol loc, ep, is_ghost loc) let bump_loc_line loc bol_pos = - let open CompatLoc in of_tuple (file_name loc, start_line loc + 1, bol_pos, start_off loc, start_line loc + 1, bol_pos, stop_off loc, is_ghost loc) let bump_loc_line_last loc bol_pos = - let open CompatLoc in of_tuple (file_name loc, start_line loc, start_bol loc, start_off loc, stop_line loc + 1, bol_pos, stop_off loc, is_ghost loc) let set_loc_file loc fname = - let open CompatLoc in of_tuple (fname, start_line loc, start_bol loc, start_off loc, stop_line loc, stop_bol loc, stop_off loc, is_ghost loc) let after loc = - let open CompatLoc in of_tuple (file_name loc, stop_line loc, stop_bol loc, stop_off loc, stop_line loc, stop_bol loc, stop_off loc, is_ghost loc) |