Fix array access with subrange index

daniel-larraz · Aug 7, 2023 · 3272128 · 3272128
1 parent 30de6ec
commit 3272128
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/lustre/lustreExpr.ml b/src/lustre/lustreExpr.ml
@@ -3562,8 +3562,7 @@ let type_of_select = function
 
     (function t -> 
 
-      (* Second argument must match index type of array *)
-      if Type.check_type (Type.index_type_of_array s) t then 
+      if (Type.is_int t || Type.is_int_range t) then
 
         (* Return type of array elements *)
         Type.elem_type_of_array s
@@ -3605,8 +3604,7 @@ let type_of_store = function
 
     (fun i v -> 
 
-      (* Second argument must match index type of array *)
-       if Type.check_type i (Type.index_type_of_array s) &&
+       if (Type.is_int i || Type.is_int_range i) &&
           Type.check_type (Type.elem_type_of_array s) v
        then 
 

diff --git a/tests/regression/success/array-subrange-index.lus b/tests/regression/success/array-subrange-index.lus
@@ -0,0 +1,8 @@
+
+type I = subrange [0,1] of int; 
+
+node N(j: I) returns (B: int^2)
+let
+  B[i] = 0;
+  check B[j]=0;
+tel