Added comment matching to formatted SQL parser