# HG changeset patch
# User Anil Madhavapeddy <anil@recoil.org>
# Date 1257338471 0
# Node ID adc9c375ae89aa4fc4d4e75fa16a35e0998554c1
# Parent  62ed86ba9fb24b1963c38f4b4a14c2119d66bb15
rename the Sexpr module to SExpr_TS to avoid a case-insensitivity conflict with SExpr (both from xen-api-libs.hg)

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

diff -r 62ed86ba9fb2 -r adc9c375ae89 ocaml/database/db_action_helper.ml
--- a/ocaml/database/db_action_helper.ml	Tue Nov 03 12:56:58 2009 +0000
+++ b/ocaml/database/db_action_helper.ml	Wed Nov 04 12:41:11 2009 +0000
@@ -52,7 +52,7 @@
 exception Db_set_or_map_parse_fail of string
   
 let parse_sexpr s : SExpr.t list =
-  match Sexpr.of_string s with
+  match SExpr_TS.of_string s with
     | SExpr.Node xs -> xs
     | _ -> raise (Db_set_or_map_parse_fail s)
 	
diff -r 62ed86ba9fb2 -r adc9c375ae89 ocaml/database/string_unmarshall_helper.ml
--- a/ocaml/database/string_unmarshall_helper.ml	Tue Nov 03 12:56:58 2009 +0000
+++ b/ocaml/database/string_unmarshall_helper.ml	Wed Nov 04 12:41:11 2009 +0000
@@ -16,14 +16,14 @@
 exception Failure of string
 
 let set f (m: string) = 
-  match Sexpr.of_string m with
+  match SExpr_TS.of_string m with
   | SExpr.Node xs ->
       List.map (function SExpr.String x -> f x
 		| _ -> raise (Failure m)) xs
   | _ -> raise (Failure m)
 
 let map f g (m: string) = 
-  match Sexpr.of_string m with
+  match SExpr_TS.of_string m with
   | SExpr.Node xs ->
       List.map (function SExpr.Node [ SExpr.String k; SExpr.String v ] -> f k, g v
 		| _ -> raise (Failure m)) xs
diff -r 62ed86ba9fb2 -r adc9c375ae89 ocaml/idl/ocaml_backend/htmldoc.ml
--- a/ocaml/idl/ocaml_backend/htmldoc.ml	Tue Nov 03 12:56:58 2009 +0000
+++ b/ocaml/idl/ocaml_backend/htmldoc.ml	Wed Nov 04 12:41:11 2009 +0000
@@ -24,7 +24,7 @@
       (* Decode the locks annotation, stored as s-expresions *)
       let txt = Odoc_info.string_of_text t in
       let locks = 
-	match Sexpr.of_string txt with
+	match SExpr_TS.of_string txt with
 	| SExpr.Node kv -> 
 	    List.map (function SExpr.Node [ SExpr.String k; SExpr.String v ] -> k,v
 		      | _ -> failwith "Failed to parse lock comment") kv 
diff -r 62ed86ba9fb2 -r adc9c375ae89 ocaml/idl/ocaml_backend/rbac_audit.ml
--- a/ocaml/idl/ocaml_backend/rbac_audit.ml	Tue Nov 03 12:56:58 2009 +0000
+++ b/ocaml/idl/ocaml_backend/rbac_audit.ml	Wed Nov 04 12:41:11 2009 +0000
@@ -159,7 +159,7 @@
 		let before_sexpr_str = String.sub line 0 sexpr_idx in
 		(* remove the [...] prefix *)
 		let sexpr_str = Stringext.String.sub_to_end line sexpr_idx in
-		let sexpr = Sexpr.of_string sexpr_str	in
+		let sexpr = SExpr_TS.of_string sexpr_str	in
 		match sexpr with
 		|SExpr.Node els -> begin
 				if List.length els = 0
diff -r 62ed86ba9fb2 -r adc9c375ae89 ocaml/xapi/bootloader.ml
--- a/ocaml/xapi/bootloader.ml	Tue Nov 03 12:56:58 2009 +0000
+++ b/ocaml/xapi/bootloader.ml	Wed Nov 04 12:41:11 2009 +0000
@@ -53,7 +53,7 @@
 let parse_output x = 
   let sexpr = "(" ^ x ^ ")" in
   let parse_failed = Error(Printf.sprintf "Failed to parse the output of bootloader: %s" sexpr) in
-  let sexpr' = Sexpr.of_string sexpr in
+  let sexpr' = SExpr_TS.of_string sexpr in
   match sexpr' with
     (* linux (kernel /var/lib/xen/vmlinuz.y1Wmrp)(args 'root=/dev/sda1 ro') *)
     (* linux (kernel /var/lib/xen/vmlinuz.SFO5fb)(ramdisk /var/lib/xen/initrd.MUitgP)(args 'root=/dev/sda1 ro') *)
diff -r 62ed86ba9fb2 -r adc9c375ae89 ocaml/xapi/helpers.ml
--- a/ocaml/xapi/helpers.ml	Tue Nov 03 12:56:58 2009 +0000
+++ b/ocaml/xapi/helpers.ml	Wed Nov 04 12:41:11 2009 +0000
@@ -875,7 +875,7 @@
 		| SExpr.Node [SExpr.String s; SExpr.String t] -> (s,t)
 		| _ -> raise (Api_errors.Server_error(Api_errors.invalid_value ,["Invalid vm_string"])) in
 
-	match Sexpr.of_string vm_string with
+	match SExpr_TS.of_string vm_string with
 	| SExpr.Node l -> List.map assoc_of_node l
 	| _ -> raise (Api_errors.Server_error(Api_errors.invalid_value ,["Invalid vm_string"]))
 
diff -r 62ed86ba9fb2 -r adc9c375ae89 ocaml/xapi/xmlrpc_sexpr.ml
--- a/ocaml/xapi/xmlrpc_sexpr.ml	Tue Nov 03 12:56:58 2009 +0000
+++ b/ocaml/xapi/xmlrpc_sexpr.ml	Wed Nov 04 12:41:11 2009 +0000
@@ -162,7 +162,7 @@
 
 (** helper function that maps between sexpr strings and xml-rpc trees *)
 let sexpr_str_to_xmlrpc (sexpr_str:string) =
-	let sroot1 = Sexpr.of_string sexpr_str in
+	let sroot1 = SExpr_TS.of_string sexpr_str in
 	let xroot1 = sexpr_to_xmlrpc sroot1 in
 	(xroot1)