Updated lexer from DScanner