Added conditional expressions to the syntax and lexer