#943028 by Dave Reid: Fixed the 'date' token type is ambiguous by adding a 'current-date' token type.