separate the parser from Calculate to Parse, and add all operator rules.