| `Var(n,_) -> `Var(n,arity)
| `Lam(false, `N _)
| `Lam(false, `Lam _) as t -> t
-| `Lam(false, `Match(t,(n,ar),bs_lift,bs,args)) -> `Lam(false, `Match(t,(n,arity),bs_lift,bs,args))
+| `Lam(false, `Match(t,(n,_),bs_lift,bs,args)) -> `Lam(false, `Match(t,(n,arity),bs_lift,bs,args))
| _ -> assert false
+let minus1 n = if n = min_int then n else n - 1;;
+
let rec mk_app (h : nf) (arg : nf) =
(*let res =*)
match h with
`I(v,args) -> `I(v,Listx.append (Listx.Nil arg) args)
| `Var v -> `I(v, Listx.Nil arg)
- | `Lam(_,nf) -> subst true 0 arg (nf : nf) (* AC FIXME sanity check on arity *)
+ | `Lam(truelam,nf) -> subst truelam true 0 arg (nf : nf) (* AC FIXME sanity check on arity *)
| `Match(t,v,lift,bs,args) -> `Match(t,v,lift,bs,List.append args [arg])
| `N _ -> assert false (* Numbers cannot be applied *)
(*in let l = ["v0";"v1";"v2"] in
`N m ->
(try
let h = List.assoc m !bs in
- let h = set_arity (ar-1) h in
+ let h = set_arity (minus1 ar) h in
let h = lift bs_lift h in
mk_appl h args
with Not_found ->
`Match (t,(n,ar),bs_lift,bs,args))
| `I _ | `Var _ | `Match _ -> `Match(t,(n,ar),bs_lift,bs,args)
-and subst delift_by_one what (with_what : nf) (where : nf) =
+and subst truelam delift_by_one what (with_what : nf) (where : nf) =
let aux_propagate_arity ar = function
- | `Lam(false,`Match(`I(v,args),(x,_),liftno,bs,args')) ->
+ | `Lam(false,`Match(`I(v,args),(x,_),liftno,bs,args')) when not delift_by_one ->
`Lam(false,`Match(`I(v,args),(x,ar),liftno,bs,args'))
+ | `Var(i,oldar) -> `Var(i, if truelam && oldar = min_int then ar else oldar)
| _ as t -> t in
let rec aux_i_num_var l =
function
let with_what' = lift l' with_what in
(* The following line should be the identity when delift_by_one = true because we
are assuming the ts to not contain lambda-bound variables. *)
- bs := List.map (fun (n,t) -> n,subst false what with_what' t) !bs ;
+ bs := List.map (fun (n,t) -> n,subst truelam false what with_what' t) !bs ;
mk_match (cast_to_i_num_var (aux_i_num_var l t)) v bs_lift bs (List.map (aux l) args)
and aux l(*lift*) =
(*function iii -> let res = match iii with*)
let parse' strs =
let fix_arity = function
- | `I((n,_),args) -> `I((n,Listx.length args),args)
+ | `I((n,_),args) -> `I((n,1+Listx.length args),args)
| _ -> assert false in
let rec aux = function
| Parser.Lam t -> `Lam (true, aux t)
| Parser.App (t1, t2) -> fix_arity (mk_app (aux t1) (aux t2))
- | Parser.Var v -> `Var(v,0) in
+ | Parser.Var v -> `Var(v,1) in
let (tms, free) = Parser.parse_many strs in
List.map aux tms, free
;;
let max_arity_tms n =
- let aux_var l (m,a) = if n + l = m then a else -1 in
+ let max a b = match a, b with
+ | None, None -> None
+ | None, Some x
+ | Some x, None -> Some x
+ | Some x, Some y -> Some (Pervasives.max x y) in
+ let aux_var l (m,a) = if n + l = m then Some a else None in
let rec aux l = function
| `Var v -> aux_var l v
| `I(v,tms) -> max (aux_var l v) (aux_tms l (Listx.to_list tms))
| `Lam(_,t) -> aux (l+1) t
| `Match(u,_,_,bs,args) -> max (max (aux l (u :> nf)) (aux_tms l args)) (aux_tms l (List.map snd !bs))
- | `N _ -> -1
+ | `N _ -> None
and aux_tms l =
- List.fold_left (fun acc t -> Pervasives.max acc (aux l t)) ~-1 in
+ List.fold_left (fun acc t -> Pervasives.max acc (aux l t)) None in
fun tms -> aux_tms 0 (tms :> nf list)
;;
then []
else
let tms = Util.filter_map (function `Lam(_,t) -> Some t | _ -> None ) tms in
- let arity = max 0 (max_arity_tms (m-n) tms) in (* FIXME: 0 or -1 ??? *)
+ let arity = match max_arity_tms (m-n) tms with None -> -666 | Some x -> x in
arity :: (aux (n-1) tms)
in fun tms -> List.rev (aux m tms)
;;