+ Chain NCic.term -> content -> presentation very very roughly implemented

[helm.git] / helm / software / components / content_pres / content2presMatcher.ml

diff --git a/helm/software/components/content_pres/content2presMatcher.ml b/helm/software/components/content_pres/content2presMatcher.ml
index bcb4257bfda353f4f0ba7fe010d3590da5ca674b..0e85618896833b254b52e12970ff81f6a3f96b72 100644 (file)
--- a/helm/software/components/content_pres/content2presMatcher.ml
+++ b/helm/software/components/content_pres/content2presMatcher.ml
@@ -38,7 +38,12 @@ let get_tag term0 =
     subterms := t :: !subterms ; 
     Ast.Implicit
   in
-  let rec aux t = CicNotationUtil.visit_ast ~special_k map_term t
+  let rec aux t = 
+    CicNotationUtil.visit_ast 
+      ~map_xref_option:(fun _ -> None)
+      ~map_case_indty:(fun _ -> None)
+      ~map_case_outtype:(fun _ _ -> None)
+      ~special_k map_term t
   and special_k = function
     | Ast.AttributedTerm (_, t) -> aux t
     | _ -> assert false
@@ -73,7 +78,7 @@ struct
     let add_magic m =
       let name = Util.fresh_name () in
       magic_map := (name, m) :: !magic_map;
-      Ast.Variable (Ast.TermVar (name,None))
+      Ast.Variable (Ast.TermVar (name,Ast.Level 0))
     in
     let rec aux = function
       | Ast.AttributedTerm (_, t) -> assert false
@@ -91,7 +96,7 @@ struct
       List.map2
         (fun p t ->
           match p, t with
-          | Ast.Variable (Ast.TermVar (name,l)), _ ->
+          | Ast.Variable (Ast.TermVar (name,(Ast.Self l|Ast.Level l))), _ ->
               name, (Env.TermType l, Env.TermValue t)
           | Ast.Variable (Ast.NumVar name), (Ast.Num (s, _)) ->
               name, (Env.NumType, Env.NumValue s)