rewrite add_non_locals_to_func, deal with catch declarations (closes #https://github.com/frabbit/hx2python/issues/25)