remove dependence on MATCHnomatch == 0
Merge pull request #2873 from WaterBright/match-fix

remove dependence on MATCHnomatch == 0

Conflicts:
	src/expression.c