diff options
| author | Kathy Gray | 2014-03-01 12:12:37 +0000 |
|---|---|---|
| committer | Kathy Gray | 2014-03-01 12:12:37 +0000 |
| commit | d62ca20800439a4b1a31e028b3e4451330928bdb (patch) | |
| tree | 38b109b1defb9d9b7473ee1d12738d7a4a548523 | |
| parent | 75788ce047418b88738635597d6eebf5c31f9752 (diff) | |
Fix printing bug on vector slicing that caused only one element to ever be sliced
| -rw-r--r-- | src/lem_interp/interp.lem | 2 | ||||
| -rw-r--r-- | src/pretty_print.ml | 2 | ||||
| -rw-r--r-- | src/test/vectors.sail | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lem_interp/interp.lem b/src/lem_interp/interp.lem index c55439f4..fe4568fb 100644 --- a/src/lem_interp/interp.lem +++ b/src/lem_interp/interp.lem @@ -282,7 +282,7 @@ let access_vector v n = else list_nth vs (m - n) end -val from_n_to_n :forall 'a. natural -> natural -> list 'a -> list 'a +val from_n_to_n :forall 'a. natural -> natural -> list 'a -> list 'a let from_n_to_n from to_ ls = let from = natFromNatural from in let to_ = natFromNatural to_ in diff --git a/src/pretty_print.ml b/src/pretty_print.ml index 57a8ebab..a06d1fe5 100644 --- a/src/pretty_print.ml +++ b/src/pretty_print.ml @@ -646,7 +646,7 @@ and pp_lem_exp ppf (E_aux(e,(l,annot))) = fprintf ppf "@[<0>(%a [%a]) @]" kwd "E_vector_indexed" (list_pp iformat lformat) iexps | E_vector_access(v,e) -> fprintf ppf "@[<0>(%a %a %a)@]" kwd "E_vector_access" pp_lem_exp v pp_lem_exp e | E_vector_subrange(v,e1,e2) -> - fprintf ppf "@[<0>(%a %a %a %a)@]" kwd "E_vector_subrange" pp_lem_exp v pp_lem_exp e1 pp_lem_exp e1 + fprintf ppf "@[<0>(%a %a %a %a)@]" kwd "E_vector_subrange" pp_lem_exp v pp_lem_exp e1 pp_lem_exp e2 | E_vector_update(v,e1,e2) -> fprintf ppf "@[<0>(%a %a %a %a)@]" kwd "E_vector_update" pp_lem_exp v pp_lem_exp e1 pp_lem_exp e2 | E_vector_update_subrange(v,e1,e2,e3) -> diff --git a/src/test/vectors.sail b/src/test/vectors.sail index 482ef902..f7872be8 100644 --- a/src/test/vectors.sail +++ b/src/test/vectors.sail @@ -3,7 +3,7 @@ let (bit[4]) v2 = [0,1,0,0] register (bit[32]) i let (bit[10]) v3 = 0b0101010111 -register (bit[5]) slice_check +register (bit[10]) slice_check register nat match_success |