First implementation of \ldots.

Note: the implementation is now inefficient since implicits are generated and
mapped to metavariables again and again and again. It would be better to handle
\ldots as a coercion from \forall x:A.B(x) to B(?).

diff --git a/helm/software/components/ng_refiner/nCicRefiner.ml b/helm/software/components/ng_refiner/nCicRefiner.ml
index a227e918e1d467d40809f6f1a2a2a116cd6a4d65..10881fa3490723013c706afd77ba8ce7f5a63076 100644 (file)
--- a/helm/software/components/ng_refiner/nCicRefiner.ml
+++ b/helm/software/components/ng_refiner/nCicRefiner.ml
@@ -100,13 +100,14 @@ let rec typeof rdb
   ?(localise=fun _ -> Stdpp.dummy_loc) 
   metasenv subst context term expty 
 =
-  let force_ty skip_lambda metasenv subst context orig t infty expty =
+  let force_ty skip_lambda skip_appl metasenv subst context orig t infty expty =
     (*D*)inside 'F'; try let rc = 
     match expty with
     | Some expty ->
        (match t with
        | C.Implicit _ -> assert false
        | C.Lambda _ when skip_lambda -> metasenv, subst, t, expty
+       | C.Appl _ when skip_appl -> metasenv, subst, t, expty
        | _ ->
           pp (lazy (
           (NCicPp.ppterm ~metasenv ~subst ~context infty) ^  " === " ^
@@ -213,7 +214,7 @@ let rec typeof rdb
          typeof_aux metasenv subst context_for_t exp_ty_t t 
        in
        if force_after then
-         force_ty false metasenv subst context orig 
+         force_ty false true metasenv subst context orig 
            (C.Lambda(n,s,t)) (C.Prod (n,s,ty_t)) expty
        else 
          metasenv, subst, C.Lambda(n,s,t), C.Prod (n,s,ty_t)
@@ -236,7 +237,8 @@ let rec typeof rdb
        let metasenv, subst, he, ty_he = 
          typeof_aux metasenv subst context None he in
        let metasenv, subst, t, ty = 
-         eat_prods rdb ~localise metasenv subst context orig_he he ty_he args in
+         eat_prods rdb ~localise force_ty metasenv subst context expty t
+          orig_he he ty_he args in
        let t = if upto > 0 then NCicReduction.head_beta_reduce ~upto t else t in
        metasenv, subst, t, ty
    | C.Appl _ -> raise (AssertFailure (lazy "Appl of length < 2"))
@@ -329,7 +331,7 @@ let rec typeof rdb
     in
     pp (lazy (NCicPp.ppterm ~metasenv ~subst ~context t ^ " :: "^
          NCicPp.ppterm ~metasenv ~subst ~context infty ));
-      force_ty true metasenv subst context orig t infty expty
+      force_ty true true metasenv subst context orig t infty expty
     (*D*)in outside(); rc with exc -> outside (); raise exc
   in
     typeof_aux metasenv subst context expty term
@@ -436,11 +438,29 @@ and guess_name subst ctx ty =
       with NCicUtils.Subst_not_found _ -> aux 'M')
   | _ -> aux 'H' 
 
-and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args =
+and eat_prods rdb ~localise force_ty metasenv subst context expty orig_t orig_he he ty_he args =
   (*D*)inside 'E'; try let rc = 
+  let too_many_args = ref false in
   let rec aux metasenv subst args_so_far he ty_he = function 
-  | [] ->metasenv, subst, NCicUntrusted.mk_appl he (List.rev args_so_far), ty_he
-  | NCic.Implicit `Vector::tl -> assert false
+  | [] ->
+     let res = NCicUntrusted.mk_appl he (List.rev args_so_far) in
+      (match NCicReduction.whd ~subst context ty_he with
+          NCic.Meta _ | NCic.Appl (NCic.Meta _::_) ->
+           too_many_args := true;
+        | _ -> ());
+      force_ty true false metasenv subst context orig_t res ty_he expty
+  | NCic.Implicit `Vector::tl ->
+     (try
+       too_many_args := false;
+       aux metasenv subst args_so_far he ty_he tl
+      with
+         Uncertain _
+       | RefineFailure _ as exc when !too_many_args <> true ->
+          try
+           aux metasenv subst args_so_far he ty_he
+            (NCic.Implicit `Vector :: NCic.Implicit `Term :: tl)
+          with
+           Uncertain msg | RefineFailure msg -> raise (wrap_exc msg exc))
   | arg::tl ->
       match NCicReduction.whd ~subst context ty_he with 
       | C.Prod (_,s,t) ->
@@ -469,7 +489,8 @@ and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args =
             ^ "\nOF: " ^
             NCicPp.ppterm ~metasenv ~subst ~context t ^  " === " ^
             NCicPp.ppterm ~metasenv ~subst ~context flex_prod ^ "\n"));
-          let metasenv, subst = 
+          let metasenv, subst =
+             too_many_args := true;
              try NCicUnification.unify rdb metasenv subst context t flex_prod 
              with exc -> raise (wrap_exc (lazy (localise orig_he, Printf.sprintf
               ("The term %s has an inferred type %s, but is applied to the" ^^
@@ -491,6 +512,7 @@ and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args =
             (List.length args) (List.length args_so_far))))
       | ty ->
           let metasenv, subst, newhead, newheadty = 
+            too_many_args := true;
             try_coercions rdb ~localise metasenv subst context
               (NCicUntrusted.mk_appl he (List.rev args_so_far)) orig_he ty
               (NCic.Prod ("_",NCic.Implicit `Term,NCic.Implicit `Term))
@@ -500,7 +522,8 @@ and eat_prods rdb ~localise metasenv subst context orig_he he ty_he args =
                "only %d arguments") (NCicPp.ppterm ~metasenv ~subst ~context he)
                (List.length args) (List.length args_so_far))))
           in
-          aux metasenv subst [] newhead newheadty (arg :: tl)
+           too_many_args := false;
+           aux metasenv subst [] newhead newheadty (arg :: tl)
   in
    (* We need to reverse the order of the new created metas since they
       are pushed on top of the metasenv in the wrong order *)