updating function
bugs fixed at IMatchFunc, ITokenFunc