Skip to content

Use CLEAR_ATTRIB() #394

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
DavisVaughan merged 2 commits into from
Jan 13, 2026
Merged

Use CLEAR_ATTRIB() #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d906860
Use `CLEAR_ATTRIB()`
DavisVaughan Jan 13, 2026
efb5731
NEWS bullet
DavisVaughan Jan 13, 2026
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
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# clock (development version)

* Avoid non-API `SET_ATTRIB()`.

# clock 0.7.3

* `%Y`, `%F`, `%G`, and `%c` now parse up to 4 _characters_ by default, rather
Expand Down
9 changes: 9 additions & 0 deletions src/clock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,13 @@
#define r_chr_na NA_STRING
#define r_lgl_na NA_LOGICAL

#if R_VERSION < R_Version(4, 5, 0)
static inline
void CLEAR_ATTRIB(SEXP x) {
SET_ATTRIB(x, R_NilValue);
SET_OBJECT(x, 0);
UNSET_S4_OBJECT(x);
}
#endif

#endif
6 changes: 3 additions & 3 deletions src/rcrd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ new_clock_rcrd_from_fields(SEXP fields, SEXP names, SEXP classes) {

// Clear all attributes except for `names`, as we often
// pass in other duration or time point objects as `fields`
SEXP field_names = Rf_getAttrib(fields, R_NamesSymbol);
SET_ATTRIB(fields, r_null);
SEXP field_names = PROTECT(Rf_getAttrib(fields, R_NamesSymbol));
CLEAR_ATTRIB(fields);
Rf_setAttrib(fields, R_NamesSymbol, field_names);

const r_ssize n_fields = Rf_xlength(fields);
Expand Down Expand Up @@ -54,7 +54,7 @@ new_clock_rcrd_from_fields(SEXP fields, SEXP names, SEXP classes) {
SET_VECTOR_ELT(fields, 0, field0);
}

UNPROTECT(1);
UNPROTECT(2);
return fields;
}

Expand Down