Fix tokenizer bug with error for multi-line input (GitHub #2515)
Add tests for TokenError in tokenizer
Merge pull request #2516 from lidavidm/issue_2515_github

Fix tokenizer bug with error for multi-line input (GitHub #2515)