add support for match statement (#630)

2 files changed