Update parser2

deleted "-1" from parsing of last parameter of function (r,s,h,hill) on rows 312,357,393,421,468,514,551,580