Skip to content

Combine DTPRINT statements for fread verbose messages #6848

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
MichaelChirico merged 4 commits into from
Mar 4, 2025
Merged

Combine DTPRINT statements for fread verbose messages #6848

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc1005e
merged dtprints
venom1204 Mar 3, 2025
4bc0e27
whitespace style
MichaelChirico Mar 3, 2025
b5e59b7
Restore translation, fix whitespace
aitap Mar 4, 2025
b6423fe
Restore translation, fix whitespace (2/2)
aitap Mar 4, 2025
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
12 changes: 8 additions & 4 deletions src/fread.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,8 +1730,10 @@
topQuoteRule = quoteRule;
firstJumpEnd = ch; // to know how many bytes jump 0 is, for nrow estimate later (a less-good estimate when fill=true since line lengths vary more)
if (verbose) {
DTPRINT((unsigned)sep<32 ? " sep=%#02x" : " sep='%c'", sep); // # notranslate
DTPRINT(_(" with %d fields using quote rule %d\n"), topNumFields, quoteRule);
DTPRINT((unsigned)sep<32
? _(" sep=%#02x with %d fields using quote rule %d\n")

Check warning on line 1734 in src/fread.c

View check run for this annotation

Codecov / codecov/patch

src/fread.c#L1734 

Added line #L1734 was not covered by tests
: _(" sep='%c' with %d fields using quote rule %d\n"),
sep, topNumFields, quoteRule);
}
}
} else {
Expand Down Expand Up @@ -1780,8 +1782,10 @@
topSkip = thisRow-thisBlockLines;
if (topSkip<0) topSkip=0; // inelegant but will do for now to pass single row input such as test 890
if (verbose) {
DTPRINT((unsigned)sep<32 ? " sep=%#02x" : " sep='%c'", sep); // # notranslate
DTPRINT(_(" with %d lines of %d fields using quote rule %d\n"), topNumLines, topNumFields, topQuoteRule);
DTPRINT((unsigned)sep<32
? _(" sep=%#02x with %d lines of %d fields using quote rule %d\n")

Check warning on line 1786 in src/fread.c

View check run for this annotation

Codecov / codecov/patch

src/fread.c#L1786 

Added line #L1786 was not covered by tests
: _(" sep='%c' with %d lines of %d fields using quote rule %d\n"),
sep, topNumLines, topNumFields, topQuoteRule);
}
}
}
Expand Down
Loading