rename the Sexpr module to Sexpr_TS to avoid a case-insensitivity conflict with the...

Signed-off-by: Anil Madhavapeddy <anil@recoil.org>

diff --git a/sexpr/Makefile b/sexpr/Makefile
index 25362958a2055c1a9c21e874cfe5aedf589bdfe4..9cab04f3647a58511cb88e7ed8ed578edfbfcf86 100644 (file)
--- a/sexpr/Makefile
+++ b/sexpr/Makefile
@@ -17,7 +17,7 @@ OCAMLABI := $(shell ocamlc -version)
 OCAMLLIBDIR := $(shell ocamlc -where)
 OCAMLDESTDIR ?= $(OCAMLLIBDIR)
 
-OBJS = sExpr sExprLexer sExprParser sexpr
+OBJS = sExpr sExprLexer sExprParser sExpr_TS
 INTF = $(foreach obj, $(OBJS),$(obj).cmi)
 LIBS = sexpr.cma sexpr.cmxa
 

diff --git a/sexpr/sexpr.ml b/sexpr/sexpr.ml
deleted file mode 100644 (file)
index 8ad57b8..0000000
--- a/sexpr/sexpr.ml
+++ /dev/null
@@ -1,22 +0,0 @@
-(*
- * Copyright (C) 2006-2009 Citrix Systems Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 only. with the special
- * exception on linking described in file LICENSE.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *)
-open Threadext
-
-let lock = Mutex.create ()
-
-let of_string s =
-       Mutex.execute lock
-               (fun () -> SExprParser.expr SExprLexer.token (Lexing.from_string s))
-
-let string_of = SExpr.string_of

diff --git a/sexpr/sexpr.mli b/sexpr/sexpr.mli
deleted file mode 100644 (file)
index 3fca789..0000000
--- a/sexpr/sexpr.mli
+++ /dev/null
@@ -1,19 +0,0 @@
-(*
- * Copyright (C) 2006-2009 Citrix Systems Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 only. with the special
- * exception on linking described in file LICENSE.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *)
-
-(** Thread-safe marshaller and unmarshaller for sexpr *)
-
-val of_string : string -> SExpr.t
-
-val string_of : SExpr.t -> string