Skip to content

Commit 4ecec92

Browse files
committed
don't use names in internal data1 data structure
1 parent 10dce2a commit 4ecec92

8 files changed

+16
-44
lines changed

R/sparse_character.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ sparse_character <- function(values, positions, length, default = "") {
7171

7272
new_sparse_character <- function(values, positions, length, default) {
7373
x <- list(
74-
val = values,
75-
pos = positions,
76-
len = length,
77-
default = default
74+
values,
75+
positions,
76+
length,
77+
default
7878
)
7979

8080
.Call(ffi_altrep_new_sparse_string, x)

R/sparse_double.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ sparse_double <- function(values, positions, length, default = 0) {
8282

8383
new_sparse_double <- function(values, positions, length, default) {
8484
x <- list(
85-
val = values,
86-
pos = positions,
87-
len = length,
88-
default = default
85+
values,
86+
positions,
87+
length,
88+
default
8989
)
9090

9191
.Call(ffi_altrep_new_sparse_double, x)

R/sparse_integer.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ sparse_integer <- function(values, positions, length, default = 0L) {
8282

8383
new_sparse_integer <- function(values, positions, length, default) {
8484
x <- list(
85-
val = values,
86-
pos = positions,
87-
len = length,
88-
default = default
85+
values,
86+
positions,
87+
length,
88+
default
8989
)
9090

9191
.Call(ffi_altrep_new_sparse_integer, x)

R/sparse_logical.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ sparse_logical <- function(values, positions, length, default = FALSE) {
6969

7070
new_sparse_logical <- function(values, positions, length, default) {
7171
x <- list(
72-
val = values,
73-
pos = positions,
74-
len = length,
75-
default = default
72+
values,
73+
positions,
74+
length,
75+
default
7676
)
7777

7878
.Call(ffi_altrep_new_sparse_logical, x)

src/altrep-sparse-double.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ static SEXP altrep_sparse_double_Extract_subset(SEXP x, SEXP indx, SEXP call) {
140140
SEXP out_default = extract_default(x);
141141
SET_VECTOR_ELT(out, 3, out_default);
142142

143-
SEXP names = Rf_allocVector(STRSXP, 4);
144-
Rf_setAttrib(out, R_NamesSymbol, names);
145-
SET_STRING_ELT(names, 0, Rf_mkChar("val"));
146-
SET_STRING_ELT(names, 1, Rf_mkChar("pos"));
147-
SET_STRING_ELT(names, 2, Rf_mkChar("len"));
148-
SET_STRING_ELT(names, 3, Rf_mkChar("default"));
149-
150143
R_xlen_t i_out = 0;
151144

152145
for (R_xlen_t i = 0; i < size; ++i) {

src/altrep-sparse-integer.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ static SEXP altrep_sparse_integer_Extract_subset(SEXP x, SEXP indx, SEXP call) {
140140
SEXP out_default = extract_default(x);
141141
SET_VECTOR_ELT(out, 3, out_default);
142142

143-
SEXP names = Rf_allocVector(STRSXP, 4);
144-
Rf_setAttrib(out, R_NamesSymbol, names);
145-
SET_STRING_ELT(names, 0, Rf_mkChar("val"));
146-
SET_STRING_ELT(names, 1, Rf_mkChar("pos"));
147-
SET_STRING_ELT(names, 2, Rf_mkChar("len"));
148-
SET_STRING_ELT(names, 3, Rf_mkChar("default"));
149-
150143
R_xlen_t i_out = 0;
151144

152145
for (R_xlen_t i = 0; i < size; ++i) {

src/altrep-sparse-logical.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,13 +140,6 @@ static SEXP altrep_sparse_logical_Extract_subset(SEXP x, SEXP indx, SEXP call) {
140140
SEXP out_default = extract_default(x);
141141
SET_VECTOR_ELT(out, 3, out_default);
142142

143-
SEXP names = Rf_allocVector(STRSXP, 4);
144-
Rf_setAttrib(out, R_NamesSymbol, names);
145-
SET_STRING_ELT(names, 0, Rf_mkChar("val"));
146-
SET_STRING_ELT(names, 1, Rf_mkChar("pos"));
147-
SET_STRING_ELT(names, 2, Rf_mkChar("len"));
148-
SET_STRING_ELT(names, 3, Rf_mkChar("default"));
149-
150143
R_xlen_t i_out = 0;
151144

152145
for (R_xlen_t i = 0; i < size; ++i) {

src/altrep-sparse-string.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,6 @@ static SEXP altrep_sparse_string_Extract_subset(SEXP x, SEXP indx, SEXP call) {
137137
SEXP out_default = extract_default(x);
138138
SET_VECTOR_ELT(out, 3, out_default);
139139

140-
SEXP names = Rf_allocVector(STRSXP, 4);
141-
Rf_setAttrib(out, R_NamesSymbol, names);
142-
SET_STRING_ELT(names, 0, Rf_mkChar("val"));
143-
SET_STRING_ELT(names, 1, Rf_mkChar("pos"));
144-
SET_STRING_ELT(names, 2, Rf_mkChar("len"));
145-
SET_STRING_ELT(names, 3, Rf_mkChar("default"));
146-
147140
R_xlen_t i_out = 0;
148141

149142
for (R_xlen_t i = 0; i < size; ++i) {

0 commit comments

Comments
 (0)