From 2a5e0f692b194e8a027f6d2e08d17c7fdd5a7a74 Mon Sep 17 00:00:00 2001 From: Josh Berdine Date: Tue, 17 Mar 2020 09:05:47 -0700 Subject: [PATCH] [sledge] Move dep on Core to just bin Reviewed By: ngorogiannis Differential Revision: D20482754 fbshipit-source-id: d2d640a9c --- sledge/bin/dune | 4 ++-- sledge/bin/sledge.ml | 1 + sledge/bin/sledge_buck.ml | 1 + sledge/bin/sledge_buck.mli | 2 ++ sledge/lib/import/dune | 2 +- sledge/lib/import/import.ml | 1 - sledge/lib/import/import.mli | 1 - 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sledge/bin/dune b/sledge/bin/dune index 993508f6d..a4c8ed933 100644 --- a/sledge/bin/dune +++ b/sledge/bin/dune @@ -6,8 +6,8 @@ (executable (public_name sledge) (package sledge) - (libraries apron apron.boxMPQ ctypes ctypes.foreign dune-build-info llvm - llvm.irreader llvm.analysis llvm.scalar_opts llvm.target llvm.ipo + (libraries apron apron.boxMPQ core ctypes ctypes.foreign dune-build-info + llvm llvm.irreader llvm.analysis llvm.scalar_opts llvm.target llvm.ipo llvm.linker shexp.process yojson trace import sledgelib model) (flags (:standard -open Import -open Sledgelib -open Model)) diff --git a/sledge/bin/sledge.ml b/sledge/bin/sledge.ml index 892fdb72f..f1fa86e22 100644 --- a/sledge/bin/sledge.ml +++ b/sledge/bin/sledge.ml @@ -9,6 +9,7 @@ let () = Printexc.record_backtrace Version.debug +module Command = Core.Command open Command.Let_syntax type 'a param = 'a Command.Param.t diff --git a/sledge/bin/sledge_buck.ml b/sledge/bin/sledge_buck.ml index 26ed884e6..21a115164 100644 --- a/sledge/bin/sledge_buck.ml +++ b/sledge/bin/sledge_buck.ml @@ -167,6 +167,7 @@ let llvm_link_opt ~fuzzer ~bitcode_output modules = (** command line interface *) +module Command = Core.Command open Command.Let_syntax let ( |*> ) a' f' = a' |> Command.Param.apply f' diff --git a/sledge/bin/sledge_buck.mli b/sledge/bin/sledge_buck.mli index 57de68f51..29eea3b43 100644 --- a/sledge/bin/sledge_buck.mli +++ b/sledge/bin/sledge_buck.mli @@ -5,6 +5,8 @@ * LICENSE file in the root directory of this source tree. *) +module Command = Core.Command + val main : command:unit Command.basic_command -> analyze:(string list -> unit -> unit) Command.Param.t diff --git a/sledge/lib/import/dune b/sledge/lib/import/dune index 00ec926ad..a57711243 100644 --- a/sledge/lib/import/dune +++ b/sledge/lib/import/dune @@ -6,7 +6,7 @@ (library (name import) (public_name sledge.import) - (libraries core core_kernel.fheap zarith trace) + (libraries core_kernel.fheap zarith trace) (flags (:standard)) (preprocess (pps ppx_sledge)) diff --git a/sledge/lib/import/import.ml b/sledge/lib/import/import.ml index ea365d284..ffef8a938 100644 --- a/sledge/lib/import/import.ml +++ b/sledge/lib/import/import.ml @@ -8,7 +8,6 @@ (** Global namespace opened in each source file by the build system *) include Stdio -module Command = Core.Command include Import0 (** Tuple operations *) diff --git a/sledge/lib/import/import.mli b/sledge/lib/import/import.mli index a209923c0..cc25447a5 100644 --- a/sledge/lib/import/import.mli +++ b/sledge/lib/import/import.mli @@ -8,7 +8,6 @@ (** Global namespace opened in each source file by the build system *) include module type of Stdio -module Command = Core.Command include module type of Import0 (** Tuple operations *)