Adding support for catch

Adding support for reserved keyword catch. Added some tests, and update
the test harness.