From cb796f509c412c4f354e045f7b83f233d8863181 Mon Sep 17 00:00:00 2001 From: Alasdair Armstrong Date: Fri, 5 Jan 2018 17:40:19 +0000 Subject: Fix duplicate definitions created by merge --- src/process_file.ml | 1 - src/process_file.mli | 1 - src/rewrites.mli | 3 --- 3 files changed, 5 deletions(-) (limited to 'src') diff --git a/src/process_file.ml b/src/process_file.ml index 58000cc2..8c00d37b 100644 --- a/src/process_file.ml +++ b/src/process_file.ml @@ -238,5 +238,4 @@ 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 826263a4..86e8fb05 100644 --- a/src/process_file.mli +++ b/src/process_file.mli @@ -58,7 +58,6 @@ 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 743774d9..8fceadff 100644 --- a/src/rewrites.mli +++ b/src/rewrites.mli @@ -63,9 +63,6 @@ val rewrite_defs_interpreter : (string * (tannot defs -> tannot defs)) list (* Perform rewrites to exclude AST nodes not supported for lem out*) 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 -- cgit v1.2.3