diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2018-07-06 07:36:37 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2018-07-06 07:36:37 +0200 |
| commit | 26643cdd013f5df2bcae099852932ac09e93f8fb (patch) | |
| tree | cbebe1e80e4fabfcc7258016fe8b46ec8f0e8f26 /parsing | |
| parent | 886ed2ee99e9ab9f0fc9aabac06a555d3beba19c (diff) | |
Fix compilation of Coq with camlp5 master branch.
There was a conflict in the name of an exported function. A good argument in
favour of PR #7898.
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/pcoq.ml | 2 | ||||
| -rw-r--r-- | parsing/pcoq.mli | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/parsing/pcoq.ml b/parsing/pcoq.ml index 171276a70..997ea78e6 100644 --- a/parsing/pcoq.ml +++ b/parsing/pcoq.ml @@ -336,7 +336,7 @@ module Gram = I'm not entirely sure it makes sense, but at least it would be more correct. *) G.delete_rule e pil - let safe_extend e ext = grammar_extend e None ext + let gram_extend e ext = grammar_extend e None ext end (** Remove extensions diff --git a/parsing/pcoq.mli b/parsing/pcoq.mli index 48604e188..154de1221 100644 --- a/parsing/pcoq.mli +++ b/parsing/pcoq.mli @@ -80,7 +80,7 @@ module type S = (* Get comment parsing information from the Lexer *) val comment_state : coq_parsable -> ((int * int) * string) list - val safe_extend : 'a entry -> 'a Extend.extend_statement -> unit + val gram_extend : 'a entry -> 'a Extend.extend_statement -> unit (* Apparently not used *) val srules' : production_rule list -> symbol |