in aux 0\r
;;\r
\r
-(* does NOT lift t *)\r
+(* does NOT lift the argument *)\r
let mk_lams = fold_nat (fun x _ -> L x) ;;\r
\r
let string_of_t =\r
let is_var = function V _ -> true | _ -> false;;\r
let is_lambda = function L _ -> true | _ -> false;;\r
\r
-let rec no_leading_lambdas = function\r
- | L t -> 1 + no_leading_lambdas t\r
- | _ -> 0\r
-;;\r
-\r
let rec get_inert = function\r
| V n -> (n,0)\r
| A(t, _) -> let hd,args = get_inert t in hd,args+1\r
| _ -> assert false\r
;;\r
\r
+let rec no_leading_lambdas hd_var j = function\r
+ | L t -> 1 + no_leading_lambdas (hd_var+1) j t\r
+ | A _ as t -> let hd_var', n = get_inert t in if hd_var = hd_var' then max 0 (j - n) else 0\r
+ | V n -> if n = hd_var then j else 0\r
+ | B | C _ -> 0\r
+;;\r
+\r
let rec subst level delift sub =\r
function\r
| V v -> if v = level + fst sub then lift level (snd sub) else V (if delift && v > level then v-1 else v)\r
| B -> B\r
and mk_app t1 t2 = if t2 = B || (t1 = delta && t2 = delta) then B\r
else match t1 with\r
- | C _ as t -> t\r
| B -> B\r
| L t1 -> subst 0 true (0, t2) t1\r
| _ -> A (t1, t2)\r
;;\r
let subst = subst 0 false;;\r
\r
-let subst_in_problem (sub: var * t) (p: problem) =\r
+let subst_in_problem sub p =\r
print_endline ("-- SUBST " ^ string_of_t (V (fst sub)) ^ " |-> " ^ string_of_t (snd sub));\r
{p with\r
div=subst sub p.div;\r
let rec aux t u k = match t, u with\r
| V _, V _ -> assert false (* div subterm of conv *)\r
| A(t1,t2), A(u1,u2) ->\r
- if not (eta_eq t2 u2) then (print_endline((string_of_t t2) ^ " <> " ^ (string_of_t u2)); k)\r
+ if not (eta_eq t2 u2) then ((*print_endline((string_of_t t2) ^ " <> " ^ (string_of_t u2));*) k)\r
else aux t1 u1 (k-1)\r
| _, _ -> assert false\r
in aux p.div t n_args\r
then max ( (*FIXME*)\r
if is_inert t2 && let hd', j' = get_inert t2 in hd' = hd\r
then let hd', j' = get_inert t2 in j - j'\r
- else no_leading_lambdas t2)\r
+ else no_leading_lambdas hd_var j t2)\r
else id) (max (aux hd t1) (aux hd t2))\r
| L t -> aux (hd+1) t\r
| V _ -> 0\r
print_cmd "EAT" "";\r
let var, k = get_inert p.div in\r
let phase = p.phase in\r
- let p, t =\r
+ let p =\r
match phase with\r
| `One ->\r
let n = 1 + max\r
- (compute_max_lambdas_at var k p.div)\r
- (compute_max_lambdas_at var k p.conv) in\r
+ (compute_max_lambdas_at var (k-1) p.div)\r
+ (compute_max_lambdas_at var (k-1) p.conv) in\r
(* apply fresh vars *)\r
let p, t = fold_nat (fun (p, t) _ ->\r
let p, v = freshvar p in\r
p, A(t, V (v + k))\r
) (p, V 0) n in\r
- let p = {p with phase=`Two} in p, A(t, delta)\r
- | `Two -> p, delta in\r
- let subst = var, mk_lams t k in\r
- let p = subst_in_problem subst p in\r
- sanity p;\r
- let p = if phase = `One then {p with div = (match p.div with A(t,_) -> t | _ -> assert false)} else p in\r
+ let p = {p with phase=`Two} in\r
+ let t = A(t, delta) in\r
+ let t = fold_nat (fun t m -> A(t, V (k-m))) t (k-1) in\r
+ let subst = var, mk_lams t k in\r
+ let p = subst_in_problem subst p in\r
+ let _, args = get_inert p.div in\r
+ {p with div = inert_cut_at (args-k) p.div}\r
+ | `Two ->\r
+ let subst = var, mk_lams delta k in\r
+ subst_in_problem subst p in\r
sanity p\r
;;\r
\r
let p = subst_in_problem subst p in\r
sanity p\r
;;\r
-;;\r
-\r
-let parse strs =\r
- let rec aux level = function\r
- | Parser_andrea.Lam t -> L (aux (level + 1) t)\r
- | Parser_andrea.App (t1, t2) ->\r
- if level = 0 then mk_app (aux level t1) (aux level t2)\r
- else A(aux level t1, aux level t2)\r
- | Parser_andrea.Var v -> V v in\r
- let (tms, free) = Parser_andrea.parse_many strs in\r
- (List.map (aux 0) tms, free)\r
-;;\r
-\r
-let problem_of div conv =\r
- print_hline ();\r
- let [@warning "-8"] [div; conv], var_names = parse ([div; conv]) in\r
- let varno = List.length var_names in\r
- let p = {orig_freshno=varno; freshno=1+varno; div; conv; sigma=[]; stepped=[]; phase=`One} in\r
- (* initial sanity check *)\r
- sanity p\r
-;;\r
-\r
-let exec div conv cmds =\r
- let p = problem_of div conv in\r
- try\r
- problem_fail (List.fold_left (|>) p cmds) "Problem not completed"\r
- with\r
- | Done _ -> ()\r
-;;\r
\r
let rec auto p =\r
let hd_var, n_args = get_inert p.div in\r
auto p\r
;;\r
\r
-let interactive div conv cmds =\r
+let problem_of (label, div, convs, ps, var_names) =\r
+ print_hline ();\r
+ let rec aux = function\r
+ | `Lam(_, t) -> L (aux t)\r
+ | `I ((v,_), args) -> Listx.fold_left (fun x y -> mk_app x (aux y)) (V v) args\r
+ | `Var(v,_) -> V v\r
+ | `N _ | `Match _ -> assert false in\r
+ assert (List.length ps = 0);\r
+ let convs = List.rev convs in\r
+ let conv = List.fold_left (fun x y -> mk_app x (aux (y :> Num.nf))) (V (List.length var_names)) convs in\r
+ let var_names = "@" :: var_names in\r
+ let div = match div with\r
+ | Some div -> aux (div :> Num.nf)\r
+ | None -> assert false in\r
+ let varno = List.length var_names in\r
+ let p = {orig_freshno=varno; freshno=1+varno; div; conv; sigma=[]; stepped=[]; phase=`One} in\r
+ (* initial sanity check *)\r
+ sanity p\r
+;;\r
+\r
+let solve p =\r
+ if eta_subterm p.div p.conv\r
+ then print_endline "!!! div is subterm of conv. Problem was not run !!!"\r
+ else check p (auto p)\r
+;;\r
+\r
+Problems.main (solve ++ problem_of);\r
+\r
+(* Example usage of interactive: *)\r
+\r
+(* let interactive div conv cmds =\r
let p = problem_of div conv in\r
try (\r
let p = List.fold_left (|>) p cmds in\r
| Done _ -> print_endline "Done! Commands history: "; List.iter print_endline (List.rev cmds)\r
in f p []\r
) with Done _ -> ()\r
-;;\r
-\r
-let rec conv_join = function\r
- | [] -> "@"\r
- | x::xs -> conv_join xs ^ " ("^ x ^")"\r
-;;\r
-\r
-let auto' a b =\r
- let p = problem_of a (conv_join b) in\r
- let sigma = auto p in\r
- check p sigma\r
-;;\r
-\r
-(* Example usage of exec, interactive:\r
-\r
-exec\r
- "x x"\r
- (conv_join["x y"; "y y"; "y x"])\r
- [ step 0 1; eat ]\r
-;;\r
+;; *)\r
\r
-interactive "x y"\r
+(* interactive "x y"\r
"@ (x x) (y x) (y z)" [step 0 1; step 0 2; eat]\r
-;;\r
-\r
-*)\r
-\r
-auto' "x x" ["x y"; "y y"; "y x"] ;;\r
-auto' "x y" ["x (_. x)"; "y z"; "y x"] ;;\r
-auto' "a (x. x b) (x. x c)" ["a (x. b b) @"; "a @ c"; "a (x. x x) a"; "a (a a a) (a c c)"] ;;\r
-\r
-auto' "x (y. x y y)" ["x (y. x y x)"] ;;\r
-\r
-auto' "x a a a a" [\r
- "x b a a a";\r
- "x a b a a";\r
- "x a a b a";\r
- "x a a a b";\r
-] ;;\r
-\r
-(* Controesempio ad usare un conto dei lambda che non considere le permutazioni *)\r
-auto' "x a a a a (x (x. x x) @ @ (_._.x. x x) x) b b b" [\r
- "x a a a a (_. a) b b b";\r
- "x a a a a (_. _. _. _. x. y. x y)";\r
-] ;;\r
-\r
-\r
-print_hline();\r
-print_endline "ALL DONE. "\r
-\r
-let solve div convs =\r
- let p = problem_of div (conv_join convs) in\r
- if eta_subterm p.div p.conv\r
- then print_endline "!!! div is subterm of conv. Problem was not run !!!"\r
- else check p (auto p)\r
-;;\r
+;; *)\r
projects / fireball-separation.git / blobdiff