X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_annotations%2FcicAnnotation2Xml.ml;h=23c3a9b68446a3812f8682a7c2a0e96c78051ac4;hb=6f65a2e518d723ea722b23bfd9fa0162ff8be457;hp=5a8adfaff77af0fabe38b4307c1e16182ac3b24b;hpb=298fa826610192b1a173c81b4ebf961c1c7e6609;p=helm.git

diff --git a/helm/ocaml/cic_annotations/cicAnnotation2Xml.ml b/helm/ocaml/cic_annotations/cicAnnotation2Xml.ml
index 5a8adfaff..23c3a9b68 100644
--- a/helm/ocaml/cic_annotations/cicAnnotation2Xml.ml
+++ b/helm/ocaml/cic_annotations/cicAnnotation2Xml.ml
@@ -29,195 +29,137 @@ exception NotImplemented;;
 
 let dtdname = "http://www.cs.unibo.it/helm/dtd/annotations.dtd";;
 
+let get_ann ids_to_annotations =
+ CicXPath.get_annotation ids_to_annotations
+;;
+
+let print_ann i2a id =
+ let module X = Xml in
+  let ann = get_ann i2a id in
+   match ann with
+      None -> [<>]
+    | Some ann -> (X.xml_nempty "Annotation" [None,"of", id] (X.xml_cdata ann))
+;;
+
 (*CSC ottimizzazione: al posto di curi cdepth (vedi codice) *)
-let print_term =
+(* It takes in input a hash table mapping ids to annotations, an annotated 
+term, and gives back a Xml.token Stream.t representing the .ann file *)
+let print_term i2a =
  let rec aux =
   let module C = Cic in
   let module X = Xml in
   let module U = UriManager in
     function
-       C.ARel (id,ann,_,_) ->
-        (match !ann with
-            None -> [<>]
-          | Some ann -> (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-        )
-     | C.AVar (id,ann,_) ->
-        (match !ann with
-            None -> [<>]
-          | Some ann -> (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-        )
-     | C.AMeta (id,ann,_) ->
-        (match !ann with
-            None -> [<>]
-          | Some ann -> (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-        )
-     | C.ASort (id,ann,_) ->
-        (match !ann with
-            None -> [<>]
-          | Some ann -> (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-        )
+       C.ARel (id,_,_,_) -> print_ann i2a id
+     | C.AMeta (id,_,_) -> print_ann i2a id
+     | C.ASort (id,_) -> print_ann i2a id
      | C.AImplicit _ -> raise NotImplemented
-     | C.AProd (id,ann,_,s,t) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
-           aux s ;
-           aux t
-        >]
-     | C.ACast (id,ann,v,t) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
-           aux v ;
-           aux t
-        >]
-     | C.ALambda (id,ann,_,s,t) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
-           aux s ;
-           aux t
-        >]
-     | C.ALetIn (id,ann,_,s,t) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
-           aux s ;
-           aux t
-        >]
-     | C.AAppl (id,ann,li) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
+     | C.AProd (id,_,s,t) -> [< print_ann i2a id ; aux s ; aux t >]
+     | C.ACast (id,v,t) -> [< print_ann i2a id ; aux v ; aux t >]
+     | C.ALambda (id,_,s,t) -> [< print_ann i2a id ; aux s ; aux t >]
+     | C.ALetIn (id,_,s,t) -> [< print_ann i2a id ; aux s ; aux t >]
+     | C.AAppl (id,li) ->
+        [< print_ann i2a id ;
            List.fold_right (fun x i -> [< (aux x) ; i >]) li [<>]
         >]
-     | C.AConst (id,ann,_,_) ->
-        (match !ann with
-            None -> [<>]
-          | Some ann -> (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-        )
-     | C.AAbst (id,ann,_) -> raise NotImplemented
-     | C.AMutInd (id,ann,_,_,_) ->
-        (match !ann with
-            None -> [<>]
-          | Some ann -> (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-        )
-     | C.AMutConstruct (id,ann,_,_,_,_) ->
-        (match !ann with
-            None -> [<>]
-          | Some ann -> (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-        )
-     | C.AMutCase (id,ann,_,_,_,ty,te,patterns) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
+     | C.AVar (id,_,exp_named_subst)
+     | C.AConst (id,_,exp_named_subst)
+     | C.AMutInd (id,_,_,exp_named_subst)
+     | C.AMutConstruct (id,_,_,_,exp_named_subst) ->
+        [< print_ann i2a id ;
+           List.fold_right
+            (fun (_,x) i -> [< aux x ; i >])
+            exp_named_subst [<>]
+        >] 
+     | C.AMutCase (id,_,_,ty,te,patterns) ->
+        [< print_ann i2a id ;
            aux ty ;
            aux te ;
            List.fold_right
             (fun x i -> [< aux x ; i>])
             patterns [<>]
         >]
-     | C.AFix (id, ann, _, funs) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
+     | C.AFix (id,_,funs) ->
+        [< print_ann i2a id ;
            List.fold_right
-            (fun (_,_,ti,bi) i -> [< aux ti ; aux bi ; i >]) funs [<>]
+            (fun (_,_,_,ti,bi) i -> [< aux ti ; aux bi ; i >]) funs [<>]
         >]
-     | C.ACoFix (id, ann,no,funs) ->
-        [< (match !ann with
-               None -> [<>]
-             | Some ann ->
-                (X.xml_nempty "Annotation" ["of", id] (X.xml_cdata ann))
-           ) ;
+     | C.ACoFix (id,no,funs) ->
+        [< print_ann i2a id ;
            List.fold_right
-            (fun (_,ti,bi) i -> [< aux ti ; aux bi ; i >]) funs [<>]
+            (fun (_,_,ti,bi) i -> [< aux ti ; aux bi ; i >]) funs [<>]
         >]
  in
   aux
 ;;
 
-let print_mutual_inductive_type (_,_,arity,constructors) =
- [< print_term arity ;
+let print_mutual_inductive_type i2a (_,_,_,arity,constructors) =
+ [< print_term i2a arity ;
     List.fold_right
-     (fun (name,ty,_) i -> [< print_term ty ; i >]) constructors [<>]
+     (fun (name,ty) i -> [< print_term i2a ty ; i >]) constructors [<>]
  >]
 ;;
 
-let pp_annotation obj curi =
+let pp_annotation obj i2a curi =
  let module C = Cic in
  let module X = Xml in
   [< X.xml_cdata "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n" ;
      X.xml_cdata ("<!DOCTYPE Annotations SYSTEM \"" ^ dtdname ^ "\">\n\n") ;
      X.xml_nempty "Annotations"
-      ["of", UriManager.string_of_uri (UriManager.cicuri_of_uri curi)]
+      [None, "of", UriManager.string_of_uri (UriManager.cicuri_of_uri curi)]
       begin
        match obj with
-         C.ADefinition (xid, ann, _, te, ty, _) ->
-          [< (match !ann with
-                 None -> [<>]
-               | Some ann ->
-                  X.xml_nempty "Annotation" ["of", xid] (X.xml_cdata ann)
+         C.AConstant (xid, xidobj, _, te, ty, _) ->
+          [< print_ann i2a xid ;
+             (match xidobj,te with
+                 Some xidobj, Some te ->
+                  [< print_ann i2a xidobj ;
+                     print_term i2a te
+                  >]
+               | None, None -> [<>]
+               | _,_ -> assert false
              ) ;
-             print_term te ;
-             print_term ty
+             print_term i2a ty
           >]
-       | C.AAxiom (xid, ann, _, ty, _) ->
-          [< (match !ann with
-                 None -> [<>]
-               | Some ann ->
-                  X.xml_nempty "Annotation" ["of", xid] (X.xml_cdata ann)
-             ) ;
-             print_term ty
-          >]
-       | C.AVariable (xid, ann, _, bo, ty) ->
-          [< (match !ann with
-                 None -> [<>]
-               | Some ann ->
-                  X.xml_nempty "Annotation" ["of", xid] (X.xml_cdata ann)
-             ) ;
+       | C.AVariable (xid, _, bo, ty,_) ->
+          [< print_ann i2a xid ;
              (match bo with
                  None -> [<>]
-               | Some bo -> print_term bo
+               | Some bo -> print_term i2a bo
              ) ;
-             print_term ty
+             print_term i2a ty
           >]
-       | C.ACurrentProof (xid, ann, _, conjs, bo, ty) ->
-          [< (match !ann with
-                 None -> [<>]
-               | Some ann ->
-                  X.xml_nempty "Annotation" ["of", xid] (X.xml_cdata ann)
-             ) ;
+       | C.ACurrentProof (xid, xidobj, _, conjs, bo, ty,_) ->
+          [< print_ann i2a xid ;
+             print_ann i2a xidobj ;
              List.fold_right
-              (fun (_,t) i -> [< print_term t ; i >])
-              conjs [<>] ;
-             print_term bo ;
-             print_term ty
+              (fun (cid, _, context, t) i ->
+                [< print_ann i2a cid ;
+                   List.fold_right
+		    (fun (hid,context_entry) i -> 
+		      [<print_ann i2a hid ;
+                        (match context_entry with
+			    Some (_,C.ADecl at) -> print_term i2a at
+		          | Some (_,C.ADef at) -> print_term i2a at
+		          | None -> [< >]
+                        ) ; i
+                       >]
+		    ) context [< >];
+		   print_term i2a t ; i
+                >]
+              ) conjs [<>] ;
+             print_term i2a bo ;
+             print_term i2a ty
           >]
-       | C.AInductiveDefinition (xid, ann, tys, params, paramsno) ->
-          [< (match !ann with
-                 None -> [<>]
-               | Some ann ->
-                  X.xml_nempty "Annotation" ["of", xid] (X.xml_cdata ann)
-             ) ;
+       | C.AInductiveDefinition (xid, tys, params, paramsno) ->
+          [< print_ann i2a xid ;
              List.fold_right
-              (fun x i -> [< print_mutual_inductive_type x ; i >])
+              (fun x i -> [< print_mutual_inductive_type i2a x ; i >])
               tys [< >]
           >]
       end
   >]
 ;;
+
+
+