Revert "Commit on wrong branch."

This reverts commit 978af49.
BinaryAnalysisPlatform · Aug 8, 2018 · 001aecb · 001aecb
1 parent 978af49
commit 001aecb
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/bil.ott b/bil.ott
@@ -580,15 +580,27 @@ defns reduce_exp :: '' ::=
 
 
  delta |- e1 ~> e1'
- ------------------------------------------------------------------ :: ite_step
- delta |- if e1 then e2 else e3 ~> if e1' then e2 else e3
+ ------------------------------------------------------------------ :: ite_step_cond
+ delta |- if e1 then v2 else v3 ~> if e1' then v2 else v3
+
+ delta |- e2 ~> e2'
+ ------------------------------------------------------------------ :: ite_step_then
+ delta |- if e1 then e2 else v3 ~> if e1 then e2' else v3
+
+ delta |- e3 ~> e3'
+ ------------------------------------------------------------------ :: ite_step_else
+ delta |- if e1 then e2 else e3 ~> if e1 then e2 else e3'
 
  ----------------------------------------------- :: ite_true
- delta |- if true then e2 else e3 ~> e2
+ delta |- if true then v2 else v3 ~> v2
 
 
  ------------------------------------------------ :: ite_false
- delta |- if false then e2 else e3 ~> e3
+ delta |- if false then v2 else v3 ~> v3
+
+ type(v2) = t'
+ ------------------------------------------------------------------ :: ite_unk
+ delta |- if unknown[str]:t then v2 else v3 ~> unknown[str]:t'
 
  delta |- e2 ~> e2'
  ------------------------------------------ :: bop_rhs