Skip to content
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

Use Rf_charIsASCII for IS_ASCII instead of testing LEVELS on R >= 4.5 #6422

Merged
merged 10 commits into from
Mar 5, 2025
Merged

Use Rf_charIsASCII for IS_ASCII instead of testing LEVELS on R >= 4.5 #6422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
40ad2e6
Drop direct use of NAMED
aitap Aug 28, 2024
46dbfa9
Almost drop direct use of LEVELS
aitap Aug 28, 2024
a524d14
NEWS entry for NAMED, LEVELS reduction
aitap Aug 28, 2024
72cbd17
Drop direct use of LEVELS in R >= 4.5
aitap Aug 28, 2024
b409a40
fine-tune NEWS
MichaelChirico Aug 28, 2024
01385c1
multiple PRs :)
MichaelChirico Mar 4, 2025
6a29ea9
tag SVN revision
MichaelChirico Mar 4, 2025
31e324b
Merge branch 'master' into R_4_5_isCharASCII
MichaelChirico Mar 4, 2025
9f5cc4f
TODO
MichaelChirico Mar 4, 2025
090dc37
fix merge
MichaelChirico 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
4 changes: 4 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@

1. Custom binary operators from the `lubridate` package now work with objects of class `IDate` as with a `Date` subclass, [#6839](https://github.com/Rdatatable/data.table/issues/6839). Thanks @emallickhossain for the report and @aitap for the fix.

## NOTES

1. Continued work to remove non-API C functions, [#6180](https://github.com/Rdatatable/data.table/issues/6180). Thanks Ivan Krylov for the PRs and for writing a clear and concise guide about the R API: https://aitap.codeberg.page/R-api/.

# data.table [v1.17.0](https://github.com/Rdatatable/data.table/milestone/34) (20 Feb 2025)

## POTENTIALLY BREAKING CHANGES
Expand Down
7 changes: 6 additions & 1 deletion src/data.table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@
/* we mean the encoding bits, not CE_NATIVE in a UTF-8 locale */
#define IS_UTF8(x) (getCharCE(x) == CE_UTF8)
#define IS_LATIN(x) (getCharCE(x) == CE_LATIN1)
#define IS_ASCII(x) (LEVELS(x) & 64) // API expected in R >= 4.5
// TODO: remove the `R_SVN_VERSION` check when R 4.5.0 is released (circa Apr. 2025)
#if R_VERSION < R_Version(4, 5, 0) || R_SVN_REVISION < 86789
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping this here even though there's another (4,5,0) check above at L21

  • The R_SVN_REVISIONs are different
  • The IS_UTF8() and IS_LATIN() macros are also right here

# define IS_ASCII(x) (LEVELS(x) & 64)
#else
# define IS_ASCII(x) (Rf_charIsASCII(x)) // no CE_ASCII
#endif
#define IS_TRUE(x) (TYPEOF(x)==LGLSXP && LENGTH(x)==1 && LOGICAL(x)[0]==TRUE)
#define IS_FALSE(x) (TYPEOF(x)==LGLSXP && LENGTH(x)==1 && LOGICAL(x)[0]==FALSE)
#define IS_TRUE_OR_FALSE(x) (TYPEOF(x)==LGLSXP && LENGTH(x)==1 && LOGICAL(x)[0]!=NA_LOGICAL)
Expand Down
Loading