Skip to content

Commit

Permalink
Merge pull request #795 from gares/quickfix
Browse files Browse the repository at this point in the history
adapt to coq/coq#19147
  • Loading branch information
ejgallego authored Jun 24, 2024
2 parents 1d5f1a3 + da3a3b1 commit d3e998b
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
2 changes: 1 addition & 1 deletion coq/init.ml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let add_message lvl loc msg q =

let mk_fb_handler q Feedback.{ contents; _ } =
match contents with
| Message (lvl, loc, msg) -> add_message lvl loc msg q
| Message (lvl, loc, _, msg) -> add_message lvl loc msg q
| _ -> ()

let coq_init opts =
Expand Down
1 change: 1 addition & 0 deletions serlib/ser_feedback.ml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module Loc = Ser_loc
module Xml_datatype = Ser_xml_datatype
module Pp = Ser_pp
module Stateid = Ser_stateid
module Quickfix = Ser_quickfix

type level =
[%import: Feedback.level]
Expand Down
32 changes: 32 additions & 0 deletions serlib/ser_quickfix.ml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
(************************************************************************)
(* * The Coq Proof Assistant / The Coq Development Team *)
(* v * Copyright INRIA, CNRS and contributors *)
(* <O___,, * (see version control and CREDITS file for authors & dates) *)
(* VV/ **************************************************************)
(* // * This file is distributed under the terms of the *)
(* * GNU Lesser General Public License Version 2.1 *)
(* * (see LICENSE file for the text of the license) *)
(************************************************************************)

(************************************************************************)
(* SerAPI: Coq interaction protocol with bidirectional serialization *)
(************************************************************************)
(* Copyright 2016-2019 MINES ParisTech -- License LGPL 2.1+ *)
(* Copyright 2019-2023 Inria -- License LGPL 2.1+ *)
(* Written by: Emilio J. Gallego Arias and others *)
(************************************************************************)

module Loc = Ser_loc
module Pp = Ser_pp

module QFB = struct

type t = Quickfix.t
type _t = Loc.t * Pp.t
[@@deriving sexp,yojson,hash,compare]

let of_t qf = Quickfix.(loc qf, pp qf)
let to_t (loc, pp) = Quickfix.make ~loc pp
end

include SerType.Biject(QFB)
2 changes: 1 addition & 1 deletion vendor/coq
Submodule coq updated 96 files
+2 −2 .gitlab-ci.yml
+15 −0 clib/dune
+2 −17 clib/memprof_coq.memprof.ml
+2 −17 clib/memprof_coq.std.ml
+1 −0 clib/mutex_aux.mli
+14 −0 clib/mutex_aux_4.x.ml
+15 −0 clib/mutex_aux_5.0.ml
+1 −0 clib/mutex_aux_5.x.ml
+1 −1 coqide.opam
+2 −2 dev/ci/ci-basic-overlay.sh
+2 −1 dev/ci/ci-vst.sh
+1 −1 dev/ci/ci-wrapper.sh
+2 −0 dev/ci/user-overlays/19107-herbelin-master+unify-fixpoint-cofixpoint-execution-paths.sh
+9 −0 dev/ci/user-overlays/19147-gares-quickfix.sh
+1 −0 dev/ci/user-overlays/19220-ppedrot-clenv-missing-centralize-api.sh
+3 −3 dev/db
+14 −3 dev/doc/release-process.md
+2 −2 dev/nixpkgs.nix
+4 −0 doc/changelog/06-Ltac2-language/19197-ltac2-uint63.rst
+5 −0 doc/changelog/07-ssreflect/19213-ssrmatching_primitive_proj.rst
+4 −0 doc/changelog/10-coqide/19188-warnings_in_table.rst
+1 −1 dune-project
+1 −4 ide/coqide/coq.ml
+0 −3 ide/coqide/coq.mli
+22 −17 ide/coqide/coqOps.ml
+1 −1 ide/coqide/coqOps.mli
+1 −1 ide/coqide/coqide.ml
+0 −1 ide/coqide/coqide_WIN32.ml.in
+1 −1 ide/coqide/idetop.ml
+2 −2 ide/coqide/protocol/xmlprotocol.ml
+2 −2 ide/coqide/session.ml
+3 −3 interp/constrexpr.mli
+3 −7 kernel/constr.ml
+7 −8 kernel/conversion.ml
+61 −17 kernel/indTyping.ml
+9 −1 lib/cErrors.ml
+15 −7 lib/cWarnings.ml
+6 −2 lib/cWarnings.mli
+6 −6 lib/feedback.ml
+3 −3 lib/feedback.mli
+2 −0 lib/flags.ml
+5 −0 lib/flags.mli
+41 −0 lib/quickfix.ml
+37 −0 lib/quickfix.mli
+2 −5 lib/spawn.ml
+1 −2 lib/spawn.mli
+14 −4 library/lib.ml
+1 −1 library/lib.mli
+1 −1 parsing/pcoq.mli
+1 −1 plugins/extraction/extract_env.ml
+5 −1 plugins/extraction/table.ml
+5 −7 plugins/funind/g_indfun.mlg
+21 −37 plugins/funind/gen_principle.ml
+2 −2 plugins/funind/gen_principle.mli
+9 −0 plugins/ltac2/tac2core.ml
+8 −8 plugins/ltac2/tac2entries.ml
+12 −1 plugins/ssrmatching/ssrmatching.ml
+1 −1 printing/ppconstr.mli
+26 −12 proofs/clenv.ml
+1 −1 proofs/clenv.mli
+2 −2 stm/asyncTaskQueue.ml
+5 −4 stm/stm.ml
+1 −1 sysinit/coqargs.ml
+3 −8 tactics/hints.ml
+3 −0 test-suite/bugs/bug_19230.v
+6 −0 test-suite/bugs/bug_19250.v
+12 −0 test-suite/ltac2/uint63.v
+39 −0 test-suite/output/Inductive.out
+27 −0 test-suite/output/Inductive.v
+7 −0 test-suite/output/Qf_end.out
+2 −0 test-suite/output/Qf_end.v
+13 −0 test-suite/output/Qf_extraction.out
+5 −0 test-suite/output/Qf_extraction.v
+0 −6 test-suite/output/ltac2_bt.out
+188 −0 test-suite/ssr/bug_19229.v
+1 −1 topbin/coqnative_bin.ml
+7 −7 toplevel/coqloop.ml
+6 −0 user-contrib/Ltac2/Uint63.v
+91 −103 vernac/comFixpoint.ml
+12 −32 vernac/comFixpoint.mli
+27 −18 vernac/comInductive.ml
+17 −21 vernac/comProgramFixpoint.ml
+13 −2 vernac/comProgramFixpoint.mli
+2 −1 vernac/future.ml
+4 −4 vernac/g_vernac.mlg
+3 −3 vernac/ppvernac.ml
+1 −1 vernac/ppvernac.mli
+52 −0 vernac/prettyp.ml
+4 −6 vernac/synterp.ml
+0 −4 vernac/synterp.mli
+14 −10 vernac/topfmt.ml
+2 −2 vernac/topfmt.mli
+1 −1 vernac/vernac_classifier.ml
+9 −9 vernac/vernacentries.ml
+12 −6 vernac/vernacexpr.mli
+2 −2 vernac/vernacinterp.ml

0 comments on commit d3e998b

Please sign in to comment.