diff --git a/src/bin/cli.ml b/src/bin/cli.ml index 21f888c07..92716d380 100644 --- a/src/bin/cli.ml +++ b/src/bin/cli.ml @@ -268,6 +268,19 @@ let interpret = let doc = "Subcommand: Interpret the expression in the context initialized by the provided source file." in (Term.ret term , Term.info ~doc cmdname) +let temp_ligo_interpreter = + let f source_file syntax display_format = + toplevel ~display_format @@ + let%bind simplified = Compile.Of_source.compile source_file (Syntax_name syntax) in + let%bind typed,_ = Compile.Of_simplified.compile simplified in + let%bind res = Compile.Of_typed.some_interpret typed in + ok @@ Format.asprintf "%s\n" res + in + let term = + Term.(const f $ source_file 0 $ syntax $ display_format ) in + let cmdname = "ligo-interpret" in + let doc = "Subcommand: (temporary / dev only) uses LIGO interpret." in + (Term.ret term , Term.info ~doc cmdname) let compile_storage = let f source_file entry_point expression syntax amount sender source predecessor_timestamp display_format michelson_format = @@ -426,6 +439,7 @@ let list_declarations = let run ?argv () = Term.eval_choice ?argv main [ + temp_ligo_interpreter ; compile_file ; measure_contract ; compile_parameter ; diff --git a/src/bin/expect_tests/help_tests.ml b/src/bin/expect_tests/help_tests.ml index 06e877a32..bd5824881 100644 --- a/src/bin/expect_tests/help_tests.ml +++ b/src/bin/expect_tests/help_tests.ml @@ -44,6 +44,9 @@ let%expect_test _ = Subcommand: Interpret the expression in the context initialized by the provided source file. + ligo-interpret + Subcommand: (temporary / dev only) uses LIGO interpret. + list-declarations Subcommand: List all the top-level declarations. @@ -120,6 +123,9 @@ let%expect_test _ = Subcommand: Interpret the expression in the context initialized by the provided source file. + ligo-interpret + Subcommand: (temporary / dev only) uses LIGO interpret. + list-declarations Subcommand: List all the top-level declarations. diff --git a/src/bin/expect_tests/ligo_interpreter_tests.ml b/src/bin/expect_tests/ligo_interpreter_tests.ml new file mode 100644 index 000000000..3caedc2ae --- /dev/null +++ b/src/bin/expect_tests/ligo_interpreter_tests.ml @@ -0,0 +1,54 @@ +open Cli_expect + +let contract basename = + "../../test/contracts/" ^ basename + +let%expect_test _ = + run_ligo_good [ "ligo-interpret" ; contract "interpret_test.mligo" ] ; + [%expect {| + val lambda_call = 16 : int + val higher_order1 = 5 : int + val higher_order2 = 5 : int + val concats = 0x7070 : bytes + val record_concat = "ab" : string + val record_patch = { ; a = ("a" : string) ; b = ("c" : string) } + val record_lambda = 5 : int + val variant_exp = { ; 0 = (Foo(unit)) ; 1 = (Bar(1 : int)) ; 2 = (Baz("b" : string)) } + val variant_match = 2 : int + val bool_match = 1 : int + val list_match = [ ; 1 : int ; 1 : int ; 2 : int ; 3 : int ; 4 : int] + val tuple_proj = true + val list_const = [ ; 0 : int ; 1 : int ; 2 : int ; 3 : int ; 4 : int] + val options_match_some = 0 : int + val options_match_none = 0 : int + val is_nat_nat = { ; 0 = (Some(1 : nat)) ; 1 = (None(unit)) } + val abs_int = 5 : int + val nat_int = 5 : int + val map_list = [ ; 2 : int ; 3 : int ; 4 : int ; 5 : int] + val fail_alone = "you failed" : failure + val iter_list_fail = "you failed" : failure + val fold_list = 10 : int + val comparison_int = { ; 0 = (false) ; 1 = (true) ; 2 = (false) ; 3 = (true) } + val comparison_string = { ; 0 = (false) ; 1 = (true) } + val divs = { ; 0 = (0 : int) ; 1 = (0 : nat) ; 2 = (500000 : mutez) ; 3 = (0 : nat) } + val var_neg = -2 : int + val sizes = { ; 0 = (5 : nat) ; 1 = (5 : nat) ; 2 = (5 : nat) ; 3 = (3 : nat) ; 4 = (2 : nat) } + val modi = 1 : nat + val fold_while = { ; 0 = (20 : int) ; 1 = (10 : int) } + val assertion_pass = unit + val assertion_fail = "failed assertion" : failure + val lit_address = "KT1ThEdxfUcWUwqsdergy3QnbCWGHSUHeHJq" : address + val map_finds = Some(2 : int) + val map_finds_fail = "failed map find" : failure + val map_empty = { ; 0 = ([]) ; 1 = ([]) } + val m = [ ; "one" : string -> 1 : int ; "two" : string -> 2 : int ; "three" : string -> 3 : int] + val map_fold = 4 : int + val map_iter = unit + val map_map = [ ; "one" : string -> 4 : int ; "two" : string -> 5 : int ; "three" : string -> 8 : int] + val map_mem = { ; 0 = (true) ; 1 = (false) } + val map_remove = { ; 0 = ([ ; "two" : string -> 2 : int ; "three" : string -> 3 : int]) ; 1 = ([ ; "one" : string -> 1 : int ; "two" : string -> 2 : int ; "three" : string -> 3 : int]) } + val map_update = { ; 0 = ([ ; "one" : string -> 1 : int]) ; 1 = ([]) ; 2 = ([]) ; 3 = ([ ; "one" : string -> 1 : int]) } + val s = { ; 1 : int ; 2 : int ; 3 : int} + val set_add = { ; 0 = ({ ; 1 : int ; 2 : int ; 3 : int}) ; 1 = ({ ; 1 : int ; 2 : int ; 3 : int ; 4 : int}) ; 2 = ({ ; 1 : int}) } + val set_iter_fail = "set_iter_fail" : failure + val set_mem = { ; 0 = (true) ; 1 = (false) ; 2 = (false) } |}] ; \ No newline at end of file