parse using gcfg/scanner; improved error handling
2 files changed