1995-12-15 02:18:29 -08:00
|
|
|
(***********************************************************************)
|
|
|
|
(* *)
|
1996-04-30 07:53:58 -07:00
|
|
|
(* Objective Caml *)
|
1995-12-15 02:18:29 -08:00
|
|
|
(* *)
|
|
|
|
(* Xavier Leroy, projet Cristal, INRIA Rocquencourt *)
|
|
|
|
(* *)
|
1996-04-30 07:53:58 -07:00
|
|
|
(* Copyright 1996 Institut National de Recherche en Informatique et *)
|
1999-11-17 10:59:06 -08:00
|
|
|
(* en Automatique. All rights reserved. This file is distributed *)
|
|
|
|
(* under the terms of the Q Public License version 1.0. *)
|
1995-12-15 02:18:29 -08:00
|
|
|
(* *)
|
|
|
|
(***********************************************************************)
|
|
|
|
|
|
|
|
(* $Id$ *)
|
|
|
|
|
|
|
|
(* Elimination of useless Llet(Alias) bindings.
|
|
|
|
Also transform let-bound references into variables. *)
|
|
|
|
|
|
|
|
open Asttypes
|
|
|
|
open Lambda
|
|
|
|
|
|
|
|
(* To transform let-bound references into variables *)
|
|
|
|
|
|
|
|
exception Real_reference
|
|
|
|
|
|
|
|
let rec eliminate_ref id = function
|
|
|
|
Lvar v as lam ->
|
|
|
|
if Ident.same v id then raise Real_reference else lam
|
|
|
|
| Lconst cst as lam -> lam
|
|
|
|
| Lapply(e1, el) ->
|
|
|
|
Lapply(eliminate_ref id e1, List.map (eliminate_ref id) el)
|
1996-10-22 06:36:59 -07:00
|
|
|
| Lfunction(kind, params, body) as lam ->
|
1995-12-15 02:18:29 -08:00
|
|
|
if IdentSet.mem id (free_variables lam)
|
|
|
|
then raise Real_reference
|
|
|
|
else lam
|
|
|
|
| Llet(str, v, e1, e2) ->
|
|
|
|
Llet(str, v, eliminate_ref id e1, eliminate_ref id e2)
|
|
|
|
| Lletrec(idel, e2) ->
|
|
|
|
Lletrec(List.map (fun (v, e) -> (v, eliminate_ref id e)) idel,
|
|
|
|
eliminate_ref id e2)
|
|
|
|
| Lprim(Pfield 0, [Lvar v]) when Ident.same v id ->
|
|
|
|
Lvar id
|
|
|
|
| Lprim(Psetfield(0, _), [Lvar v; e]) when Ident.same v id ->
|
|
|
|
Lassign(id, eliminate_ref id e)
|
|
|
|
| Lprim(Poffsetref delta, [Lvar v]) when Ident.same v id ->
|
|
|
|
Lassign(id, Lprim(Poffsetint delta, [Lvar id]))
|
|
|
|
| Lprim(p, el) ->
|
|
|
|
Lprim(p, List.map (eliminate_ref id) el)
|
1996-04-04 07:55:29 -08:00
|
|
|
| Lswitch(e, sw) ->
|
1995-12-15 02:18:29 -08:00
|
|
|
Lswitch(eliminate_ref id e,
|
1996-04-04 07:55:29 -08:00
|
|
|
{sw_numconsts = sw.sw_numconsts;
|
|
|
|
sw_consts =
|
|
|
|
List.map (fun (n, e) -> (n, eliminate_ref id e)) sw.sw_consts;
|
|
|
|
sw_numblocks = sw.sw_numblocks;
|
|
|
|
sw_blocks =
|
|
|
|
List.map (fun (n, e) -> (n, eliminate_ref id e)) sw.sw_blocks;
|
2001-02-19 12:27:52 -08:00
|
|
|
sw_failaction = match sw.sw_failaction with
|
|
|
|
| None -> None
|
|
|
|
| Some l -> Some (eliminate_ref id l)})
|
|
|
|
| Lstaticraise (i,args) ->
|
|
|
|
Lstaticraise (i,List.map (eliminate_ref id) args)
|
2000-08-11 12:58:52 -07:00
|
|
|
| Lstaticcatch(e1, i, e2) ->
|
|
|
|
Lstaticcatch(eliminate_ref id e1, i, eliminate_ref id e2)
|
1995-12-15 02:18:29 -08:00
|
|
|
| Ltrywith(e1, v, e2) ->
|
|
|
|
Ltrywith(eliminate_ref id e1, v, eliminate_ref id e2)
|
|
|
|
| Lifthenelse(e1, e2, e3) ->
|
|
|
|
Lifthenelse(eliminate_ref id e1,
|
|
|
|
eliminate_ref id e2,
|
|
|
|
eliminate_ref id e3)
|
|
|
|
| Lsequence(e1, e2) ->
|
|
|
|
Lsequence(eliminate_ref id e1, eliminate_ref id e2)
|
|
|
|
| Lwhile(e1, e2) ->
|
|
|
|
Lwhile(eliminate_ref id e1, eliminate_ref id e2)
|
|
|
|
| Lfor(v, e1, e2, dir, e3) ->
|
|
|
|
Lfor(v, eliminate_ref id e1, eliminate_ref id e2,
|
|
|
|
dir, eliminate_ref id e3)
|
|
|
|
| Lassign(v, e) ->
|
|
|
|
Lassign(v, eliminate_ref id e)
|
2004-05-26 04:10:52 -07:00
|
|
|
| Lsend(k, m, o, el) ->
|
|
|
|
Lsend(k, eliminate_ref id m, eliminate_ref id o,
|
1996-04-22 04:15:41 -07:00
|
|
|
List.map (eliminate_ref id) el)
|
1996-11-29 10:36:42 -08:00
|
|
|
| Levent(l, ev) ->
|
|
|
|
Levent(eliminate_ref id l, ev)
|
1998-06-24 12:22:26 -07:00
|
|
|
| Lifused(v, e) ->
|
|
|
|
Lifused(v, eliminate_ref id e)
|
1995-12-15 02:18:29 -08:00
|
|
|
|
2001-04-23 05:46:21 -07:00
|
|
|
(* Simplification of exits *)
|
|
|
|
|
|
|
|
let simplify_exits lam =
|
|
|
|
|
|
|
|
(* Count occurrences of (exit n ...) statements *)
|
|
|
|
let exits = Hashtbl.create 17 in
|
|
|
|
|
|
|
|
let count_exit i =
|
|
|
|
try
|
|
|
|
!(Hashtbl.find exits i)
|
|
|
|
with
|
|
|
|
| Not_found -> 0
|
|
|
|
|
|
|
|
and incr_exit i =
|
|
|
|
try
|
|
|
|
incr (Hashtbl.find exits i)
|
|
|
|
with
|
|
|
|
| Not_found -> Hashtbl.add exits i (ref 1) in
|
|
|
|
|
|
|
|
let rec count = function
|
|
|
|
| (Lvar _| Lconst _) -> ()
|
|
|
|
| Lapply(l1, ll) -> count l1; List.iter count ll
|
|
|
|
| Lfunction(kind, params, l) -> count l
|
|
|
|
| Llet(str, v, l1, l2) ->
|
|
|
|
count l2; count l1
|
|
|
|
| Lletrec(bindings, body) ->
|
|
|
|
List.iter (fun (v, l) -> count l) bindings;
|
|
|
|
count body
|
|
|
|
| Lprim(p, ll) -> List.iter count ll
|
|
|
|
| Lswitch(l, sw) ->
|
|
|
|
count_default sw ;
|
|
|
|
count l;
|
|
|
|
List.iter (fun (_, l) -> count l) sw.sw_consts;
|
|
|
|
List.iter (fun (_, l) -> count l) sw.sw_blocks
|
|
|
|
| Lstaticraise (i,ls) -> incr_exit i ; List.iter count ls
|
|
|
|
| Lstaticcatch (l1,(i,[]),Lstaticraise (j,[])) ->
|
|
|
|
(* i will be replaced by j in l1, so each occurence of i in l1
|
|
|
|
increases j's ref count *)
|
|
|
|
count l1 ;
|
|
|
|
let ic = count_exit i in
|
|
|
|
begin try
|
|
|
|
let r = Hashtbl.find exits j in r := !r + ic
|
|
|
|
with
|
|
|
|
| Not_found ->
|
|
|
|
Hashtbl.add exits j (ref ic)
|
|
|
|
end
|
|
|
|
| Lstaticcatch(l1, (i,_), l2) ->
|
|
|
|
count l1;
|
|
|
|
(* If l1 does not contain (exit i),
|
|
|
|
l2 will be removed, so don't count its exits *)
|
|
|
|
if count_exit i > 0 then
|
|
|
|
count l2
|
|
|
|
| Ltrywith(l1, v, l2) -> count l1; count l2
|
|
|
|
| Lifthenelse(l1, l2, l3) -> count l1; count l2; count l3
|
|
|
|
| Lsequence(l1, l2) -> count l1; count l2
|
|
|
|
| Lwhile(l1, l2) -> count l1; count l2
|
|
|
|
| Lfor(_, l1, l2, dir, l3) -> count l1; count l2; count l3
|
|
|
|
| Lassign(v, l) ->
|
|
|
|
(* Lalias-bound variables are never assigned, so don't increase
|
|
|
|
v's refcount *)
|
|
|
|
count l
|
2004-05-26 04:10:52 -07:00
|
|
|
| Lsend(k, m, o, ll) -> List.iter count (m::o::ll)
|
2001-04-23 05:46:21 -07:00
|
|
|
| Levent(l, _) -> count l
|
|
|
|
| Lifused(v, l) -> count l
|
|
|
|
|
|
|
|
and count_default sw = match sw.sw_failaction with
|
|
|
|
| None -> ()
|
|
|
|
| Some al ->
|
|
|
|
let nconsts = List.length sw.sw_consts
|
|
|
|
and nblocks = List.length sw.sw_blocks in
|
|
|
|
if
|
|
|
|
nconsts < sw.sw_numconsts && nblocks < sw.sw_numblocks
|
|
|
|
then begin (* default action will occur twice in native code *)
|
|
|
|
count al ; count al
|
|
|
|
end else begin (* default action will occur once *)
|
|
|
|
assert (nconsts < sw.sw_numconsts || nblocks < sw.sw_numblocks) ;
|
|
|
|
count al
|
|
|
|
end
|
|
|
|
in
|
|
|
|
count lam;
|
|
|
|
|
|
|
|
(*
|
|
|
|
Second pass simplify ``catch body with (i ...) handler''
|
|
|
|
- if (exit i ...) does not occur in body, suppress catch
|
|
|
|
- if (exit i ...) occurs exactly once in body,
|
|
|
|
substitute it with handler
|
|
|
|
- If handler is a single variable, replace (exit i ..) with it
|
|
|
|
Note:
|
|
|
|
In ``catch body with (i x1 .. xn) handler''
|
|
|
|
Substituted expression is
|
|
|
|
let y1 = x1 and ... yn = xn in
|
|
|
|
handler[x1 <- y1 ; ... ; xn <- yn]
|
|
|
|
For the sake of preserving the uniqueness of bound variables.
|
|
|
|
(No alpha conversion of ``handler'' is presently needed, since
|
|
|
|
substitution of several ``(exit i ...)''
|
|
|
|
occurs only when ``handler'' is a variable.)
|
|
|
|
*)
|
|
|
|
|
|
|
|
let subst = Hashtbl.create 17 in
|
|
|
|
|
|
|
|
let rec simplif = function
|
|
|
|
| (Lvar _|Lconst _) as l -> l
|
|
|
|
| Lapply(l1, ll) -> Lapply(simplif l1, List.map simplif ll)
|
|
|
|
| Lfunction(kind, params, l) -> Lfunction(kind, params, simplif l)
|
|
|
|
| Llet(kind, v, l1, l2) -> Llet(kind, v, simplif l1, simplif l2)
|
|
|
|
| Lletrec(bindings, body) ->
|
|
|
|
Lletrec(List.map (fun (v, l) -> (v, simplif l)) bindings, simplif body)
|
|
|
|
| Lprim(p, ll) -> Lprim(p, List.map simplif ll)
|
|
|
|
| Lswitch(l, sw) ->
|
|
|
|
let new_l = simplif l
|
|
|
|
and new_consts = List.map (fun (n, e) -> (n, simplif e)) sw.sw_consts
|
|
|
|
and new_blocks = List.map (fun (n, e) -> (n, simplif e)) sw.sw_blocks
|
|
|
|
and new_fail = match sw.sw_failaction with
|
|
|
|
| None -> None
|
|
|
|
| Some l -> Some (simplif l) in
|
|
|
|
Lswitch
|
|
|
|
(new_l,
|
|
|
|
{sw with sw_consts = new_consts ; sw_blocks = new_blocks;
|
|
|
|
sw_failaction = new_fail})
|
|
|
|
| Lstaticraise (i,[]) as l ->
|
|
|
|
begin try
|
|
|
|
let _,handler = Hashtbl.find subst i in
|
|
|
|
handler
|
|
|
|
with
|
|
|
|
| Not_found -> l
|
|
|
|
end
|
|
|
|
| Lstaticraise (i,ls) as l ->
|
|
|
|
let ls = List.map simplif ls in
|
|
|
|
begin try
|
|
|
|
let xs,handler = Hashtbl.find subst i in
|
|
|
|
let ys = List.map Ident.rename xs in
|
|
|
|
let env =
|
|
|
|
List.fold_right2
|
|
|
|
(fun x y t -> Ident.add x (Lvar y) t)
|
|
|
|
xs ys Ident.empty in
|
|
|
|
List.fold_right2
|
|
|
|
(fun y l r -> Llet (Alias, y, l, r))
|
|
|
|
ys ls (Lambda.subst_lambda env handler)
|
|
|
|
with
|
|
|
|
| Not_found -> l
|
|
|
|
end
|
|
|
|
| Lstaticcatch (l1,(i,[]),(Lstaticraise (j,[]) as l2)) ->
|
|
|
|
Hashtbl.add subst i ([],simplif l2) ;
|
|
|
|
simplif l1
|
|
|
|
| Lstaticcatch (l1,(i,xs), (Lvar _ as l2)) ->
|
|
|
|
begin match count_exit i with
|
|
|
|
| 0 -> simplif l1
|
|
|
|
| _ ->
|
|
|
|
Hashtbl.add subst i (xs,l2) ;
|
|
|
|
simplif l1
|
|
|
|
end
|
|
|
|
| Lstaticcatch (l1,(i,xs),l2) ->
|
|
|
|
begin match count_exit i with
|
|
|
|
| 0 -> simplif l1
|
|
|
|
| 1 ->
|
|
|
|
Hashtbl.add subst i (xs,simplif l2) ;
|
|
|
|
simplif l1
|
|
|
|
| _ ->
|
|
|
|
Lstaticcatch (simplif l1, (i,xs), simplif l2)
|
|
|
|
end
|
|
|
|
| Ltrywith(l1, v, l2) -> Ltrywith(simplif l1, v, simplif l2)
|
|
|
|
| Lifthenelse(l1, l2, l3) -> Lifthenelse(simplif l1, simplif l2, simplif l3)
|
|
|
|
| Lsequence(l1, l2) -> Lsequence(simplif l1, simplif l2)
|
|
|
|
| Lwhile(l1, l2) -> Lwhile(simplif l1, simplif l2)
|
|
|
|
| Lfor(v, l1, l2, dir, l3) ->
|
|
|
|
Lfor(v, simplif l1, simplif l2, dir, simplif l3)
|
|
|
|
| Lassign(v, l) -> Lassign(v, simplif l)
|
2004-05-26 04:10:52 -07:00
|
|
|
| Lsend(k, m, o, ll) -> Lsend(k, simplif m, simplif o, List.map simplif ll)
|
2001-04-23 05:46:21 -07:00
|
|
|
| Levent(l, ev) -> Levent(simplif l, ev)
|
|
|
|
| Lifused(v, l) -> Lifused (v,simplif l)
|
|
|
|
in
|
|
|
|
simplif lam
|
2000-10-02 07:18:05 -07:00
|
|
|
|
1995-12-15 02:18:29 -08:00
|
|
|
(* Simplification of lets *)
|
|
|
|
|
2001-04-23 05:46:21 -07:00
|
|
|
let simplify_lets lam =
|
2000-10-02 07:18:05 -07:00
|
|
|
|
1995-12-15 02:18:29 -08:00
|
|
|
(* First pass: count the occurrences of all identifiers *)
|
1996-04-22 04:15:41 -07:00
|
|
|
let occ = Hashtbl.create 83 in
|
1995-12-15 02:18:29 -08:00
|
|
|
let count_var v =
|
|
|
|
try
|
|
|
|
!(Hashtbl.find occ v)
|
|
|
|
with Not_found ->
|
2000-10-02 07:18:05 -07:00
|
|
|
0
|
|
|
|
and incr_var v =
|
|
|
|
try
|
|
|
|
incr(Hashtbl.find occ v)
|
|
|
|
with Not_found ->
|
|
|
|
Hashtbl.add occ v (ref 1) in
|
|
|
|
|
1995-12-15 02:18:29 -08:00
|
|
|
let rec count = function
|
2000-10-02 07:18:05 -07:00
|
|
|
| Lvar v -> incr_var v
|
1995-12-15 02:18:29 -08:00
|
|
|
| Lconst cst -> ()
|
|
|
|
| Lapply(l1, ll) -> count l1; List.iter count ll
|
1996-10-22 06:36:59 -07:00
|
|
|
| Lfunction(kind, params, l) -> count l
|
1999-11-20 15:40:21 -08:00
|
|
|
| Llet(str, v, Lvar w, l2) when not !Clflags.debug ->
|
1995-12-15 02:18:29 -08:00
|
|
|
(* v will be replaced by w in l2, so each occurrence of v in l2
|
|
|
|
increases w's refcount *)
|
|
|
|
count l2;
|
|
|
|
let vc = count_var v in
|
|
|
|
begin try
|
|
|
|
let r = Hashtbl.find occ w in r := !r + vc
|
|
|
|
with Not_found ->
|
|
|
|
Hashtbl.add occ w (ref vc)
|
|
|
|
end
|
|
|
|
| Llet(str, v, l1, l2) ->
|
|
|
|
count l2;
|
|
|
|
(* If v is unused, l1 will be removed, so don't count its variables *)
|
2000-12-28 05:07:42 -08:00
|
|
|
if str = Strict || count_var v > 0 then count l1
|
1995-12-15 02:18:29 -08:00
|
|
|
| Lletrec(bindings, body) ->
|
|
|
|
List.iter (fun (v, l) -> count l) bindings;
|
|
|
|
count body
|
|
|
|
| Lprim(p, ll) -> List.iter count ll
|
1996-04-04 07:55:29 -08:00
|
|
|
| Lswitch(l, sw) ->
|
2001-02-19 12:27:52 -08:00
|
|
|
count_default sw ;
|
1995-12-15 02:18:29 -08:00
|
|
|
count l;
|
2001-02-19 12:27:52 -08:00
|
|
|
List.iter (fun (_, l) -> count l) sw.sw_consts;
|
|
|
|
List.iter (fun (_, l) -> count l) sw.sw_blocks
|
2001-04-23 05:46:21 -07:00
|
|
|
| Lstaticraise (i,ls) -> List.iter count ls
|
2000-10-02 07:18:05 -07:00
|
|
|
| Lstaticcatch(l1, (i,_), l2) ->
|
2001-04-23 05:46:21 -07:00
|
|
|
count l1; count l2
|
1995-12-15 02:18:29 -08:00
|
|
|
| Ltrywith(l1, v, l2) -> count l1; count l2
|
|
|
|
| Lifthenelse(l1, l2, l3) -> count l1; count l2; count l3
|
|
|
|
| Lsequence(l1, l2) -> count l1; count l2
|
|
|
|
| Lwhile(l1, l2) -> count l1; count l2
|
2000-10-02 07:18:05 -07:00
|
|
|
| Lfor(_, l1, l2, dir, l3) -> count l1; count l2; count l3
|
1995-12-15 02:18:29 -08:00
|
|
|
| Lassign(v, l) ->
|
|
|
|
(* Lalias-bound variables are never assigned, so don't increase
|
|
|
|
v's refcount *)
|
|
|
|
count l
|
2004-05-26 04:10:52 -07:00
|
|
|
| Lsend(_, m, o, ll) -> List.iter count (m::o::ll)
|
2000-10-02 07:18:05 -07:00
|
|
|
| Levent(l, _) -> count l
|
1998-06-24 12:22:26 -07:00
|
|
|
| Lifused(v, l) ->
|
|
|
|
if count_var v > 0 then count l
|
2001-02-19 12:27:52 -08:00
|
|
|
|
|
|
|
and count_default sw = match sw.sw_failaction with
|
|
|
|
| None -> ()
|
|
|
|
| Some al ->
|
|
|
|
let nconsts = List.length sw.sw_consts
|
|
|
|
and nblocks = List.length sw.sw_blocks in
|
|
|
|
if
|
|
|
|
nconsts < sw.sw_numconsts && nblocks < sw.sw_numblocks
|
|
|
|
then begin (* default action will occur twice in native code *)
|
|
|
|
count al ; count al
|
|
|
|
end else begin (* default action will occur once *)
|
|
|
|
assert (nconsts < sw.sw_numconsts || nblocks < sw.sw_numblocks) ;
|
|
|
|
count al
|
|
|
|
end
|
1995-12-15 02:18:29 -08:00
|
|
|
in
|
|
|
|
count lam;
|
|
|
|
(* Second pass: remove Lalias bindings of unused variables,
|
|
|
|
and substitute the bindings of variables used exactly once. *)
|
2001-02-19 12:27:52 -08:00
|
|
|
|
2001-04-23 05:46:21 -07:00
|
|
|
let subst = Hashtbl.create 83 in
|
2000-10-02 07:18:05 -07:00
|
|
|
|
1995-12-15 02:18:29 -08:00
|
|
|
let rec simplif = function
|
|
|
|
Lvar v as l ->
|
|
|
|
begin try
|
|
|
|
Hashtbl.find subst v
|
|
|
|
with Not_found ->
|
|
|
|
l
|
|
|
|
end
|
|
|
|
| Lconst cst as l -> l
|
|
|
|
| Lapply(l1, ll) -> Lapply(simplif l1, List.map simplif ll)
|
1996-10-22 06:36:59 -07:00
|
|
|
| Lfunction(kind, params, l) -> Lfunction(kind, params, simplif l)
|
1999-11-07 15:56:38 -08:00
|
|
|
| Llet(str, v, Lvar w, l2) when not !Clflags.debug ->
|
1995-12-15 02:18:29 -08:00
|
|
|
Hashtbl.add subst v (simplif (Lvar w));
|
|
|
|
simplif l2
|
1997-03-17 05:00:40 -08:00
|
|
|
| Llet(Strict, v, Lprim(Pmakeblock(0, Mutable), [linit]), lbody)
|
|
|
|
when not !Clflags.debug ->
|
1995-12-15 02:18:29 -08:00
|
|
|
let slinit = simplif linit in
|
|
|
|
let slbody = simplif lbody in
|
|
|
|
begin try
|
1998-04-30 05:12:28 -07:00
|
|
|
Llet(Variable, v, slinit, eliminate_ref v slbody)
|
1995-12-15 02:18:29 -08:00
|
|
|
with Real_reference ->
|
|
|
|
Llet(Strict, v, Lprim(Pmakeblock(0, Mutable), [slinit]), slbody)
|
|
|
|
end
|
1998-08-17 02:00:23 -07:00
|
|
|
| Llet(Alias, v, l1, l2) ->
|
1995-12-15 02:18:29 -08:00
|
|
|
begin match count_var v with
|
|
|
|
0 -> simplif l2
|
1998-08-17 02:00:23 -07:00
|
|
|
| 1 when not !Clflags.debug ->
|
|
|
|
Hashtbl.add subst v (simplif l1); simplif l2
|
1995-12-15 02:18:29 -08:00
|
|
|
| n -> Llet(Alias, v, simplif l1, simplif l2)
|
|
|
|
end
|
1996-04-22 04:15:41 -07:00
|
|
|
| Llet(StrictOpt, v, l1, l2) ->
|
|
|
|
begin match count_var v with
|
|
|
|
0 -> simplif l2
|
|
|
|
| n -> Llet(Alias, v, simplif l1, simplif l2)
|
|
|
|
end
|
1998-04-30 05:12:28 -07:00
|
|
|
| Llet(kind, v, l1, l2) -> Llet(kind, v, simplif l1, simplif l2)
|
1995-12-15 02:18:29 -08:00
|
|
|
| Lletrec(bindings, body) ->
|
|
|
|
Lletrec(List.map (fun (v, l) -> (v, simplif l)) bindings, simplif body)
|
|
|
|
| Lprim(p, ll) -> Lprim(p, List.map simplif ll)
|
1996-04-04 07:55:29 -08:00
|
|
|
| Lswitch(l, sw) ->
|
2000-08-11 12:58:52 -07:00
|
|
|
let new_l = simplif l
|
|
|
|
and new_consts = List.map (fun (n, e) -> (n, simplif e)) sw.sw_consts
|
2001-02-19 12:27:52 -08:00
|
|
|
and new_blocks = List.map (fun (n, e) -> (n, simplif e)) sw.sw_blocks
|
|
|
|
and new_fail = match sw.sw_failaction with
|
|
|
|
| None -> None
|
|
|
|
| Some l -> Some (simplif l) in
|
2000-08-11 12:58:52 -07:00
|
|
|
Lswitch
|
2001-02-19 12:27:52 -08:00
|
|
|
(new_l,
|
|
|
|
{sw with sw_consts = new_consts ; sw_blocks = new_blocks;
|
|
|
|
sw_failaction = new_fail})
|
2000-10-02 07:18:05 -07:00
|
|
|
| Lstaticraise (i,ls) ->
|
2001-02-19 12:27:52 -08:00
|
|
|
Lstaticraise (i, List.map simplif ls)
|
2000-10-02 07:18:05 -07:00
|
|
|
| Lstaticcatch(l1, (i,args), l2) ->
|
2001-04-23 05:46:21 -07:00
|
|
|
Lstaticcatch (simplif l1, (i,args), simplif l2)
|
1995-12-15 02:18:29 -08:00
|
|
|
| Ltrywith(l1, v, l2) -> Ltrywith(simplif l1, v, simplif l2)
|
|
|
|
| Lifthenelse(l1, l2, l3) -> Lifthenelse(simplif l1, simplif l2, simplif l3)
|
1998-06-24 12:22:26 -07:00
|
|
|
| Lsequence(Lifused(v, l1), l2) ->
|
|
|
|
if count_var v > 0
|
|
|
|
then Lsequence(simplif l1, simplif l2)
|
|
|
|
else simplif l2
|
1995-12-15 02:18:29 -08:00
|
|
|
| Lsequence(l1, l2) -> Lsequence(simplif l1, simplif l2)
|
|
|
|
| Lwhile(l1, l2) -> Lwhile(simplif l1, simplif l2)
|
|
|
|
| Lfor(v, l1, l2, dir, l3) ->
|
|
|
|
Lfor(v, simplif l1, simplif l2, dir, simplif l3)
|
|
|
|
| Lassign(v, l) -> Lassign(v, simplif l)
|
2004-05-26 04:10:52 -07:00
|
|
|
| Lsend(k, m, o, ll) -> Lsend(k, simplif m, simplif o, List.map simplif ll)
|
1996-11-29 10:36:42 -08:00
|
|
|
| Levent(l, ev) -> Levent(simplif l, ev)
|
1998-06-24 12:22:26 -07:00
|
|
|
| Lifused(v, l) ->
|
1998-08-31 12:41:24 -07:00
|
|
|
if count_var v > 0 then simplif l else lambda_unit
|
1995-12-15 02:18:29 -08:00
|
|
|
in
|
|
|
|
simplif lam
|
2001-04-23 05:46:21 -07:00
|
|
|
|
|
|
|
let simplify_lambda lam = simplify_lets (simplify_exits lam)
|