From 985eb8955f36e909d18f7ea6eaf4c748e7afd17a Mon Sep 17 00:00:00 2001 From: René Kijewski Date: Mon, 31 Jul 2023 20:58:23 +0200 Subject: Fix parsing arrays This change * allows using empty arrays `[]` in expessions, * adds a cut when the leading `[` was encountered, and * fixes the interaction between arrays and boolean OR. IMO the restriction that you couldn't use empty arrays is not needed. The missing cut made error messages slictly worse if you forget to add the closing `]`. Filter expressions must not have white spaces before the pipe `|`. The white space is used to tell a filter expressions, and `std::ops::Or` apart. --- testing/tests/ui/loop_cycle_empty.rs | 3 --- testing/tests/ui/loop_cycle_empty.stderr | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'testing/tests') diff --git a/testing/tests/ui/loop_cycle_empty.rs b/testing/tests/ui/loop_cycle_empty.rs index 4aa6010..30d54fa 100644 --- a/testing/tests/ui/loop_cycle_empty.rs +++ b/testing/tests/ui/loop_cycle_empty.rs @@ -1,6 +1,3 @@ -// Nb. this test fails because currently an empty array "[]" is always a syntax error in askama, -// but even if this changes, this test should keep failing, but possibly with another error message - use askama::Template; #[derive(Template)] diff --git a/testing/tests/ui/loop_cycle_empty.stderr b/testing/tests/ui/loop_cycle_empty.stderr index 4fc35bb..dd4f0dd 100644 --- a/testing/tests/ui/loop_cycle_empty.stderr +++ b/testing/tests/ui/loop_cycle_empty.stderr @@ -1,8 +1,7 @@ -error: problems parsing template source at row 1, column 35 near: - "[]) }}{{ v }},{% endfor %}" - --> tests/ui/loop_cycle_empty.rs:6:10 +error: loop.cycle(…) cannot use an empty array + --> tests/ui/loop_cycle_empty.rs:3:10 | -6 | #[derive(Template)] +3 | #[derive(Template)] | ^^^^^^^^ | = note: this error originates in the derive macro `Template` (in Nightly builds, run with -Z macro-backtrace for more info) -- cgit