From bb4749db36375cc0ccdaac9e4953e98512a280fe Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 21 May 2024 15:42:46 -0400 Subject: [PATCH] Add support for from ... import ... as --- grammar/JinjaGrammar.g4 | 9 +++++++++ grammar/JinjaLexer.g4 | 1 + 2 files changed, 10 insertions(+) diff --git a/grammar/JinjaGrammar.g4 b/grammar/JinjaGrammar.g4 index cca5b78a..8314a6bd 100644 --- a/grammar/JinjaGrammar.g4 +++ b/grammar/JinjaGrammar.g4 @@ -48,8 +48,17 @@ statement_import_file | variable_name ; +statement_import_variable + : variable_name (SP STATEMENT_ID_IMPORT_AS SP variable_name)? + ; + +statement_import_variable_list + : (statement_import_variable SP? COMMA SP?)+ statement_import_variable + ; + statement_import : STATEMENT_ID_IMPORT SP statement_import_file SP STATEMENT_ID_IMPORT_AS SP variable_name + | STATEMENT_ID_FROM SP statement_import_file SP STATEMENT_ID_IMPORT SP statement_import_variable_list ; block_statement_id diff --git a/grammar/JinjaLexer.g4 b/grammar/JinjaLexer.g4 index 37bbc8f4..ecc7e35e 100644 --- a/grammar/JinjaLexer.g4 +++ b/grammar/JinjaLexer.g4 @@ -79,6 +79,7 @@ SP : [ \t\f]+; // Statement identifiers for built-in statements STATEMENT_ID_BLOCK : 'block'; +STATEMENT_ID_FROM : 'from'; STATEMENT_ID_IMPORT : 'import'; STATEMENT_ID_INCLUDE : 'include'; STATEMENT_ID_RAW : 'raw'; -- 2.47.2