lex.cpp changed to tokenize according to new grammar