From 61c25c3fbf8c73052e782744937d49ca00edc907 Mon Sep 17 00:00:00 2001 From: Xuan Son Nguyen Date: Thu, 1 Jan 2026 22:48:42 +0100 Subject: [PATCH] trailing spaces --- common/jinja/jinja-parser.cpp | 20 ++++++++++---------- common/jinja/jinja-vm.cpp | 4 ++-- common/jinja/jinja-vm.h | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/jinja/jinja-parser.cpp b/common/jinja/jinja-parser.cpp index 8cbb41eca6..ed3604ea95 100644 --- a/common/jinja/jinja-parser.cpp +++ b/common/jinja/jinja-parser.cpp @@ -132,7 +132,7 @@ private: // Consume {% token prev_cur = current; expect(token::open_statement, "Expected {%"); - + if (peek().t != token::identifier) { throw std::runtime_error("Unknown statement"); } @@ -183,15 +183,15 @@ private: } auto callee = parse_primary_expression(); if (!is_type(callee)) throw std::runtime_error("Expected identifier"); - + auto call_args = parse_args(); expect(token::close_statement, "Expected %}"); - + statements body; while (!is_statement({"endcall"})) { body.push_back(parse_any()); } - + expect(token::open_statement, "Expected {%"); expect_identifier("endcall"); expect(token::close_statement, "Expected %}"); @@ -205,12 +205,12 @@ private: filter_node = parse_call_expression(std::move(filter_node)); } expect(token::close_statement, "Expected %}"); - + statements body; while (!is_statement({"endfilter"})) { body.push_back(parse_any()); } - + expect(token::open_statement, "Expected {%"); expect_identifier("endfilter"); expect(token::close_statement, "Expected %}"); @@ -227,7 +227,7 @@ private: auto left = parse_expression_sequence(); statement_ptr value = nullptr; statements body; - + prev_cur = current; if (is(token::equals)) { @@ -311,7 +311,7 @@ private: // `messages` in `for message in messages` auto iterable = parse_expression(); expect(token::close_statement, "Expected %}"); - + statements body; statements alternate; @@ -486,7 +486,7 @@ private: arg = parse_expression(); if (is(token::equals)) { // keyword argument - // e.g., func(x = 5, y = a or b) + // e.g., func(x = 5, y = a or b) ++current; // consume equals arg = mk_stmt(std::move(arg), parse_expression()); } @@ -525,7 +525,7 @@ private: prev_cur = current; if (is(token::colon)) { // A case where a default is used - // e.g., [:2] will be parsed as [undefined, 2] + // e.g., [:2] will be parsed as [undefined, 2] slices.push_back(nullptr); ++current; // consume colon is_slice = true; diff --git a/common/jinja/jinja-vm.cpp b/common/jinja/jinja-vm.cpp index 2a679517e8..4df50c5132 100644 --- a/common/jinja/jinja-vm.cpp +++ b/common/jinja/jinja-vm.cpp @@ -457,7 +457,7 @@ value for_statement::execute_impl(context & ctx) { scope_update_fns.push_back(scope_update_fn); } JJ_DEBUG("For loop: %zu items after filtering", filtered_items.size()); - + auto result = mk_val(); bool noIteration = true; @@ -558,7 +558,7 @@ value macro_statement::execute_impl(context & ctx) { const func_handler func = [this, name, &ctx](const func_args & args) -> value { size_t expected_count = this->args.size(); size_t input_count = args.args.size(); - + JJ_DEBUG("Invoking macro '%s' with %zu input arguments (expected %zu)", name.c_str(), input_count, expected_count); context macro_ctx(ctx); // new scope for macro execution diff --git a/common/jinja/jinja-vm.h b/common/jinja/jinja-vm.h index 3817e7f535..5b697eb949 100644 --- a/common/jinja/jinja-vm.h +++ b/common/jinja/jinja-vm.h @@ -160,7 +160,7 @@ struct for_statement : public statement { statements default_block; // if no iteration took place for_statement(statement_ptr && loopvar, statement_ptr && iterable, statements && body, statements && default_block) - : loopvar(std::move(loopvar)), iterable(std::move(iterable)), + : loopvar(std::move(loopvar)), iterable(std::move(iterable)), body(std::move(body)), default_block(std::move(default_block)) { chk_type(this->loopvar); chk_type(this->iterable); @@ -278,7 +278,7 @@ struct identifier : public expression { // Literals -struct integer_literal : public expression { +struct integer_literal : public expression { int64_t val; explicit integer_literal(int64_t val) : val(val) {} std::string type() const override { return "IntegerLiteral"; } @@ -327,7 +327,7 @@ struct tuple_literal : public array_literal { struct object_literal : public expression { std::vector> val; - explicit object_literal(std::vector> && val) + explicit object_literal(std::vector> && val) : val(std::move(val)) { for (const auto & pair : this->val) { chk_type(pair.first);