X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Flambda-delta%2Fcommon%2Flibrary.ml;h=91272c6f839c10bffef60ad44d47ed1334e93ec5;hb=e17c4da82bd52712f03c112660c52eb8f1783843;hp=25bca63a9e3a1cbb8557c40bf03616272b49e75b;hpb=51beb717ea0a68ae899e73b09cb67ea90b260b27;p=helm.git

diff --git a/helm/software/lambda-delta/common/library.ml b/helm/software/lambda-delta/common/library.ml
index 25bca63a9..91272c6f8 100644
--- a/helm/software/lambda-delta/common/library.ml
+++ b/helm/software/lambda-delta/common/library.ml
@@ -9,8 +9,7 @@
      \ /   This software is distributed as is, NO WARRANTY.              
       V_______________________________________________________________ *)
 
-module F = Format
-module N = Filename
+module F = Filename
 module U = NUri
 module C = Cps
 module H = Hierarchy
@@ -26,8 +25,9 @@ let root = "ENTITY"
 
 let system = "http://helm.cs.unibo.it/lambda-delta/" ^ base ^ "/ld.dtd"
 
-let path_of_uri uri =
-   N.concat base (Str.string_after (U.string_of_uri uri) 3)
+let path_of_uri xdir uri =
+   let base = F.concat xdir base in 
+   F.concat base (Str.string_after (U.string_of_uri uri) 3)
 
 (* interface functions ******************************************************)
 
@@ -106,9 +106,9 @@ let mark a =
    let f i = "mark", string_of_int i in
    Y.mark err f a
 
-let export_entity pp_term si g (a, u, b) =
-   let path = path_of_uri u in
-   let _ = Sys.command (Printf.sprintf "mkdir -p %s" (N.dirname path)) in
+let export_entity pp_term si xdir (a, u, b) =
+   let path = path_of_uri xdir u in
+   let _ = Sys.command (Printf.sprintf "mkdir -p %s" (F.dirname path)) in
    let och = open_out (path ^ obj_ext) in
    let out = output_string och in
    xml out "1.0" "UTF-8"; doctype out root system;
@@ -116,10 +116,11 @@ let export_entity pp_term si g (a, u, b) =
    let attrs = [uri u; name a; mark a] in 
    let contents = match b with
       | Y.Abst w -> tag "ABST" attrs ~contents:(pp_term w) 
-      | Y.Abbr v -> tag "ABBR" attrs ~contents:(pp_term v) 
+      | Y.Abbr v -> tag "ABBR" attrs ~contents:(pp_term v)
+      | Y.Void   -> assert false
    in
    let opts = if si then "si" else "" in
-   let shp = H.string_of_graph C.start g in
+   let shp = H.string_of_graph () in
    let attrs = ["hierarchy", shp; "options", opts] in
    tag root attrs ~contents out 0;
    close_out och