Merge pull request #8 from magodo/period_ensure_consumption

Period parsing ensure consumption of all components.
rickb777 · Apr 22, 2020 · 6300e54 · 6300e54
2 parents 2248ec4 + 31e2dc8
commit 6300e54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/period/marshal_test.go b/period/marshal_test.go
@@ -119,7 +119,7 @@ func TestInvalidPeriodText(t *testing.T) {
 	}{
 		{``, `cannot parse a blank string as a period`},
 		{`not-a-period`, `expected 'P' period mark at the start: not-a-period`},
-		{`P000`, `expected 'Y', 'M', 'W', 'D', 'H', 'M', or 'S' marker: P000`},
+		{`P000`, `unexpected remaining components 000: P000`},
 	}
 	for _, c := range cases {
 		var p Period

diff --git a/period/parse.go b/period/parse.go
@@ -75,19 +75,21 @@ func Parse(period string) (Period, error) {
 			return Period{}, fmt.Errorf("expected a number before the 'S' marker: %s", period)
 		}
 
+		if len(st.pcopy) != 0 {
+			return Period{}, fmt.Errorf("unexpected remaining components %s: %s", st.pcopy, period)
+		}
+
 		st.pcopy = pcopy[:t]
 	}
 
 	result.years, st = parseField(st, 'Y')
 	if st.err != nil {
 		return Period{}, fmt.Errorf("expected a number before the 'Y' marker: %s", period)
 	}
-
 	result.months, st = parseField(st, 'M')
 	if st.err != nil {
 		return Period{}, fmt.Errorf("expected a number before the 'M' marker: %s", period)
 	}
-
 	weeks, st := parseField(st, 'W')
 	if st.err != nil {
 		return Period{}, fmt.Errorf("expected a number before the 'W' marker: %s", period)
@@ -98,6 +100,10 @@ func Parse(period string) (Period, error) {
 		return Period{}, fmt.Errorf("expected a number before the 'D' marker: %s", period)
 	}
 
+	if len(st.pcopy) != 0 {
+		return Period{}, fmt.Errorf("unexpected remaining components %s: %s", st.pcopy, period)
+	}
+
 	result.days = weeks*7 + days
 	//fmt.Printf("%#v\n", st)
 

diff --git a/period/period_test.go b/period/period_test.go
@@ -27,6 +27,9 @@ func TestParseErrors(t *testing.T) {
 		{"PxD", "expected a number before the 'D' marker: PxD"},
 		{"PTxH", "expected a number before the 'H' marker: PTxH"},
 		{"PTxS", "expected a number before the 'S' marker: PTxS"},
+		{"P1HT1M", "unexpected remaining components 1H: P1HT1M"},
+		{"PT1Y", "unexpected remaining components 1Y: PT1Y"},
+		{"P1S", "unexpected remaining components 1S: P1S"},
 	}
 	for i, c := range cases {
 		_, err := Parse(c.value)