diff options
| author | Pierre-Marie Pédrot | 2021-04-23 23:38:26 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2021-04-23 23:38:26 +0200 |
| commit | d9e9a63f9f49768eee8b239812365ad1115b964f (patch) | |
| tree | 0d608882d4aa094ee6c519005696f272f14a2d27 /vernac | |
| parent | 528f8384dcd817e4e339719a5d99c30d48520a8e (diff) | |
| parent | 4ca8b4aab1a6b4f55aab026e42a530fa125553c0 (diff) | |
Merge PR #14075: New level of abstraction for streams with (non-canonical) location function
Reviewed-by: ppedrot
Diffstat (limited to 'vernac')
| -rw-r--r-- | vernac/pvernac.ml | 4 | ||||
| -rw-r--r-- | vernac/vernacinterp.ml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vernac/pvernac.ml b/vernac/pvernac.ml index a7de34dd09..bf0874c8e5 100644 --- a/vernac/pvernac.ml +++ b/vernac/pvernac.ml @@ -66,8 +66,8 @@ module Vernac_ = | Some ename -> find_proof_mode ename let command_entry = - Pcoq.Entry.of_parser "command_entry" - (fun _ strm -> Pcoq.Entry.parse_token_stream (select_tactic_entry !command_entry_ref) strm) + Pcoq.Entry.(of_parser "command_entry" + { parser_fun = (fun strm -> Pcoq.Entry.parse_token_stream (select_tactic_entry !command_entry_ref) strm) }) end diff --git a/vernac/vernacinterp.ml b/vernac/vernacinterp.ml index 4098401bf0..84f4421c2e 100644 --- a/vernac/vernacinterp.ml +++ b/vernac/vernacinterp.ml @@ -186,7 +186,7 @@ and vernac_load ~verbosely fname = let input = let longfname = Loadpath.locate_file fname in let in_chan = Util.open_utf8_file_in longfname in - Pcoq.Parsable.make ~loc:(Loc.initial (Loc.InFile longfname)) (Stream.of_channel in_chan) in + Pcoq.Parsable.make ~source:(Loc.InFile longfname) (Stream.of_channel in_chan) in (* Parsing loop *) let v_mod = if verbosely then Flags.verbosely else Flags.silently in let parse_sentence proof_mode = Flags.with_option Flags.we_are_parsing |