Refactor expression rules in grammar
Refactor shortcircuit logic expression analysis