Skip to content

do not pop the unbalance brackets in the current row #541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renkun-ken merged 1 commit into from
Apr 19, 2022
Merged

do not pop the unbalance brackets in the current row #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/search.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ SEXP find_unbalanced_bracket(SEXP content, SEXP _row, SEXP _col, SEXP _skip_el)
stack pos;
stack codept_pos;
int nbracket = 0;
int ncurrentunbalanced = 0;
int nunbalanced = 0;
char brac[2] = " \x00";

Expand All @@ -47,6 +48,7 @@ SEXP find_unbalanced_bracket(SEXP content, SEXP _row, SEXP _col, SEXP _skip_el)
fsm_initialize(&state);
stack_initialize(&pos);
stack_initialize(&codept_pos);
ncurrentunbalanced = 0;
while (j < n && (i < row || k <= col)) {
cj = c[j];
if (0x80 <= cj && cj <= 0xbf) {
Expand All @@ -66,7 +68,7 @@ SEXP find_unbalanced_bracket(SEXP content, SEXP _row, SEXP _col, SEXP _skip_el)
stack_pop(&pos);
stack_pop(&codept_pos);
} else {
nunbalanced += 1;
ncurrentunbalanced += 1;
}
}
}
Expand All @@ -80,6 +82,7 @@ SEXP find_unbalanced_bracket(SEXP content, SEXP _row, SEXP _col, SEXP _skip_el)
nunbalanced -= 1;
nbracket -= 1;
}
nunbalanced += ncurrentunbalanced;
j = stack_pop(&pos);
k = stack_pop(&codept_pos);
stack_clear(&pos);
Expand Down
4 changes: 4 additions & 0 deletions tests/testthat/test-search.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ test_that("find_unbalanced_bracket works as expected", {
expect_equal(bsearch(c("foo({ ", "}, xyz"), 1, 3)[[1]], c(0, 3))
expect_equal(bsearch(c("foo(( ", "), xyz"), 1, 3)[[1]], c(0, 3))

# issue #530
expect_equal(bsearch(c("if (sum()) ", "xyz"), 0, 7)[[1]], c(0, 7))
expect_equal(bsearch(c("} if (sum()) ", "xyz"), 0, 9)[[1]], c(0, 9))

# other brackets
expect_equal(bsearch("foo[xy", 0, 5), list(c(0, 3), "["))
expect_equal(bsearch("foo{xy", 0, 5), list(c(0, 3), "{"))
Expand Down