Skip to content

fix: keep every option in a WRITETABLE option series #21

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
trygu merged 1 commit into from
Nov 6, 2026
Merged

fix: keep every option in a WRITETABLE option series #21

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
13 changes: 8 additions & 5 deletions R/engine_batch.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,15 +448,18 @@ rta_parse_write_table <- function(tok) {
c <- tail_next_char(t)
if (c != ",") stop_batch(", expected; not a ", c)

# Multiple options form one series token (legacy writeTableBatch):
# the token is chomped in 2-letter code + sign chunks until empty.
options <- character(0)
repeat {
hs <- toupper(tail_next_token(t))
if (hs == "") break
if (nchar(hs) < 3L) stop_batch("Unknown option (", hs, ")")
hs <- toupper(tail_next_token(t))
while (nzchar(hs)) {
if (nchar(hs) < 2L) stop_batch("Unknown option (", hs, ")")
opt <- substring(hs, 1L, 2L)
sign <- substring(hs, 3L, 3L)
hs <- trimws(substring(hs, 3L))
sign <- substring(hs, 1L, 1L)
if (!(sign %in% c("+", "-")))
stop_batch("+ or - expected; not a ", sign)
hs <- trimws(substring(hs, 2L))
options <- c(options, paste0(sign, opt))
}

Expand Down
20 changes: 20 additions & 0 deletions tests/testthat/test_engine_parse.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,26 @@ test_that("WRITETABLE grammar: options, empty-options form and type bounds", {
expect_error(rtauargus.native:::parse_batch(p3), class = "BatchError")
})

test_that("WRITETABLE option series: multiple options in one token", {
# Legacy writeTableBatch (batch.java) reads one option token and
# chomps it in 2-letter code + sign chunks, so AS+AR+ is a series of
# two options. The port must keep every option, not silently drop
# all but the first.
p <- local_arb(c('<WRITETABLE> (1, 5, AS+AR+, "out.tab")'))
cmd <- rtauargus.native:::parse_batch(p)[[1]]
expect_equal(cmd$options, c("+AS", "+AR"))
expect_equal(cmd$file, "out.tab")

p2 <- local_arb(c('<WRITETABLE> (1, 5, AS+AR+SO-, "out.tab")'))
cmd2 <- rtauargus.native:::parse_batch(p2)[[1]]
expect_equal(cmd2$options, c("+AS", "+AR", "-SO"))
expect_equal(cmd2$file, "out.tab")

# a sign-less tail of the series is an error, not a silent drop
p3 <- local_arb(c('<WRITETABLE> (1, 5, AS+AR, "out.tab")'))
expect_error(rtauargus.native:::parse_batch(p3), class = "BatchError")
})

test_that("READTABLE flags are parsed", {
# READTABLE is only allowed in table-input position (after the data,
# metadata and table specification)
Expand Down
Loading