Skip to content

Adapt to https://github.com/rocq-prover/rocq/pull/17876 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andres-erbsen merged 1 commit into from
Jun 27, 2025
Merged

Adapt to https://github.com/rocq-prover/rocq/pull/17876 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions Kami/Ex/Multiplier32.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,12 +427,9 @@ Section Multiplier32.
end.

Declare Scope bword_scope.
Notation "w ~ 0" := (BWS BZero w) (at level 7, left associativity,
format "w '~' '0'"): bword_scope.
Notation "w ~ 'P'" := (BWS BPlus w) (at level 7, left associativity,
format "w '~' 'P'"): bword_scope.
Notation "w ~ 'N'" := (BWS BMinus w) (at level 7, left associativity,
format "w '~' 'N'"): bword_scope.
Notation "w ~ 0" := (BWS BZero w): bword_scope.
Notation "w ~ 'P'" := (BWS BPlus w): bword_scope.
Notation "w ~ 'N'" := (BWS BMinus w): bword_scope.
Delimit Scope bword_scope with bword.

Definition encodeB2 (mst lst: bool) :=
Expand Down
9 changes: 3 additions & 6 deletions Kami/Ex/Multiplier64.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,12 +427,9 @@ Section Multiplier64.
end.

Declare Scope bword_scope.
Notation "w ~ 0" := (BWS BZero w) (at level 7, left associativity,
format "w '~' '0'"): bword_scope.
Notation "w ~ 'P'" := (BWS BPlus w) (at level 7, left associativity,
format "w '~' 'P'"): bword_scope.
Notation "w ~ 'N'" := (BWS BMinus w) (at level 7, left associativity,
format "w '~' 'N'"): bword_scope.
Notation "w ~ 0" := (BWS BZero w): bword_scope.
Notation "w ~ 'P'" := (BWS BPlus w): bword_scope.
Notation "w ~ 'N'" := (BWS BMinus w): bword_scope.
Delimit Scope bword_scope with bword.

Definition encodeB2 (mst lst: bool) :=
Expand Down
2 changes: 1 addition & 1 deletion Kami/Lib/Word.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ Definition wslt_dec : forall sz (l r : word sz), {l <s r} + {l >s= r}.
abstract congruence.
Defined.

Notation "$ n" := (natToWord _ n) (at level 5, format "$ n").
Notation "$ n" := (natToWord _ n) (at level 1, format "$ n").
Notation "# n" := (wordToNat n) (at level 5, format "# n").

(** * Bit shifting *)
Expand Down
2 changes: 1 addition & 1 deletion Kami/Notations.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Notation "e ! s @. f" :=
Notation "'VEC' v" := (BuildVector v) (at level 10) : kami_expr_scope.
Notation "v '@[' idx <- val ] " := (UpdateVector v idx val) (at level 10) : kami_expr_scope.
Notation "v '#[' idx <- val ] " := (UpdateArray v idx val) (at level 10) : kami_expr_scope.
Notation "$ n" := (Const _ (natToWord _ n)) (at level 5) : kami_expr_scope.
Notation "$ n" := (Const _ (natToWord _ n)) (at level 1) : kami_expr_scope.
Notation "$$ e" := (Const _ e) (at level 5) : kami_expr_scope.
Notation "'IF' e1 'then' e2 'else' e3" := (ITE e1 e2 e3) (at level 200, right associativity) : kami_expr_scope.

Expand Down