Fixes to how arities are assigned and propagated

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

diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml
index acfec515c9ea75b6cca5f2b7678163e656fb97b0..8498513a86be7d7a24ad5bc79539414deadc224c 100644 (file)
--- a/ocaml/lambda4.ml
+++ b/ocaml/lambda4.ml
@@ -110,7 +110,7 @@ prerr_endline ("# INST0: " ^ string_of_var x ^ " := " ^ print ~l inst));*)
   | [] -> acc
   | t::todo_ps ->
 (*prerr_endline ("EXPAND t:" ^ print (t :> nf));*)
-     let t = subst false x inst (t :> nf) in
+     let t = subst false false x inst (t :> nf) in
 (*prerr_endline ("SUBSTITUTED t:" ^ print (t :> nf));*)
      let freshno,new_t,acc_new_ps =
       expand_match (freshno,acc_ps@`Var(max_int/3,-666)::todo_ps,acc_new_ps) t
@@ -124,7 +124,7 @@ prerr_endline ("# INST0: " ^ string_of_var x ^ " := " ^ print ~l inst));*)
    | t::todo_conv ->
 (*prerr_endline ("EXPAND t:" ^ print (t :> nf));*)
       (* try *)
-       let t = subst false x inst (t :> nf) in
+       let t = subst false false x inst (t :> nf) in
 (*prerr_endline ("SUBSTITUTED t:" ^ print (t :> nf));*)
        let freshno,new_t,acc_new_ps =
         expand_match (freshno,ps,acc_new_ps) t
@@ -137,7 +137,7 @@ prerr_endline ("# INST0: " ^ string_of_var x ^ " := " ^ print ~l inst));*)
    function
    | None -> freshno, None, acc_new_ps
    | Some t ->
-      let t = subst false x inst (t :> nf) in
+      let t = subst false false x inst (t :> nf) in
       let freshno,new_t,acc_new_ps =
        expand_match (freshno,ps,acc_new_ps) t
       in
@@ -151,7 +151,7 @@ prerr_endline ("# INST0: " ^ string_of_var x ^ " := " ^ print ~l inst));*)
          match u with
          | `N i -> acc_new_ps,i
          | _ ->
-            let ps = List.map (fun t -> cast_to_i_num_var (subst false x inst (t:> nf))) (acc_ps@acc_new_ps) in
+            let ps = List.map (fun t -> cast_to_i_num_var (subst false false x inst (t:> nf))) (acc_ps@acc_new_ps) in
             let super_simplified_ps = super_simplify_ps ps ps in
 (*prerr_endline ("CERCO u:" ^ print (fst u :> nf));
 List.iter (fun x -> prerr_endline ("IN: " ^ print (fst x :> nf))) ps;
@@ -420,16 +420,15 @@ let instantiate p x n =
    then failwithProblem p ("BOMB (" ^ string_of_nf !bomb ^ ") cannot be instantiated!"));
  let arity_of_x = max_arity_tms x (all_terms p) in
  (if arity_of_x < 0 then failwithProblem p "step on a var of negative arity");
- (* AC: FIXME compute arities correctly below! *)
- let arities = Num.compute_arities x (n+1) (all_terms p :> nf list) in
+ (* AC: Once upon a time, it was:
+    let arities = Num.compute_arities x (n+1) (all_terms p :> nf list) in *)
  (* let arities = Array.to_list (Array.make (n+1) 0) in *)
+ let arities = Array.to_list (Array.make (n+1) min_int) in
  let p,vars = make_fresh_vars p arities in
- (* let p,zero = make_fresh_var p in *)
- (* let zero = Listx.Nil zero in *)
- (* let args = if n = 0 then zero else Listx.append zero (Listx.from_list vars) in *)
  let args = Listx.from_list (vars :> nf list) in
  let bs = ref [] in
- let inst = `Lam(false,`Match(`I((0,0),Listx.map (lift 1) args),(x,arity_of_x),1,bs,[])) in
+ (* min_int, since it will be replaced anyway during subst: *)
+ let inst = `Lam(false,`Match(`I((0,n+1),Listx.map (lift 1) args),(x,min_int),1,bs,[])) in
  let p = {p with deltas=bs::p.deltas} in
  subst_in_problem x inst p
 ;;