diff options
| author |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-07-07 13:54:19 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-07-07 13:54:19 +0200 |
| commit | fe371675fc85d712f5124d73157bd833e8fa14a6 (patch) | |
| tree | 016f5957e12443578c2806b619fc7a22bcf31518 | |
| parent | 49a587ec6e6a792bb246dffe16b6fe70bc47897e (diff) | |
| parent | 26643cdd013f5df2bcae099852932ac09e93f8fb (diff) | |
Merge PR #8005: Fix compilation of Coq with camlp5 master branch.
| -rw-r--r-- | grammar/coqpp_main.ml | 2 | ||||
| -rw-r--r-- | parsing/pcoq.ml | 2 | ||||
| -rw-r--r-- | parsing/pcoq.mli | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/grammar/coqpp_main.ml b/grammar/coqpp_main.ml index ef591bc99..e76a1e9ed 100644 --- a/grammar/coqpp_main.ml +++ b/grammar/coqpp_main.ml @@ -250,7 +250,7 @@ let print_rule fmt r = let print_entry fmt gram e = let print_position_opt fmt pos = print_opt fmt print_position pos in let print_rules fmt rules = print_list fmt print_rule rules in - fprintf fmt "let () =@ @[%s.safe_extend@ %s@ @[(%a, %a)@]@]@ in@ " + fprintf fmt "let () =@ @[%s.gram_extend@ %s@ @[(%a, %a)@]@]@ in@ " gram e.gentry_name print_position_opt e.gentry_pos print_rules e.gentry_rules let print_ast fmt ext = 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 |