1 s/r conflict now

I delete the three explicitly defined built-in method parse, change
some small notations, change the definition of track type from {} to
[], merge some reduce productions so that conflicts are eliminated
0 conflicts!

We changed the COMMA in bar definition2 into SEMI. Now no conflicts
Merge pull request #1 from morrisyoung/getong1123solving-r/r-s/r-conflicts

Getong1123solving r/r s/r conflicts