lexer changes for cup + skeleton with all non terminals