[r2003-06-24 15:42:10 by cvscast] Updating for new version of PXP

Original author: cvscast
Date: 2003-06-24 15:42:10+00:00

benchmarks/bench.ml

@@ -47,9 +47,9 @@ let args =  List.map int_of_string (split ',' args)
 let sp = sprintf
 let langs = 
   [
-(*    "CDuce PXP", ".cd",
+    "CDuce PXP", ".cd",
     (fun script xml -> 
-       sp "%s --pxp --quiet %s --arg %s" cduce_cmd script xml); *)
+       sp "%s --pxp --quiet %s --arg %s" cduce_cmd script xml); 
 
     "CDuce expat", ".cd",
     (fun script xml -> 

runtime/load_xml.ml

@@ -149,7 +149,7 @@ let pxp_config =
 let load_pxp s =
   try
     let mgr = create_entity_manager pxp_config (from_file s) in
-    process_entity pxp_config (`Entry_document[]) mgr pxp_handle_event;
+    process_entity pxp_config (`Entry_document[`Extend_dtd_fully]) mgr pxp_handle_event;
   with exn ->
     raise (Location.Generic (Pxp_types.string_of_exn exn))
 

schema/schema_validator.ml

@@ -52,6 +52,7 @@ let string_of_pxp_event = function
   | E_position (entity, line, col) -> "E_position"
   | E_error exn -> sprintf "E_error (%s)" (Pxp_types.string_of_exn exn)
   | E_end_of_stream -> "E_end_of_stream"
+  | _ -> assert false
 
 exception Not_a_start_tag of Pxp_yacc.event
 

schema/schema_xml.ml

@@ -199,6 +199,7 @@ let string_of_pxp_event = function
   | E_position (entity, line, col) -> "E_position"
   | E_error exn -> sprintf "E_error (%s)" (Pxp_types.string_of_exn exn)
   | E_end_of_stream -> "E_end_of_stream"
+  | _ -> assert false
 
 let rec dump_stream s =
   print_endline (string_of_pxp_event (Stream.next s));

tools/pull.ml

@@ -56,7 +56,7 @@ let pull s =
 let push s =
   process_entity
     default_config
-    (`Entry_document[`Extend_dtd_fully])
+    (`Entry_document[(* `Extend_dtd_fully *)])
     (create_entity_manager default_config (from_file s))
     dump_event