From 03e439e449e701f21c5165ea7566f3f7a1f73697 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 24 Apr 2018 00:17:58 +0700 Subject: [PATCH] Decouple sexp from Import --- src/sexp.ml | 6 +++--- src/sexp.mli | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sexp.ml b/src/sexp.ml index 6f89ac78..64f1a754 100644 --- a/src/sexp.ml +++ b/src/sexp.ml @@ -1,4 +1,4 @@ -open Import +open Stdune include (Usexp : module type of struct include Usexp end with module Loc := Usexp.Loc) @@ -135,7 +135,7 @@ module Of_sexp = struct (Ast.loc sexp, f sexp) let of_sexp_error ?hint sexp str = raise (Of_sexp (Ast.loc sexp, str, hint)) - let of_sexp_errorf ?hint sexp fmt = ksprintf (of_sexp_error ?hint sexp) fmt + let of_sexp_errorf ?hint sexp fmt = Printf.ksprintf (of_sexp_error ?hint sexp) fmt let raw x = x @@ -187,7 +187,7 @@ module Of_sexp = struct match String.Map.of_list (list (pair string f) sexp) with | Ok x -> x | Error (key, _v1, _v2) -> - of_sexp_error sexp (sprintf "key %S present multiple times" key) + of_sexp_error sexp (Printf.sprintf "key %S present multiple times" key) let string_hashtbl f sexp = let map = string_map f sexp in diff --git a/src/sexp.mli b/src/sexp.mli index baf44f99..2f1a44b1 100644 --- a/src/sexp.mli +++ b/src/sexp.mli @@ -1,4 +1,4 @@ -open Import +open Stdune include module type of struct include Usexp end with module Loc := Usexp.Loc