Fixed problems separator in parser: now it is $

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

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 95501a4e14cb0878e83196dde9dd4a438cd03683..36234ad31c7a47b15b9af578aab525c379ba5419 100644 (file)
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -162,6 +162,7 @@ let cast_to_i_num_var =
     assert false (* algorithm failed *)
 
 let rec set_arity arity = function
+(* FIXME because onlt variables should be in branches of matches, one day *)
 | `Var(n,_) -> `Var(n,arity)
 | `N _ as t -> t
 | `Lam(false, t) -> `Lam(false, set_arity arity t)
@@ -239,20 +240,6 @@ prerr_endline ("subst l:" ^ string_of_int l ^ " delift_by_one:" ^ string_of_bool
   aux 0 where
 ;;
 
-(************ Parsing ************************************)
-
-let parse' strs =
-  let fix_arity = function
-  | `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,1) in
-  let (tms, free) = Parser.parse_many strs in
-  List.map aux tms, free
-;;
-
 (************** Algorithm(s) ************************)
 
 let eta_compare x y =
@@ -297,10 +284,10 @@ let rec eta_subterm sub t =
   | `Match(u,ar,liftno,bs,args) ->
      eta_subterm sub (u :> nf)
      || List.exists (fun (_, t) -> eta_subterm sub (lift liftno t)) !bs
-     || List.exists (eta_subterm sub) args
-  | `I(v, args) -> List.exists (eta_subterm sub) (Listx.to_list args) || (match sub with
-   | `Var v' -> v = v'
-   | `I(v', args') -> v = v'
+     || 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'
     && 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)) (Listx.to_list args'))
    | _ -> false