support short circuit conditional expression.Fixes #583