Function to map NCic.term to CicNotationPt.term finished.

Note: it is almost identical to ncic_of_ast0, but it uses a different data
type for contexts that allow to perform "substitution" in a single operation.
Moreover, the terms that are substituted are CicNotationPt.terms and not
NCic.terms. The two codes really ought to be unified.

diff --git a/helm/software/components/ng_tactics/nCicElim.ml b/helm/software/components/ng_tactics/nCicElim.ml
index a124b28388d3fa83d38ad6a6a8d444724d963215..4339b2860f42531eef867c1860a5536e0b44e586 100644 (file)
--- a/helm/software/components/ng_tactics/nCicElim.ml
+++ b/helm/software/components/ng_tactics/nCicElim.ml
@@ -194,6 +194,8 @@ let rec nth_prod projs n ty =
   | _ -> assert false
 ;;
 
+(* this code should be unified with NTermCicContent.nast_of_cic0,
+   but the two contexts have different types *)
 let rec pp rels =
  function
     NCic.Rel i -> List.nth rels (i - 1)
@@ -201,11 +203,45 @@ let rec pp rels =
      CicNotationPt.Ident
       (NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] t,None)
   | NCic.Sort s -> CicNotationPt.Sort (fst (ast_of_sort s))
+  | NCic.Meta _
+  | NCic.Implicit _ -> assert false
   | NCic.Appl l -> CicNotationPt.Appl (List.map (pp rels) l)
   | NCic.Prod (n,s,t) ->
      let n = mk_id n in
       CicNotationPt.Binder (`Pi, (n,Some (pp rels s)), pp (n::rels) t)
-  | _ -> assert false (* not implemented yet *)
+  | NCic.Lambda (n,s,t) ->
+     let n = mk_id n in
+      CicNotationPt.Binder (`Lambda, (n,Some (pp rels s)), pp (n::rels) t)
+  | NCic.LetIn (n,s,ty,t) ->
+     let n = mk_id n in
+      CicNotationPt.LetIn ((n, Some (pp rels ty)), pp rels s, pp (n::rels) t)
+  | NCic.Match (NReference.Ref (uri,_) as r,outty,te,patterns) ->
+    let name = NUri.name_of_uri uri in
+    let case_indty = Some (name, None) in
+    let constructors, leftno =
+     let _,leftno,tys,_,n = NCicEnvironment.get_checked_indtys r in
+     let _,_,_,cl  = List.nth tys n in
+      cl,leftno
+    in
+    let rec eat_branch n rels ty pat =
+      match (ty, pat) with
+      | NCic.Prod (name, s, t), _ when n > 0 ->
+         eat_branch (pred n) rels t pat
+      | NCic.Prod (_, _, t), NCic.Lambda (name, s, t') ->
+          let cv, rhs = eat_branch 0 ((mk_id name)::rels) t t' in
+           (mk_id name, Some (pp rels s)) :: cv, rhs
+      | _, _ -> [], pp rels pat
+    in
+    let patterns =
+      try
+        List.map2
+          (fun (_, name, ty) pat ->
+            let capture_variables,rhs = eat_branch leftno rels ty pat in
+             CicNotationPt.Pattern (name, None, capture_variables), rhs
+          ) constructors patterns
+      with Invalid_argument _ -> assert false
+    in
+     CicNotationPt.Case (pp rels te, case_indty, Some (pp rels outty), patterns)
 ;;
 
 let mk_projection leftno tyname consname consty (projname,_,_) i =