balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add iterators for maps

Browse Source
This commit is contained in:
galfour 2019-07-20 16:42:34 +02:00
parent 564a4df145
commit d7a16c47c1
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/contracts/map.ligo
View File

@ -31,3 +31,14 @@ const bm : foobar = map
120 -> 23 ; 120 -> 23 ;
421 -> 23 ; 421 -> 23 ;
end end
function iter_op (const m : foobar) : int is
var r : int := 0 ;
function aggregate (const i : int ; const j : int) : unit is block { r := r + i + j } with unit ;
block {
map_iter(m , aggregate) ;
} with r ;
function map_op (const m : foobar) : foobar is
function increment (const i : int ; const j : int) : int is block { skip } with j + 1 ;
block { skip } with map_map(m , increment) ;

20
src/operators/operators.ml
View File

@ -256,22 +256,18 @@ module Typer = struct
let%bind () = assert_type_value_eq (src, k) in let%bind () = assert_type_value_eq (src, k) in
ok @@ t_option dst () ok @@ t_option dst ()
let map_iter : typer = typer_2 "MAP_ITER" @@ fun f m -> let map_iter : typer = typer_2 "MAP_ITER" @@ fun m f ->
let%bind (k, v) = get_t_map m in let%bind (k, v) = get_t_map m in
let%bind (arg_1 , res) = get_t_function f in let%bind (arg , res) = get_t_function f in
let%bind (arg_2 , res') = get_t_function res in let%bind () = assert_eq_1 arg (t_pair k v ()) in
let%bind () = assert_eq_1 arg_1 k in let%bind () = assert_eq_1 res (t_unit ()) in
let%bind () = assert_eq_1 arg_2 v in
let%bind () = assert_eq_1 res' (t_unit ()) in
ok @@ t_unit () ok @@ t_unit ()
let map_map : typer = typer_2 "MAP_MAP" @@ fun f m -> let map_map : typer = typer_2 "MAP_MAP" @@ fun m f ->
let%bind (k, v) = get_t_map m in let%bind (k, v) = get_t_map m in
let%bind (arg_1 , res) = get_t_function f in let%bind (arg , res) = get_t_function f in
let%bind (arg_2 , res') = get_t_function res in let%bind () = assert_eq_1 arg (t_pair k v ()) in
let%bind () = assert_eq_1 arg_1 k in ok @@ t_map k res ()
let%bind () = assert_eq_1 arg_2 v in
ok @@ res'
let map_fold : typer = typer_2 "MAP_FOLD" @@ fun f m -> let map_fold : typer = typer_2 "MAP_FOLD" @@ fun f m ->
let%bind (k, v) = get_t_map m in let%bind (k, v) = get_t_map m in

10
src/test/integration_tests.ml
View File

@ -348,6 +348,16 @@ let map () : unit result =
let expected = ez [23, 23] in let expected = ez [23, 23] in
expect_eq program "rm" input expected expect_eq program "rm" input expected
in in
let%bind () =
let input = ez [(1 , 10) ; (2 , 20) ; (3 , 30) ] in
let expected = e_int 66 in
expect_eq program "iter_op" input expected
in
let%bind () =
let input = ez [(1 , 10) ; (2 , 20) ; (3 , 30) ] in
let expected = ez [(1 , 11) ; (2 , 21) ; (3 , 31) ] in
expect_eq program "map_op" input expected
in
ok () ok ()
let list () : unit result = let list () : unit result =