From dbf09ba3d706db3e7b121d11a42a6f193a0f4291 Mon Sep 17 00:00:00 2001
From: Thomas Bauereiss
Date: Wed, 2 Aug 2017 16:04:38 +0100
Subject: Tune vector_subrange

---
 lib/prelude.sail                  | 7 ++++---
 test/typecheck/pass/vec_pat1.sail | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/prelude.sail b/lib/prelude.sail
index bac9532c..5f809f72 100644
--- a/lib/prelude.sail
+++ b/lib/prelude.sail
@@ -16,11 +16,13 @@ val forall Num 'n, Num 'l, Type 'a, 'l >= 0. (vector<'n,'l,inc,'a>, [|'n:'n + 'l
 overload vector_access [vector_access_inc; vector_access_dec]
 
 (* Type safe vector subrange *)
+(* vector_subrange(v, m, o) returns the subvector of v with elements with
+   indices from m up to and *including* o. *)
 val forall Num 'n, Num 'l, Num 'm, Num 'o, Type 'a, 'l >= 0, 'm <= 'o, 'o <= 'l.
-  (vector<'n,'l,inc,'a>, [:'m:], [:'o:]) -> vector<'m,'o - 'm,inc,'a> effect pure vector_subrange_inc
+  (vector<'n,'l,inc,'a>, [:'m:], [:'o:]) -> vector<'m,('o - 'm) + 1,inc,'a> effect pure vector_subrange_inc
 
 val forall Num 'n, Num 'l, Num 'm, Num 'o, Type 'a, 'n >= 'm, 'm >= 'o, 'o >= 'n - 'l + 1.
-  (vector<'n,'l,dec,'a>, [:'m:], [:'o:]) -> vector<'m,'m - ('o - 1),dec,'a> effect pure vector_subrange_dec
+  (vector<'n,'l,dec,'a>, [:'m:], [:'o:]) -> vector<'m,('m - 'o) + 1,dec,'a> effect pure vector_subrange_dec
 
 val forall Num 'n, Num 'l, Order 'ord.
   (vector<'n,'l,'ord,bit>, int, int) -> list<bit> effect pure vector_subrange_bl
@@ -276,4 +278,3 @@ typedef option = const union forall Type 'a. {
     None;
     'a Some
 }
-
diff --git a/test/typecheck/pass/vec_pat1.sail b/test/typecheck/pass/vec_pat1.sail
index 0a79d701..95c8880e 100644
--- a/test/typecheck/pass/vec_pat1.sail
+++ b/test/typecheck/pass/vec_pat1.sail
@@ -2,6 +2,9 @@ default Order inc
 
 val extern forall Num 'n. (bit['n], bit['n]) -> bit['n] effect pure bv_add = "bv_add_inc"
 
+val forall Num 'n, Num 'l, Num 'm, Num 'o, Type 'a, 'l >= 0, 'm <= 'o, 'o <= 'l.
+  (vector<'n,'l,inc,'a>, [:'m:], [:'o:]) -> vector<'m,'o + 1 - 'm,inc,'a> effect pure vector_subrange
+
 val forall Num 'n, Num 'm, Num 'o, Num 'p, Type 'a.
   (vector<'n,'m,inc,'a>, vector<'o,'p,inc,'a>) -> vector<'n,'m + 'p,inc,'a>
   effect pure vector_append_inc
-- 
cgit v1.2.3