*** 377,381 **** --- 377,385 ---- macro(ExtractS) macro(ExtractI) macro(ExtractL) macro(ExtractF) macro(ExtractD) + macro(Digit) + macro(LowerCase) + macro(UpperCase) + macro(Whitespace)