jdelony/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2026-06-27 23:50:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

jinja : fix negative step slice with start/stop values (#24580)

Browse Source
This commit is contained in:
Sigbjørn Skjæret 2026-06-13 18:28:40 +02:00 committed by GitHub
parent e8067a8b36
commit f05cf4676a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/jinja/runtime.cpp
View File

@ -761,9 +761,9 @@ value member_expression::execute_impl(context & ctx) {
if (is_stmt<slice_expression>(this->property)) { if (is_stmt<slice_expression>(this->property)) {
auto s = cast_stmt<slice_expression>(this->property); auto s = cast_stmt<slice_expression>(this->property);
value start_val = s->start_expr ? s->start_expr->execute(ctx) : mk_val<value_int>(0);
value stop_val = s->stop_expr ? s->stop_expr->execute(ctx) : mk_val<value_int>(arr_size);
value step_val = s->step_expr ? s->step_expr->execute(ctx) : mk_val<value_int>(1); value step_val = s->step_expr ? s->step_expr->execute(ctx) : mk_val<value_int>(1);
value start_val = s->start_expr ? s->start_expr->execute(ctx) : (step_val->as_int() < 0 ? mk_val<value_int>(arr_size - 1) : mk_val<value_int>(0));
value stop_val = s->stop_expr ? s->stop_expr->execute(ctx) : (step_val->as_int() < 0 ? mk_val<value_int>(-1) : mk_val<value_int>(arr_size));
// translate to function call: obj.slice(start, stop, step) // translate to function call: obj.slice(start, stop, step)
JJ_DEBUG("Member expression is a slice: start %s, stop %s, step %s", JJ_DEBUG("Member expression is a slice: start %s, stop %s, step %s",

6
common/jinja/value.cpp
View File

@ -90,14 +90,14 @@ static T slice(const T & array, int64_t start, int64_t stop, int64_t step = 1) {
stop_val = std::min(stop_val, len); stop_val = std::min(stop_val, len);
} }
} else { } else {
start_val = len - 1; start_val = start;
if (start_val < 0) { if (start_val < 0) {
start_val = std::max(len + start_val, (int64_t)-1); start_val = std::max(len + start_val, (int64_t)0);
} else { } else {
start_val = std::min(start_val, len - 1); start_val = std::min(start_val, len - 1);
} }
stop_val = -1; stop_val = stop;
if (stop_val < -1) { if (stop_val < -1) {
stop_val = std::max(len + stop_val, (int64_t)-1); stop_val = std::max(len + stop_val, (int64_t)-1);
} else { } else {

18
tests/test-jinja.cpp
View File

@ -435,6 +435,24 @@ static void test_expressions(testing & t) {
"('c', 'b', 'a')" "('c', 'b', 'a')"
); );
test_template(t, "string slice negative step",
"{{ 'abcdef'[::-2] }}",
json::object(),
"fdb"
);
test_template(t, "string slice negative start and step",
"{{ 'abcdef'[-1:1:-1] }}",
json::object(),
"fedc"
);
test_template(t, "string slice negative start, stop and step",
"{{ 'abcdef'[-1:-5:-1] }}",
json::object(),
"fedc"
);
test_template(t, "arithmetic", test_template(t, "arithmetic",
"{{ (a + b) * c }}", "{{ (a + b) * c }}",
{{"a", 2}, {"b", 3}, {"c", 4}}, {{"a", 2}, {"b", 3}, {"c", 4}},