Fixed bug in eta_subterm

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

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 3e198642b6914d119ff58849b714901f0179ca2f..82c4b3803e4a0868e6e96eb58d935b9cae146628 100644 (file)
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -2,6 +2,9 @@ open Util
 open Util.Vars
 open Pure
 
+(* debug options *)
+let debug_display_arities = false;;
+
 (************ Syntax ************************************)
 
 (* Normal forms*)
@@ -96,19 +99,18 @@ let free_vars = (List.map fst) ++ free_vars';;
 module ToScott =
 struct
 
-let rec scott_of_nf =
- function
-  | `N n -> Scott.mk_n n
-  | `Var(v,_) -> Pure.V v
-  | `Match(t,_,liftno,bs,args) ->
-      let bs = List.map (fun (n,t) -> n, scott_of_nf (lift liftno (t :> nf))) !bs in
-      let t = scott_of_nf (t :> nf) in
-      let m = Scott.mk_match t bs in
-      List.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) m (args :> nf list)
-  | `I((v,_), args) -> Listx.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) (Pure.V v) (args :> nf Listx.listx)
-  | `Lam(b,f) -> Pure.L (scott_of_nf f)
-  | `Bottom -> let f x = Pure.A (x,x) in f (Pure.L (f (Pure.V 0)))
-  | `Pacman -> let f x = Pure.A (x,x) in f (Pure.L (Pure.L (f (Pure.V 0))))
+let rec scott_of_nf = function
+ | `N n -> Scott.mk_n n
+ | `Var(v,_) -> Pure.V v
+ | `Match(t,_,liftno,bs,args) ->
+ let bs = List.map (fun (n,t) -> n, scott_of_nf (lift liftno (t :> nf))) !bs in
+     let t = scott_of_nf (t :> nf) in
+     let m = Scott.mk_match t bs in
+     List.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) m (args :> nf list)
+ | `I((v,_), args) -> Listx.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) (Pure.V v) (args :> nf Listx.listx)
+ | `Lam(_,t) -> Pure.L (scott_of_nf t)
+ | `Bottom -> Pure.B
+ | `Pacman -> let f x = Pure.A (x,x) in f (Pure.L (Pure.L (f (Pure.V 0))))
 end
 
 
@@ -118,22 +120,24 @@ end
 
 let rec string_of_term l  =
  let rec string_of_term_w_pars l  = function
-  | `Var(n,ar) -> print_name l n ^ ":" ^ string_of_int ar
+  | `Var(n,ar) -> print_name l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "")
   | `N n -> string_of_int n
   | `I _ as t -> "(" ^ string_of_term_no_pars_app l t ^ ")"
+  | `Lam(_,`Bottom) -> "BOMB"
   | `Lam _ as t -> "(" ^ string_of_term_no_pars_lam l t ^ ")"
   | `Match(t,(v,ar),bs_lift,bs,args) ->
-     "[match("^ string_of_var v ^":"^ string_of_int ar ^") " ^ string_of_term_no_pars l (t :> nf) ^
+     "["^ string_of_var v ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^",match " ^ string_of_term_no_pars l (t :> nf) ^
      " with " ^ String.concat " | " (List.map (fun (n,t) -> string_of_int n ^ " => " ^ string_of_term l (lift bs_lift (t :> nf))) !bs) ^ "] " ^
      String.concat " " (List.map (string_of_term l) (args :> nf list)) ^ ")"
   | `Bottom -> "BOT"
   | `Pacman -> "PAC"
  and string_of_term_no_pars_app l  = function
-  | `I((n,ar), args) -> print_name l n  ^ ":" ^ string_of_int ar ^ " " ^ String.concat " " (List.map (string_of_term_w_pars l) (Listx.to_list args :> nf list))
+  | `I((n,ar), args) -> print_name l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "") ^ " " ^ String.concat " " (List.map (string_of_term_w_pars l) (Listx.to_list args :> nf list))
   | #nf as t -> string_of_term_w_pars l t
  and string_of_term_no_pars_lam l  = function
+  | `Lam(_,`Bottom) -> "BOMB"
   | `Lam(_,t) -> let name = string_of_var (List.length l) in
-   "λ" ^ name ^ ". " ^ (string_of_term_no_pars_lam (name::l) t)
+     "λ" ^ name ^ ". " ^ (string_of_term_no_pars_lam (name::l) t)
   | _ as t -> string_of_term_no_pars l t
  and string_of_term_no_pars l  = function
   | `Lam _ as t -> string_of_term_no_pars_lam l t
@@ -270,10 +274,12 @@ let parse' strs =
   (* Replace pacmans and bottoms *)
   let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in
   let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in
+  let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in
   let fix lev v =
    if v = lev + n_bot then `Bottom
     else if v = lev + n_pac then `Pacman
-     else `Var(v,1) in (* 1 by default when variable not applied *)
+     else if v = lev + n_bomb then `Lam(true, `Bottom)
+      else `Var(v,1) in (* 1 by default when variable not applied *)
   (* Fix arity *)
   let rec aux lev = function
    | Parser.Lam t -> `Lam (true, aux (lev+1) t)
@@ -337,9 +343,9 @@ let rec eta_subterm sub t =
      eta_subterm sub (u :> nf)
      || List.exists (fun (_, t) -> eta_subterm sub (lift liftno t)) !bs
      || List.exists (eta_subterm sub) (args :> nf list)
-  | `I(v, args) -> List.exists (eta_subterm sub) ((Listx.to_list args) :> nf list) || (match sub with
-   | `Var v' -> v = v'
-   | `I(v', args') -> v = v'
+  | `I((v,_), args) -> List.exists (eta_subterm sub) ((Listx.to_list args) :> nf list) || (match sub with
+   | `Var(v',_) -> v = v'
+   | `I((v',_), args') -> v = v'
     && Listx.length args' < Listx.length args
     && List.for_all (fun (x,y) -> eta_eq x y) (List.combine (Util.take (Listx.length args') (Listx.to_list args :> nf list)) (Listx.to_list args' :> nf list))
    | _ -> false
@@ -363,6 +369,6 @@ let max_arity_tms n =
   | `Match(u,_,_,bs,args) -> max (max (aux l (u :> nf)) (aux_tms l (args :> nf list))) (aux_tms l (List.map snd !bs))
   | `N _ | `Bottom | `Pacman -> None
  and aux_tms l =
-  List.fold_left (fun acc t -> Pervasives.max acc (aux l t)) None in
+  List.fold_left (fun acc t -> max acc (aux l t)) None in
  fun tms -> aux_tms 0 (tms :> nf list)
 ;;