Skip to content

Commit f513668

Browse files
proux01JasonGross
andauthored
* Adapt to rocq-prover/rocq#19530 * Apply suggestions from code review --------- Co-authored-by: Jason Gross <jasongross9@gmail.com>
1 parent 964175f commit f513668

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

coq_tools/find_bug.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,11 +2244,16 @@ def make_make_coqc(coqc_prog, **kwargs):
22442244
coqpath_path = os.environ.get('COQPATH', '')
22452245
coqpath_paths = coqpath_path.split(os.pathsep) if coqpath_path else []
22462246
if args.inline_coqlib:
2247+
if coqc_version != "" and coqc_version[0] == '8':
2248+
env[passing_prefix + "libnames"] = tuple(
2249+
list(env[passing_prefix + "libnames"]) + [(coq_theories_path, "Coq")]
2250+
)
2251+
else:
2252+
env[passing_prefix + "libnames"] = tuple(
2253+
list(env[passing_prefix + "libnames"]) + [(coq_theories_path, "Corelib")]
2254+
)
22472255
env[passing_prefix + "libnames"] = tuple(
2248-
list(env[passing_prefix + "libnames"]) + [(coq_theories_path, "Coq")]
2249-
)
2250-
env[passing_prefix + "libnames"] = tuple(
2251-
list(env[passing_prefix + "libnames"]) + [(coq_user_contrib_path, "Coq")]
2256+
list(env[passing_prefix + "libnames"]) + [(coq_user_contrib_path, "Stdlib")]
22522257
)
22532258
for p in coqpath_paths:
22542259
env[passing_prefix + "libnames"] = tuple(

examples/run-example-048.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ find_bug "$EXAMPLE_INPUT" "$EXAMPLE_OUTPUT" "${EXTRA_ARGS[@]}" || exit $?
8989
(\* -\*- mode: coq; coq-prog-args: ([^)]*) -\*- \*)
9090
(\* File reduced by coq-bug-minimizer from original input, then from [0-9]\+ lines to [0-9]\+ lines, then from [0-9]\+ lines to [0-9]\+ lines, then from [0-9]\+ lines to [0-9]\+ lines, then from [0-9]\+ lines to [0-9]\+ lines \*)
9191
(\* coqc version [^\*]*\*)
92-
Require \(Coq\|Stdlib\)\.Init\.Ltac\.
92+
Require \(Coq\|Corelib\|Stdlib\)\.Init\.Ltac\.
9393
9494
Inductive False : Prop := \.
9595
Axiom proof_admitted : False\.
@@ -100,7 +100,7 @@ Global Set Universe Polymorphism\.
100100
Definition foo@{i} := Type@{i}\.
101101
102102
End Foo\.
103-
\(Import \(Coq\|Stdlib\)\.Init\.Ltac\.
103+
\(Import \(Coq\|Corelib\|Stdlib\)\.Init\.Ltac\.
104104
\)\?Monomorphic Inductive eq {A} (x : A) : forall _ : A, Prop := eq_refl : eq x x\.
105105
Arguments eq_refl {A x} , \[A\] x\.
106106
Definition foo@{} : Set\.

0 commit comments

Comments
 (0)