Skip to content

Commit c29a4c9

Browse files
Support Coq 8.15, 8.16 in support libraries (#1750)
This requires a small change from `Numeral Notation` notation to `Number Notation`, the former of which was removed in Coq 8.15. The latter is only supported in Coq 8.13 or later, so I have documented this in the `saw-core-coq` `README`. Fixes #1601. Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 766a186 commit c29a4c9

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

saw-core-coq/README.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ opam repo add coq-released https://coq.inria.fr/opam/released
3333
opam install coq-bits
3434
```
3535

36-
If you run into any issue that is probably due to the version mismatch between the `ocamlc`
37-
and the `ocaml` base system installed on your machine and it can be fixed as explained
36+
If you run into any issue that is probably due to the version mismatch between the `ocamlc`
37+
and the `ocaml` base system installed on your machine and it can be fixed as explained
3838
[here](https://github.com/ocaml/opam/issues/3708).
3939

40+
Currently, the Coq support libraries for `saw-core-coq` requires Coq 8.13 or
41+
later. In particular, they are known to build with Coq 8.13, 8.15, and 8.16,
42+
but *not* 8.14 (see [this
43+
issue](https://coq.zulipchat.com/#narrow/stream/237977-Coq-users/topic/Code.20typechecks.20in.20Coq.208.2E13.2C.20but.20not.20in.208.2E14)).
4044

4145
## Building the and Using the Coq Support Libraries
4246

saw-core-coq/coq/handwritten/CryptolToCoq/SAWCoreVectorsAsCoqVectors.v

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ Definition sbvToInt (n : Nat) (b : bitvector n) : Z
230230

231231
(* Useful notation for bools *)
232232
Definition boolToInt (b : bool) : Z := if b then 1%Z else 0%Z.
233-
Numeral Notation bool Z.odd boolToInt : bool_scope.
233+
Number Notation bool Z.odd boolToInt : bool_scope.
234234
Close Scope bool_scope. (* no, don't interpret all numbers as booleans... *)
235235

236236
(* This is annoying to implement, so using BITS conversion *)

0 commit comments

Comments
 (0)