Added missing evaluation rules for expressions.

Added also the corresponding syntax and fixed shift/reduces conflicts.