new_arity = old_arity + 1

[fireball-separation.git] / ocaml / num.ml

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 3c84f4f6236f937ed4eec92efbf3f5eabd261ef4..d59d07f49f529f40eb39160acd2d5c313427c8cf 100644 (file)
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -161,9 +161,11 @@ let set_arity arity = function
 | `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
@@ -187,7 +189,7 @@ and mk_match t (n,ar) bs_lift bs args =
     `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 ->
@@ -236,12 +238,12 @@ prerr_endline ("subst l:" ^ string_of_int l ^ " delift_by_one:" ^ string_of_bool
 
 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
 ;;
@@ -305,15 +307,20 @@ let eta_subterm (#nf as x) (#nf as y) = eta_subterm x y;;
 
 
 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)
 ;;
 
@@ -333,7 +340,7 @@ let compute_arities m =
    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)
 ;;