diff --git a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex index 8aae15ea0..a8a360f3f 100644 --- a/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex +++ b/src/DataStreamSuite/DataStreamExpressions/DataStreamExpressionTokens.lex @@ -9,7 +9,15 @@ Letter [a-zA-Z] BooleanConstant 'true'|'false' CSStringConstant \"([^\"\\]*|\\.)*\" -DateTimeConstant ([1-9]|'10'|'11'|'12')\/([1-9]|([1-2][0-9])|'30'|'31')\/[0-9][0-9][0-9]* +YearInt [0-9]{4} +MonthInt [0-9]{1,2} +DayInt [0-9]{1,2} +/** + * DateTimeConstant supports American (mm/dd/yyyy) and European (yyyy/mm/dd) + * formats. Month and day can be 1 or 2 digits. It does not validate that the + * numbers represent an actual date. + */ +DateTimeConstant ({MonthInt}\/{DayInt}\/{YearInt}|{YearInt}\/{MonthInt}\/{DayInt}) IntegerConstant -?[0-9]+ NullConstant 'null' RealConstant -?[0-9]+\.[0-9]+