Removed tokens, refactored, fixed semicolon bug

Merged the tokens tokenOperator, tokenDelimiter, and tokenSemicolon
into tokenOpOrDelim to match the spec. The lexer is now correct
enough to start writing a parser.