diff options
| author | Hugo Herbelin | 2021-04-05 16:40:10 +0200 |
|---|---|---|
| committer | Hugo Herbelin | 2021-04-23 15:34:29 +0200 |
| commit | e07efb3798c7c6ec54aac9093ab50fddfc6c6a5b (patch) | |
| tree | 3459872faa79c263577f55ddbd1a8d30d497f8a7 /vernac | |
| parent | 52a71bf2b1260ce8f8622878c82caec54d298808 (diff) | |
Relying on the abstract notion of streams with location for parsing.
We also get rid of ploc.ml, now useless, relying a priori on more
robust code in lStream.ml for location reporting (see
e.g. parse_parsable in grammar.ml).
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 |