[r2005-03-06 23:01:52 by afrisch] Cosmestique

Original author: afrisch
Date: 2005-03-06 23:01:52+00:00

runtime/value.ml

@@ -65,8 +65,8 @@ let concat v1 v2 =
 let append v1 v2 =
   concat v1 (Pair (v2,nil))
 
-let failwith' s = raise (CDuceExn (string_latin1 s))
 let raise' v = raise (CDuceExn v)
+let failwith' s = raise' (string_latin1 s)
 
 
 let rec const = function

schema/schema_builtin.ml

@@ -478,8 +478,10 @@ let int_type (name,min,max) =
 	let min = Intervals.V.mk min  in
 	Intervals.right min
     | None, None ->
-	Intervals.any in
-  ignore (primitive name (Types.interval ival) (validate_interval ival name
+	Intervals.any 
+  in
+  ignore (primitive name (Types.interval ival) (validate_interval ival name))
+
 let () =
   List.iter int_type [ 
     "integer", None, None;

schema/schema_common.ml

@@ -154,7 +154,7 @@ let stream_of_value v =
         stack := tl;
         Some (E_end_tag (Atoms.V.value atom))
     | (Fully (Value.Xml (_, _, _)))::_ | (Half (Value.Xml (_, _, _)))::_ ->
-        failwith "Schema_xml.pxp_stream_of_value: non-atom-tag xml value"
+        Value.failwith'  "Validate: non XML element"
     | (Backlog ev) :: tl -> (* consume backlog *)
         stack := tl;
         Some ev
@@ -162,8 +162,7 @@ let stream_of_value v =
         stack := tl;
         Some (E_char_data v)
     | [] -> None
-    | _ -> 
-	failwith "Non XML element"
+    | _ -> Value.failwith'  "Validate: non XML element"
   in
   Stream.from f