diff options
| author |  Pierre Letouzey <pierre.letouzey@inria.fr> | 2014-03-02 00:17:29 +0100 |
|---|---|---|
| committer | Pierre Letouzey <pierre.letouzey@inria.fr> | 2014-03-02 20:00:03 +0100 |
| commit | 9130ea9cbc657cd7adf02830e40a89f6de3953f3 (patch) | |
| tree | e0152f4442dadf8cc49f12a2cc42817515691461 /tools/coqdoc/cpretty.mll | |
| parent | f694544d016b085b3cd10007b9f7716ae2c3b022 (diff) | |
Set officially the minimal OCaml requirement to 3.12.1
Anyway, a few syntactic features of 3.12 were already used here and
there (e.g. local opening via Foo.(...), or the record shortcut
{ field; ... }). Hence compiling with 3.11 wasn't working anymore.
Already take advantage of the following 3.12.1 features :
- "module type of ..." in CArray, CList, CString ...
- "ocamldep -ml-synonym" : no need anymore to hack the ocamldep output
via our coqdep to localize the .ml4 modules :-)
The -ml-synonym option (+ various bugfixes) is the reason for asking
3.12.1 directly and not just 3.12.0. After all, if debian stable is
providing 3.12.1, then everybody has it ;-)
Diffstat (limited to 'tools/coqdoc/cpretty.mll')
| -rw-r--r-- | tools/coqdoc/cpretty.mll | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/coqdoc/cpretty.mll b/tools/coqdoc/cpretty.mll index 2c58a05e2..d8a30ee36 100644 --- a/tools/coqdoc/cpretty.mll +++ b/tools/coqdoc/cpretty.mll @@ -12,13 +12,6 @@ open Printf open Lexing - (* A function that emulates Lexing.new_line (which does not exist in OCaml < 3.11.0) *) - let new_line lexbuf = - let pos = lexbuf.lex_curr_p in - lexbuf.lex_curr_p <- { pos with - pos_lnum = pos.pos_lnum + 1; - pos_bol = pos.pos_cnum } - (* A list function we need *) let rec take n ls = if n = 0 then [] else @@ -1065,7 +1058,7 @@ and body_bol = parse | _ { backtrack lexbuf; Output.indentation 0; body lexbuf } and body = parse - | nl {Tokens.flush_sublexer(); Output.line_break(); new_line lexbuf; body_bol lexbuf} + | nl {Tokens.flush_sublexer(); Output.line_break(); Lexing.new_line lexbuf; body_bol lexbuf} | nl+ space* "]]" space* nl { Tokens.flush_sublexer(); if not !formatted then |