diff options
| author | Christoph Dittmann <github@christoph-d.de> | 2018-06-10 13:03:53 +0100 |
|---|---|---|
| committer | Christoph Dittmann <github@christoph-d.de> | 2018-06-10 13:55:17 +0100 |
| commit | 86a23cd263a2e67351a3d748ffc69d65f4746184 (patch) | |
| tree | 15920e4221cc0dd2c232d38920950f30be67a753 /test | |
| parent | adc221f1fdb247358a91fb991efe2c18307e6a20 (diff) | |
| download | fork-ledger-86a23cd263a2e67351a3d748ffc69d65f4746184.tar.gz fork-ledger-86a23cd263a2e67351a3d748ffc69d65f4746184.tar.bz2 fork-ledger-86a23cd263a2e67351a3d748ffc69d65f4746184.zip | |
Remove TOK_A_YEAR token
This fixes #1626.
The tokenizer eagerly classifies 4-digit integers as TOK_A_YEAR
tokens. In some contexts such as "every 1000 years", this causes
errors.
I think the tokenizer does not have enough information available to
distinguish between integers and years.
After this patch, the tokenizer will always classify integers as
TOK_INT tokens. The "has 4 digits" heuristic to determine if an
integer is a year is moved to the place where it's actually
needed (and it can be slightly more generic there, too).
Diffstat (limited to 'test')
| -rw-r--r-- | test/regress/1626.test | 28 | ||||
| -rw-r--r-- | test/regress/7F3650FD.test | 2 | ||||
| -rw-r--r-- | test/regress/BBFA1759.test | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/test/regress/1626.test b/test/regress/1626.test new file mode 100644 index 00000000..89ae80f8 --- /dev/null +++ b/test/regress/1626.test @@ -0,0 +1,28 @@ +test period every 1000 years from 1 Sep 2011 to 30 May 2012 --now=2018-06-10 +--- Period expression tokens --- +TOK_EVERY: every +TOK_INT: 1000 +TOK_YEARS: years +TOK_SINCE: since +TOK_INT: 1 +TOK_A_MONTH: Sep +TOK_INT: 2011 +TOK_UNTIL: until +TOK_INT: 30 +TOK_A_MONTH: May +TOK_INT: 2012 +END_REACHED: <EOF> + +--- Before stabilization --- + range: from day 1 to day 30 +duration: 1000 years + +--- After stabilization --- + range: from day 1 to day 30 + start: 18-Jan-01 + finish: 18-Jan-30 +duration: 1000 years + +--- Sample dates in range (max. 20) --- + 1: 18-Jan-01 -- 18-Jan-29 +end test diff --git a/test/regress/7F3650FD.test b/test/regress/7F3650FD.test index f0498ddb..0ccfe644 100644 --- a/test/regress/7F3650FD.test +++ b/test/regress/7F3650FD.test @@ -68,7 +68,7 @@ end test test period --now=2010/11/01 2009 --- Period expression tokens --- -TOK_A_YEAR: 2009 +TOK_INT: 2009 END_REACHED: <EOF> --- Before stabilization --- diff --git a/test/regress/BBFA1759.test b/test/regress/BBFA1759.test index 7a402d0c..5df7ecb2 100644 --- a/test/regress/BBFA1759.test +++ b/test/regress/BBFA1759.test @@ -2,7 +2,7 @@ test period june 2008 --- Period expression tokens --- TOK_A_MONTH: Jun -TOK_A_YEAR: 2008 +TOK_INT: 2008 END_REACHED: <EOF> --- Before stabilization --- |