revert matcher.c and matcher_parse_lex.l to previous revision