Added saving of line number in scanner, added error output in parser