| ESkip => false
| ESet (_, e) => freeIn x e
- | EGet (x', _, b') => x <> x' andalso freeIn x b'
+ | EGet (x', _, _, b') => x <> x' andalso freeIn x b'
| ESeq es => List.exists (freeIn x) es
| ELocal (e1, e2) => freeIn x e1 orelse freeIn x e2
| EWith (e1, e2) => freeIn x e1 orelse freeIn x e2
| EALam (x', _, b') => x <> x' andalso freeIn x b'
+ | EIf (e1, e2, e3) => freeIn x e1 orelse freeIn x e2 orelse freeIn x e3
+
local
val freshCount = ref 0
in
| ESkip => bAll
| ESet (v, b) => (ESet (v, subst x e b), loc)
- | EGet (x', v, b') =>
+ | EGet (x', topt, v, b') =>
if x = x' then
bAll
else if freeIn x' e then
let
val x'' = freshVar ()
in
- (EGet (x'', v, subst x e (subst x' (EVar x'', loc) b')), loc)
+ (EGet (x'', topt, v, subst x e (subst x' (EVar x'', loc) b')), loc)
end
else
- (EGet (x', v, subst x e b'), loc)
+ (EGet (x', topt, v, subst x e b'), loc)
| ESeq es => (ESeq (map (subst x e) es), loc)
| ELocal (b1, b2) => (ELocal (subst x e b1, subst x e b2), loc)
| EWith (b1, b2) => (EWith (subst x e b1, subst x e b2), loc)
else
(EALam (x', p, subst x e b'), loc)
+ | EIf (b1, b2, b3) => (EIf (subst x e b1, subst x e b2, subst x e b3), loc)
+
fun findPrim (e, _) =
case e of
EApp (f, x) =>
end
| EVar x =>
(case lookupEquation G x of
- NONE => eAll
- | SOME e => reduceExp G e)
+ NONE =>
+ (case function x of
+ NONE => eAll
+ | SOME f => case f [] of
+ NONE => eAll
+ | SOME e' => reduceExp G e')
+ | SOME (e, G') => reduceExp G' e)
| EApp (e1, e2) =>
let
val e1' = reduceExp G e1
| ESkip => eAll
| ESet (v, b) => (ESet (v, reduceExp G b), loc)
- | EGet (x, v, b) => (EGet (x, v, reduceExp G b), loc)
+ | EGet (x, topt, v, b) => (EGet (x, topt, v, reduceExp G b), loc)
| ESeq es => (ESeq (map (reduceExp G) es), loc)
| ELocal (e1, e2) => (ELocal (reduceExp G e1, reduceExp G e2), loc)
| EWith (e1, e2) =>
(EALam (x, p, reduceExp G' e), loc)
end
+ | EIf (e1, e2, e3) =>
+ let
+ val e1' = reduceExp G e1
+ fun e2' () = reduceExp G e2
+ fun e3' () = reduceExp G e3
+ in
+ case e1' of
+ (EVar "true", _) => e2' ()
+ | (EVar "false", _) => e3' ()
+ | _ => (EIf (e1', e2' (), e3' ()), loc)
+ end
+
end