Merge pull request 'Fix _ret in group' (#8) from fix/issue-6-alt-groups into dev

Reviewed-on: #8
This commit is contained in:
Louis Heredero 2025-03-10 17:58:06 +00:00
commit 3eadf63db3
2 changed files with 10 additions and 3 deletions

View File

@ -46,7 +46,6 @@
while i < elmts.len() {
let elmt = elmts.at(i)
if elmt.type == "grp" {
let grp-elmts = elmt.elmts
elmt.elmts = elmt.elmts.map(e => {
if e.type == "seq" {
if e.p1 == "?" {
@ -60,12 +59,17 @@
elmts.at(i) = elmt
elmts = (
elmts.slice(0, i + 1) +
grp-elmts +
elmt.elmts +
((
type: "grp-end"
type: "grp-end",
start-i: i
),) +
elmts.slice(i+1)
)
} else if elmt.type == "grp-end" {
// Put back elements in group because they might have changed
elmts.at(elmt.start-i).elmts = elmts.slice(elmt.start-i + 1, i)
} else if elmt.type == "seq" {
if elmt.enable-dst {
activation-history.push(elmt)

View File

@ -36,6 +36,9 @@
max-i = calc.max(max-i, i1)
}
}
if max-i < min-i {
(min-i, max-i) = (max-i, min-i)
}
return (min-i, max-i)
}