diff options
| author | Alasdair Armstrong | 2018-01-05 17:37:18 +0000 |
|---|---|---|
| committer | Alasdair Armstrong | 2018-01-05 17:37:18 +0000 |
| commit | b52a739d24e138974fada0453f3a6d514a36994c (patch) | |
| tree | b9e0417ed6096f4e8eb24e518afa9f0bfb902ec4 /src | |
| parent | 175efef55027c409a955c9fdd2826b3df7339e19 (diff) | |
| parent | 810dca66a6328fd635f5992256bc24960dcc3899 (diff) | |
Merge remote-tracking branch 'origin/interactive' into vector
Diffstat (limited to 'src')
| -rw-r--r-- | src/isail.ml | 7 | ||||
| -rw-r--r-- | src/process_file.ml | 1 | ||||
| -rw-r--r-- | src/process_file.mli | 1 | ||||
| -rw-r--r-- | src/rewrites.mli | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/isail.ml b/src/isail.ml index 3df9c8f1..c56fc69f 100644 --- a/src/isail.ml +++ b/src/isail.ml @@ -146,8 +146,6 @@ let handle_input input = let () = - List.iter print_endline sail_logo; - (* Auto complete function names based on val specs *) LNoise.set_completion_callback begin @@ -173,5 +171,8 @@ let () = LNoise.history_set ~max_length:100 |> ignore; if !opt_interactive then - user_input handle_input + begin + List.iter print_endline sail_logo; + user_input handle_input + end else () diff --git a/src/process_file.ml b/src/process_file.ml index 8c00d37b..58000cc2 100644 --- a/src/process_file.ml +++ b/src/process_file.ml @@ -238,4 +238,5 @@ let rewrite_ast_lem = rewrite Rewrites.rewrite_defs_lem let rewrite_ast_ocaml = rewrite Rewrites.rewrite_defs_ocaml let rewrite_ast_interpreter = rewrite Rewrites.rewrite_defs_interpreter let rewrite_ast_sil = rewrite Rewrites.rewrite_defs_sil +let rewrite_ast_interpreter = rewrite Rewrites.rewrite_defs_interpreter let rewrite_ast_check = rewrite Rewrites.rewrite_defs_check diff --git a/src/process_file.mli b/src/process_file.mli index 86e8fb05..826263a4 100644 --- a/src/process_file.mli +++ b/src/process_file.mli @@ -58,6 +58,7 @@ val rewrite_ast_lem : Type_check.tannot Ast.defs -> Type_check.tannot Ast.defs val rewrite_ast_ocaml : Type_check.tannot Ast.defs -> Type_check.tannot Ast.defs val rewrite_ast_interpreter : Type_check.tannot Ast.defs -> Type_check.tannot Ast.defs val rewrite_ast_sil : Type_check.tannot Ast.defs -> Type_check.tannot Ast.defs +val rewrite_ast_interpreter : Type_check.tannot Ast.defs -> Type_check.tannot Ast.defs val rewrite_ast_check : Type_check.tannot Ast.defs -> Type_check.tannot Ast.defs val load_file_no_check : Ast.order -> string -> unit Ast.defs diff --git a/src/rewrites.mli b/src/rewrites.mli index 8fceadff..743774d9 100644 --- a/src/rewrites.mli +++ b/src/rewrites.mli @@ -64,6 +64,9 @@ val rewrite_defs_interpreter : (string * (tannot defs -> tannot defs)) list val rewrite_defs_lem : (string * (tannot defs -> tannot defs)) list (* Perform rewrites to sail intermediate language *) +val rewrite_defs_interpreter : (string * (tannot defs -> tannot defs)) list + +(* Perform rewrites to sail intermediate language *) val rewrite_defs_sil : (string * (tannot defs -> tannot defs)) list (* This is a special rewriter pass that checks AST invariants without |