Update grammar spec to include % and ^ operators