fixed ast generation for and/or