token_spec
clean up line-counting in Scanner
scanner_spec variable name changes