Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow comments in `{% match %}` and remove panic! | René Kijewski | 2022-01-31 | 1 | -19/+2 |
| | |||||
* | Parse tuple expressions | René Kijewski | 2022-01-28 | 1 | -3/+145 |
| | | | | | | | Askama understands how to destructure tuples in let and match statements, but it does not understand how to build a tuple. This PR fixes this shortcoming. | ||||
* | Implement error propagation expression: `?` (#590) | René Kijewski | 2022-01-28 | 1 | -1/+8 |
| | | | | | | This change allows using the operator `?` in askama expressions. It works like the same operator in Rust: if a `Result` is `Ok`, it is unwrapped. If it is an error, then the `render()` method fails with this error value. | ||||
* | Unify handling of calls (#614) | René Kijewski | 2022-01-27 | 1 | -66/+126 |
| | | | | | Instead of having `Expr::VarCall`, `Expr::PathCall` and `Expr::MethodCall`, this PR unifies the handling of calls by removing the former three variants, and introducing `Expr::Call`. | ||||
* | Optimize parsing of ranges | René Kijewski | 2022-01-06 | 1 | -17/+13 |
| | | | | | | | | | | Right now almost every expression needs to be parsed twice: `expr_any()` first parses the left-hand side of a range expression, and if no `..` or `..=` was found the left-hand expression is parsed again, this time as the result of the function. This diff removes the second parsing step by first looking for `.. (opt rhs)`, then for `lhs .. (opt rhs)`. | ||||
* | Same number of repeats in macro pattern and body | René Kijewski | 2022-01-06 | 1 | -1/+1 |
| | |||||
* | Allow whitespace trimming in {{raw}} blocks | René Kijewski | 2021-11-29 | 1 | -16/+19 |
| | |||||
* | Simplify take_content() implementation | René Kijewski | 2021-11-24 | 1 | -43/+37 |
| | |||||
* | Parse `&str` instead of `&[u8]` | René Kijewski | 2021-11-24 | 1 | -132/+120 |
| | | | | | Askama's takes valid UTF-8 files as input. So why operate on byte slices instead of strings? This makes writing some functions a lot simpler. | ||||
* | Simplify identifier() implementation | René Kijewski | 2021-11-24 | 1 | -17/+15 |
| | |||||
* | Simplify ws() and split_ws_parts() | René Kijewski | 2021-11-24 | 1 | -43/+19 |
| | |||||
* | use nom::error::ErrorKind | René Kijewski | 2021-11-24 | 1 | -16/+7 |
| | |||||
* | Implement `for … in … if …` | René Kijewski | 2021-11-11 | 1 | -1/+6 |
| | |||||
* | Implement for-else | René Kijewski | 2021-11-11 | 1 | -9/+40 |
| | | | | | | | | | | | | | This PR implements for-else statements like in Jinja. They make it easy to print an alternative message if the loop iterator was empty. E.g. ```rs {% for result in result %} <li>{{ result }}</li> {% else %} <li><em>no results</em></li> {% endfor %} ``` | ||||
* | Use char() instead of tag() when possible | René Kijewski | 2021-10-12 | 1 | -73/+76 |
| | |||||
* | Remove custom ParserError type | René Kijewski | 2021-10-12 | 1 | -5/+3 |
| | |||||
* | Fix suggestions from nightly clippy | Dirkjan Ochtman | 2021-10-05 | 1 | -13/+9 |
| | |||||
* | Ensure that {%break%} is only used inside of a loop | René Kijewski | 2021-08-30 | 1 | -46/+76 |
| | |||||
* | Add {% break %} and {% continue %} | René Kijewski | 2021-08-30 | 1 | -0/+16 |
| | | | | | This PR adds `{% break %}` and `{% continue %}` statements to break out of a loop, or continue with the next element of the iterator. | ||||
* | Parse boolean literals in assignment targets | René Kijewski | 2021-08-25 | 1 | -3/+21 |
| | | | | | | | | 268d825 introduced a regression that made matching against boolean literals impossible. E.g. "true" was interpreted as the variable "r#true". This PR fixes the problem. The bug was reported by @Restioson in issue #531. | ||||
* | Upgrade to nom 7 | Dirkjan Ochtman | 2021-08-21 | 1 | -5/+9 |
| | |||||
* | Better error messages using cuts | René Kijewski | 2021-07-30 | 1 | -131/+186 |
| | |||||
* | Use "target()" to parse "when" block | René Kijewski | 2021-07-30 | 1 | -150/+40 |
| | | | | | | | | | | | | `target()` as used in parsing "let" and "if let" implements parsing nested tuples and structs. But it does not implement parsing literals. The functions `match_variant()` and `with_parameters()` as used in parsing "when" blocks do not implement parsing nested structs, but it implements parsing literals. This PR combines `match_variant()` and `with_parameters()` into `target()`, so that all `{%when%}` support nested structs, too. | ||||
* | Allow omitting "with" keyword in match blocks | René Kijewski | 2021-07-30 | 1 | -1/+1 |
| | | | | | | | | | Askama uses the syntax `{% when Variant with (parameters) %}` in `{% match %}` blocks. This is done because Askama does not implement the whole pattern matching of Rust's `match` statements. This PR wants to bring Askama a step closer Rust's matching, so the "with" keyword should not be needed anymore. | ||||
* | Allow using "with" keyword in "let" statements | René Kijewski | 2021-07-30 | 1 | -0/+1 |
| | | | | | | | | Askama uses the syntax `{% when Variant with (parameters) %}` in `{% match %}` blocks. This change allows the optional use of the keyword "with" in "let" and "if let" statements, too. | ||||
* | Implement destructoring of structs | René Kijewski | 2021-07-05 | 1 | -6/+42 |
| | | | | | This PR implements the destructoring of structs on the lhs of "let" and "for" statements. | ||||
* | Parse nested tuples in "let" statement lhs | René Kijewski | 2021-07-05 | 1 | -14/+32 |
| | |||||
* | Stop eliding lifetimes in paths | Dirkjan Ochtman | 2021-07-01 | 1 | -51/+50 |
| | |||||
* | Implement "if let" statement | René Kijewski | 2021-07-01 | 1 | -5/+27 |
| | |||||
* | Reworked constants to be parsed as paths | vallentin | 2021-02-23 | 1 | -6/+24 |
| | |||||
* | Added var and path parser tests | vallentin | 2021-02-22 | 1 | -1/+72 |
| | |||||
* | Fixed path parser to account for single identifier type names | vallentin | 2021-02-22 | 1 | -7/+23 |
| | |||||
* | Removed needless borrow of range | vallentin | 2021-02-22 | 1 | -0/+1 |
| | |||||
* | Bring Ws type name in line with API guidelines | Dirkjan Ochtman | 2021-02-01 | 1 | -66/+66 |
| | |||||
* | Apply suggestions from nightly clippy | Dirkjan Ochtman | 2021-01-22 | 1 | -4/+2 |
| | |||||
* | Improved comment parsing test | vallentin | 2021-01-06 | 1 | -0/+18 |
| | |||||
* | Fixed comment parsing | vallentin | 2021-01-06 | 1 | -7/+1 |
| | |||||
* | Removed implicit borrowing of literals, calls, and more (fixes #404) | vallentin | 2021-01-05 | 1 | -0/+39 |
| | |||||
* | Added numbers parser test | vallentin | 2021-01-05 | 1 | -0/+13 |
| | |||||
* | Fixed parsing floats | vallentin | 2021-01-05 | 1 | -2/+4 |
| | |||||
* | Improved filter parsing test | vallentin | 2021-01-05 | 1 | -1/+35 |
| | |||||
* | Fixed precedence of filters and unary operators (fixes #424) | vallentin | 2021-01-05 | 1 | -3/+3 |
| | |||||
* | Added comment parser tests | vallentin | 2020-12-18 | 1 | -0/+17 |
| | |||||
* | Added support for nested comments | vallentin | 2020-12-18 | 1 | -4/+22 |
| | |||||
* | Added set alias for let | vallentin | 2020-12-16 | 1 | -1/+1 |
| | |||||
* | Fixed whitespace issue when generating match (#399) | Christian Vallentin | 2020-12-12 | 1 | -7/+5 |
| | | | | | | | | | | | | | * Fixed #397 * Updated parser to ignore whitespace between match and when * Updated test cases * Updated Python script to generate match ws tests * Added match ws tests * Resolved rustfmt lint | ||||
* | Allow paths to start with `::` (#393) | Christian Vallentin | 2020-12-02 | 1 | -4/+25 |
| | |||||
* | Fixed parsing precedence and associativity (#391) | Christian Vallentin | 2020-12-01 | 1 | -33/+173 |
| | |||||
* | Improve error handling (see #368) | Dirkjan Ochtman | 2020-11-02 | 1 | -13/+17 |
| | |||||
* | Apply clippy suggestions | Dirkjan Ochtman | 2020-11-02 | 1 | -2/+2 |
| |