aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Robert Sloan <varomodt@gmail.com>2016-08-26 16:50:48 -0700
committerGravatar Robert Sloan <varomodt@gmail.com>2016-08-26 16:50:48 -0700
commitd95707e8c3e8fa8ae58eeec15448556ab7eeb0b3 (patch)
tree8dae527695e10f4f1123e56841258a6a6d718199 /src
parent7f918337e0ea4c05276ad2825873e9363fcf50e6 (diff)
Fix evalWordRangeOpt
Diffstat (limited to 'src')
-rw-r--r--src/Assembly/Evaluables.v2
-rw-r--r--src/Experiments/SpecificCurve25519.v2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Assembly/Evaluables.v b/src/Assembly/Evaluables.v
index 823d05cfb..6a08a7d54 100644
--- a/src/Assembly/Evaluables.v
+++ b/src/Assembly/Evaluables.v
@@ -548,7 +548,7 @@ Section WordRange.
| someRange low high _ _ => Some (range N low high)
| applyBinOp rangeF wordF _ a b =>
omap (evalWordRangeOpt a) (fun a' =>
- omap (evalWordRangeOpt a) (fun b' =>
+ omap (evalWordRangeOpt b) (fun b' =>
rangeF a' b'))
end.
diff --git a/src/Experiments/SpecificCurve25519.v b/src/Experiments/SpecificCurve25519.v
index b5878825f..80f6ff3a6 100644
--- a/src/Experiments/SpecificCurve25519.v
+++ b/src/Experiments/SpecificCurve25519.v
@@ -118,6 +118,8 @@ Module Input.
Definition ZInterp {t} E := @Interp Z ZEvaluable t E.
+ Definition WordInterp {n t} E := @Interp (word n) (@WordEvaluable n) t E.
+
Definition RangeInterp {n t} E: @interp_type (option (Range N)) t :=
typeMap evalWordRangeOpt (@Interp (@WordRangeOpt n) (@WordRangeOptEvaluable n) t E).