X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fsimple.ml;h=a63314959984a88c3407ec8d20f89a60a9c1efd1;hb=69f6ab5b05bcbeb0ced857415c7c48460ae0bdcb;hp=8e4f61946e453827b4024dccca02d6ce8ac2f19b;hpb=5664c5924f59c805c6e658698cc2fa535cab27f6;p=fireball-separation.git

diff --git a/ocaml/simple.ml b/ocaml/simple.ml
index 8e4f619..a633149 100644
--- a/ocaml/simple.ml
+++ b/ocaml/simple.ml
@@ -12,7 +12,7 @@ type t =
  | A of t * t
  | L of t
  | B (* bottom *)
- | C of int
+ | C (* constant *)
 ;;
 
 let delta = L(A(V 0, V 0));;
@@ -23,7 +23,6 @@ let eta_eq' =
   | L t1, t2 -> aux l1 (l2+1) t1 t2
   | t1, L t2 -> aux (l1+1) l2 t1 t2
   | V a, V b -> a + l1 = b + l2
-  | C a, C b -> a = b
   | A(t1,t2), A(u1,u2) -> aux l1 l2 t1 u1 && aux l1 l2 t2 u2
   | _, _ -> false
  in aux ;;
@@ -49,7 +48,7 @@ let string_of_t =
   let rec string_of_term_w_pars level = function
     | V v -> if v >= level then "`" ^ string_of_int (v-level) else
        string_of_bvar (level - v-1)
-    | C n -> "c" ^ string_of_int n
+    | C -> "C"
     | A _
     | L _ as t -> "(" ^ string_of_term_no_pars level t ^ ")"
     | B -> "BOT"
@@ -98,24 +97,23 @@ let rec is_inert =
  function
  | A(t,_) -> is_inert t
  | V _ -> true
- | C _
+ | C
  | L _ | B -> false
 ;;
 
-let is_var = function V _ -> true | _ -> false;;
-let is_lambda = function L _ -> true | _ -> false;;
-
 let rec get_inert = function
  | V n -> (n,0)
  | A(t, _) -> let hd,args = get_inert t in hd,args+1
  | _ -> assert false
 ;;
 
-let rec no_leading_lambdas hd_var j = function
- | L t -> 1 + no_leading_lambdas (hd_var+1) j t
- | A _ as t -> let hd_var', n = get_inert t in if hd_var = hd_var' then max 0 (j - n) else 0
- | V n -> if n = hd_var then j else 0
- | B | C _ -> 0
+(* precomputes the number of leading lambdas in a term,
+   after replacing _v_ w/ a term starting with n lambdas *)
+let rec no_leading_lambdas v n = function
+ | L t -> 1 + no_leading_lambdas (v+1) n t
+ | A _ as t -> let v', m = get_inert t in if v = v' then max 0 (n - m) else 0
+ | V v' -> if v = v' then n else 0
+ | B | C -> 0
 ;;
 
 let rec subst level delift sub =
@@ -126,8 +124,7 @@ let rec subst level delift sub =
   let t1 = subst level delift sub t1 in
   let t2 = subst level delift sub t2 in
   mk_app t1 t2
- | C _ as t -> t
- | B -> B
+ | C | B as t -> t
 and mk_app t1 t2 = if t2 = B || (t1 = delta && t2 = delta) then B
  else match t1 with
  | B -> B
@@ -139,29 +136,28 @@ and lift n =
   | V m -> V (if m >= lev then m + n else m)
   | L t -> L (aux (lev+1) t)
   | A (t1, t2) -> A (aux lev t1, aux lev t2)
-  | C _ as t -> t
-  | B -> B
+  | C  | B as t -> t
  in aux 0
 ;;
 let subst = subst 0 false;;
 
-let subst_in_problem sub p =
-print_endline ("-- SUBST " ^ string_of_t (V (fst sub)) ^ " |-> " ^ string_of_t (snd sub));
+let subst_in_problem ((v, t) as sub) p =
+print_endline ("-- SUBST " ^ string_of_t (V v) ^ " |-> " ^ string_of_t t);
  {p with
   div=subst sub p.div;
   conv=subst sub p.conv;
-  stepped=(fst sub)::p.stepped;
+  stepped=v::p.stepped;
   sigma=sub::p.sigma}
 ;;
 
 let get_subterm_with_head_and_args hd_var n_args =
  let rec aux lev = function
- | C _
- | V _ | B -> None
+ | C | V _ | B -> None
  | L t -> aux (lev+1) t
  | A(t1,t2) as t ->
    let hd_var', n_args' = get_inert t1 in
    if hd_var' = hd_var + lev && n_args <= 1 + n_args'
+    (* the `+1` above is because of t2 *)
     then Some (lift ~-lev t)
     else match aux lev t2 with
     | None -> aux lev t1
@@ -173,7 +169,7 @@ let rec purify = function
  | L t -> Pure.L (purify t)
  | A (t1,t2) -> Pure.A (purify t1, purify t2)
  | V n -> Pure.V n
- | C _ -> Pure.V max_int (* FIXME *)
+ | C -> Pure.V (min_int/2)
  | B -> Pure.B
 ;;
 
@@ -182,7 +178,7 @@ let check p sigma =
  let div = purify p.div in
  let conv = purify p.conv in
  let sigma = List.map (fun (v,t) -> v, purify t) sigma in
- let freshno = List.fold_right (fun (x,_) -> max x) sigma 0 in
+ let freshno = List.fold_right (max ++ fst) sigma 0 in
  let env = Pure.env_of_sigma freshno sigma in
  assert (Pure.diverged (Pure.mwhd (env,div,[])));
  print_endline " D diverged.";
@@ -201,6 +197,8 @@ let sanity p =
 ;;
 
 (* drops the arguments of t after the n-th *)
+(* FIXME! E' usato in modo improprio contando sul fatto
+   errato che ritorna un inerte lungo esattamente n *)
 let inert_cut_at n t =
  let rec aux t =
   match t with
@@ -213,15 +211,19 @@ let inert_cut_at n t =
  in snd (aux t)
 ;;
 
-let find_eta_difference p t n_args =
- let t = inert_cut_at n_args t in
+(* return the index of the first argument with a difference
+   (the first argument is 0)
+   precondition: p.div and t have n+1 arguments
+   *)
+let find_eta_difference p t argsno =
+ let t = inert_cut_at argsno t in
  let rec aux t u k = match t, u with
- | V _, V _ -> assert false (* div subterm of conv *)
+ | V _, V _ -> problem_fail p "no eta difference found (div subterm of conv?)"
  | A(t1,t2), A(u1,u2) ->
-    if not (eta_eq t2 u2) then ((*print_endline((string_of_t t2) ^ " <> " ^ (string_of_t u2));*) k)
+    if not (eta_eq t2 u2) then (k-1)
     else aux t1 u1 (k-1)
  | _, _ -> assert false
- in aux p.div t n_args
+ in aux p.div t argsno
 ;;
 
 let compute_max_lambdas_at hd_var j =
@@ -234,7 +236,7 @@ let compute_max_lambdas_at hd_var j =
         else no_leading_lambdas hd_var j t2)
       else id) (max (aux hd t1) (aux hd t2))
  | L t -> aux (hd+1) t
- | V _ -> 0
+ | V _ | C -> 0
  | _ -> assert false
  in aux hd_var
 ;;
@@ -246,6 +248,9 @@ let print_cmd s1 s2 = print_endline (">> " ^ s1 ^ " " ^ s2);;
 let eat p =
 print_cmd "EAT" "";
  let var, k = get_inert p.div in
+ match var with
+ | C | L _ | B | A _ -> assert false
+ | V var ->
  let phase = p.phase in
  let p =
   match phase with
@@ -300,7 +305,7 @@ let rec auto p =
       else auto p
     with Done sigma -> sigma)
  | Some t ->
-  let j = find_eta_difference p t n_args - 1 in
+  let j = find_eta_difference p t n_args in
   let k = 1 + max
    (compute_max_lambdas_at hd_var j p.div)
     (compute_max_lambdas_at hd_var j p.conv) in
@@ -310,17 +315,17 @@ let rec auto p =
 
 let problem_of (label, div, convs, ps, var_names) =
  print_hline ();
- let rec aux = function
- | `Lam(_, t) -> L (aux t)
- | `I ((v,_), args) -> Listx.fold_left (fun x y -> mk_app x (aux y)) (V v) args
- | `Var(v,_) -> V v
+ let rec aux lev = function
+ | `Lam(_, t) -> L (aux (lev+1) t)
+ | `I (v, args) -> Listx.fold_left (fun x y -> mk_app x (aux lev y)) (aux lev (`Var v)) args
+ | `Var(v,_) -> if v >= lev && List.nth var_names (v-lev) = "C" then C else V v
  | `N _ | `Match _ -> assert false in
  assert (List.length ps = 0);
  let convs = List.rev convs in
- let conv = List.fold_left (fun x y -> mk_app x (aux (y :> Num.nf))) (V (List.length var_names)) convs in
+ let conv = List.fold_left (fun x y -> mk_app x (aux 0 (y :> Num.nf))) (V (List.length var_names)) convs in
  let var_names = "@" :: var_names in
  let div = match div with
- | Some div -> aux (div :> Num.nf)
+ | Some div -> aux 0 (div :> Num.nf)
  | None -> assert false in
  let varno = List.length var_names in
  let p = {orig_freshno=varno; freshno=1+varno; div; conv; sigma=[]; stepped=[]; phase=`One} in