updated scanner.mll