[Patch] Refractor Thompson matcher

[Tim Shen]

I found some other wired problems in that patch after committing.
Probably need more time to work on it, so now I revert it :(


-- 
Tim Shen