Parser working correctly

Previouse versions did not parse every expression.