Fixing scanner and parser to return proper tokens