reorganize comparisons
use makeBranchIfFalse in makeWhile
use makeBranchIfTrue in makeDo