condense funct_name rule in parser
Merge pull request #27 from emilyhsia/master

condense funct_name rule in parser