Move normal quantity func macro into Jison parser