diff options
| author |  Jason Gross <jagro@google.com> | 2016-06-22 13:34:00 -0700 |
|---|---|---|
| committer | Jason Gross <jagro@google.com> | 2016-06-22 13:34:00 -0700 |
| commit | 18b79f83ce6c947eaa49baf586cc475d50e3d9ca (patch) | |
| tree | dc20511c7507aec0dc8656d30f9388d906ab664b /src/CompleteEdwardsCurve | |
| parent | acd8d172e3112372be930544af57c36bf085e6c2 (diff) | |
Aggregate all level specifications not in Spec/*
This prevents notation conflicts (see comment in Notations.v for more
explanation).
Diffstat (limited to 'src/CompleteEdwardsCurve')
| -rw-r--r-- | src/CompleteEdwardsCurve/CompleteEdwardsCurveTheorems.v | 3 | ||||
| -rw-r--r-- | src/CompleteEdwardsCurve/ExtendedCoordinates.v | 3 | ||||
| -rw-r--r-- | src/CompleteEdwardsCurve/Pre.v | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/CompleteEdwardsCurve/CompleteEdwardsCurveTheorems.v b/src/CompleteEdwardsCurve/CompleteEdwardsCurveTheorems.v index 683addd5d..c217303aa 100644 --- a/src/CompleteEdwardsCurve/CompleteEdwardsCurveTheorems.v +++ b/src/CompleteEdwardsCurve/CompleteEdwardsCurveTheorems.v @@ -7,6 +7,7 @@ Require Import Crypto.Tactics.VerdiTactics. Require Import Coq.Classes.Morphisms. Require Import Relation_Definitions. Require Import Crypto.Util.Tuple. +Require Import Crypto.Util.Notations. Module E. Import Group Ring Field CompleteEdwardsCurve.E. @@ -18,7 +19,7 @@ Module E. Local Notation "0" := Fzero. Local Notation "1" := Fone. Local Infix "+" := Fadd. Local Infix "*" := Fmul. Local Infix "-" := Fsub. Local Infix "/" := Fdiv. - Local Notation "x ^2" := (x*x) (at level 30). + Local Notation "x ^2" := (x*x). Local Notation point := (@point F Feq Fone Fadd Fmul a d). Local Notation onCurve := (@onCurve F Feq Fone Fadd Fmul a d). diff --git a/src/CompleteEdwardsCurve/ExtendedCoordinates.v b/src/CompleteEdwardsCurve/ExtendedCoordinates.v index 25af83a0a..e2ffa0313 100644 --- a/src/CompleteEdwardsCurve/ExtendedCoordinates.v +++ b/src/CompleteEdwardsCurve/ExtendedCoordinates.v @@ -7,6 +7,7 @@ Require Import Crypto.Tactics.VerdiTactics. Require Import Coq.Classes.Morphisms. Require Import Relation_Definitions. Require Import Crypto.Util.Tuple. +Require Import Crypto.Util.Notations. Module Extended. Section ExtendedCoordinates. @@ -18,7 +19,7 @@ Module Extended. Local Notation "0" := Fzero. Local Notation "1" := Fone. Local Infix "+" := Fadd. Local Infix "*" := Fmul. Local Infix "-" := Fsub. Local Infix "/" := Fdiv. - Local Notation "x ^2" := (x*x) (at level 30). + Local Notation "x ^2" := (x*x). Local Notation Epoint := (@E.point F Feq Fone Fadd Fmul a d). Local Notation onCurve := (@Pre.onCurve F Feq Fone Fadd Fmul a d). diff --git a/src/CompleteEdwardsCurve/Pre.v b/src/CompleteEdwardsCurve/Pre.v index 5314ee37c..7e9f14321 100644 --- a/src/CompleteEdwardsCurve/Pre.v +++ b/src/CompleteEdwardsCurve/Pre.v @@ -1,5 +1,6 @@ Require Import Coq.Classes.Morphisms. Require Coq.Setoids.Setoid. Require Import Crypto.Algebra Crypto.Tactics.Nsatz. +Require Import Crypto.Util.Notations. Generalizable All Variables. Section Pre. @@ -9,7 +10,7 @@ Section Pre. Local Notation "0" := zero. Local Notation "1" := one. Local Infix "+" := add. Local Infix "*" := mul. Local Infix "-" := sub. Local Infix "/" := div. - Local Notation "x '^' 2" := (x*x) (at level 30). + Local Notation "x ^2" := (x*x). Add Field EdwardsCurveField : (Field.field_theory_for_stdlib_tactic (T:=F)). @@ -97,4 +98,4 @@ Section RespectsFieldHomomorphism. apply conj; (rewrite_strat topdown hints field_homomorphism); reflexivity. Qed. -End RespectsFieldHomomorphism.
\ No newline at end of file +End RespectsFieldHomomorphism. |