Tune sorting of parses and add tests

Author: earljwagner

datetime/datetime.go

@@ -9,9 +9,7 @@ import (
 )
 
 var parseDateMode string
-var parseYear int
-var parseTimeZone *TimeZone
-var parseTimeZoneAbbrev string
+var parseDTTZ *DateTimeTZ
 
 // A DateTimeTZs represents a sequence of date and time ranges. It's the
 // expected result of parsing a string for datetimes.
@@ -138,15 +136,15 @@ func (dttz *DateTimeTZ) String() string {
 
 func NewDateTimeTZ(date *Date, time *Time, timeZone *TimeZone) *DateTimeTZ {
 	// fmt.Printf("NewDateTime(date: %#v, time: %#v, timeZone: %#v)\n", date, time, timeZone)
-	if timeZone == nil {
-		timeZone = parseTimeZone
+	if timeZone == nil && parseDTTZ != nil {
+		timeZone = parseDTTZ.TimeZone
 	}
 	return &DateTimeTZ{Date: date, Time: time, TimeZone: timeZone}
 }
 
 func NewDateTimeTZWithDate(date *Date, timeZone *TimeZone) *DateTimeTZ {
-	if timeZone == nil {
-		timeZone = parseTimeZone
+	if timeZone == nil && parseDTTZ != nil {
+		timeZone = parseDTTZ.TimeZone
 	}
 	return &DateTimeTZ{Date: date, TimeZone: timeZone}
 }
@@ -411,11 +409,11 @@ var ordinals = map[string]bool{
 
 func fixYear(yearAny any, year int) (int, bool) {
 	// fmt.Printf("fixYear(yearAny: %#v, year: %d), parseYear: %d\n", yearAny, year, parseYear)
-	if parseYear != 0 && year == -1 {
-		return parseYear, true
+	if parseDTTZ.Date != nil && parseDTTZ.Date.Year != 0 && year == -1 {
+		return parseDTTZ.Date.Year, true
 	}
-	if parseYear != 0 && year >= 0 && year <= 99 {
-		return 100*(parseYear/100) + year, true
+	if parseDTTZ.Date != nil && parseDTTZ.Date.Year != 0 && year >= 0 && year <= 99 {
+		return 100*(parseDTTZ.Date.Year/100) + year, true
 	}
 	if yearAny == nil {
 		return 0, true

datetime/parse.go

@@ -41,30 +41,36 @@ var timezoneTZ = timezone.New()
 var cache = map[string]*DateTimeTZRanges{}
 var cacheMutex sync.RWMutex
 
-func Parse(year int, dateMode string, timeZone *TimeZone, in string) (*DateTimeTZRanges, error) {
+func Parse(refDTTZ *DateTimeTZ, dateMode string, in string) (*DateTimeTZRanges, error) {
 	// fmt.Printf("datetime.Parse(year: %d, dateMode: %q, timeZone: %#v, in: %q)\n", year, dateMode, timeZone, in)
 	defer func() {
 		if err := recover(); err != nil {
 			slog.Warn("in Parse(), got a panic trying to extract", "in", in, "err", err)
 		}
 	}()
 
-	key := fmt.Sprintf("%d %q %#v %q", year, dateMode, timeZone, in)
+	key := fmt.Sprintf("%q %q %q", refDTTZ.String(), dateMode, in)
 	cacheMutex.RLock()
 	r, found := cache[key]
 	cacheMutex.RUnlock()
 	if found {
 		return r, nil
 	}
 
-	parseYear = year
+	parseDTTZ = refDTTZ
+	if parseDTTZ == nil {
+		// Set this so we don't get null pointer references for year and time zone.
+		parseDTTZ = &DateTimeTZ{}
+	}
+
+	// parseYear = year
 	// if parseYear == 0 {
 	// 	parseYear = time.Now().Year()
 	// }
-	debugf("parseYear: %d\n", parseYear)
+	debugf("parseDTTZ: %q\n", parseDTTZ.String())
 
 	if dateMode == "" {
-		if timeZone != nil && strings.HasPrefix(timeZone.Name, "America/") {
+		if refDTTZ != nil && refDTTZ.TimeZone != nil && strings.HasPrefix(refDTTZ.TimeZone.Name, "America/") {
 			dateMode = "na"
 		} else {
 			dateMode = "rest"
@@ -73,8 +79,8 @@ func Parse(year int, dateMode string, timeZone *TimeZone, in string) (*DateTimeT
 	parseDateMode = dateMode
 	debugf("parseDateMode: %q\n", parseDateMode)
 
-	parseTimeZone = timeZone
-	debugf("parseTimeZone: %q\n", parseTimeZone)
+	// parseTimeZone = timeZone
+	// debugf("parseTimeZone: %q\n", parseTimeZone)
 
 	g := &glr.Grammar{
 		Rules:   datetimeRules,

datetime/parse_glr.go

@@ -134,6 +134,8 @@ func (l *datetimeLexer) Lex(lval *yySymType) int {
 				return CALENDAR
 			case "date":
 				return DATE
+			case "dates":
+				return DATES
 			case "from":
 				return FROM
 			case "google":
@@ -150,14 +152,20 @@ func (l *datetimeLexer) Lex(lval *yySymType) int {
 				return OF
 			case "on":
 				return ON
+			case "part":
+				return PART
 			case "pm":
 				return PM
+			case "save":
+				return SAVE
 			case "through":
 				return THROUGH
 			case "t":
 				return T
 			case "th":
 				return TH
+			case "the":
+				return THE
 			case "till":
 				return TILL
 			case "time":