@@ -95,7 +95,7 @@ static R_INLINE SEXP VECTOR_ELT_FIX_NAMED(SEXP y, R_xlen_t i) {
95
95
96
96
#define EXTRACT_SUBSET_LOOP (PTR , STDCODEPTR , STDCODENOPTR , NACODE ) do { \
97
97
PTR; \
98
- if (px != NULL) { \
98
+ if (px != NULL) { \
99
99
EXTRACT_SUBSET_LOOP_(STDCODEPTR, NACODE); \
100
100
} else { \
101
101
/* Fallback `ELT()` based path used for ALTREP classes */ \
@@ -146,35 +146,35 @@ attribute_hidden SEXP ExtractSubset(SEXP x, SEXP indx, SEXP call)
146
146
switch (mode ) {
147
147
case LGLSXP :
148
148
EXTRACT_SUBSET_LOOP (const int * px = (const int * ) DATAPTR_OR_NULL (x ),
149
- LOGICAL0 (result )[i ] = px [ii ],
150
- LOGICAL0 (result )[i ] = LOGICAL_ELT (x , ii ),
149
+ LOGICAL0 (result )[i ] = px [ii ],
150
+ LOGICAL0 (result )[i ] = LOGICAL_ELT (x , ii ),
151
151
LOGICAL0 (result )[i ] = NA_LOGICAL );
152
152
break ;
153
153
case INTSXP :
154
154
EXTRACT_SUBSET_LOOP (const int * px = (const int * ) DATAPTR_OR_NULL (x ),
155
- INTEGER0 (result )[i ] = px [ii ],
156
- INTEGER0 (result )[i ] = INTEGER_ELT (x , ii ),
155
+ INTEGER0 (result )[i ] = px [ii ],
156
+ INTEGER0 (result )[i ] = INTEGER_ELT (x , ii ),
157
157
INTEGER0 (result )[i ] = NA_INTEGER );
158
158
break ;
159
159
case REALSXP :
160
160
EXTRACT_SUBSET_LOOP (const double * px = (const double * ) DATAPTR_OR_NULL (x ),
161
- REAL0 (result )[i ] = px [ii ],
162
- REAL0 (result )[i ] = REAL_ELT (x , ii ),
161
+ REAL0 (result )[i ] = px [ii ],
162
+ REAL0 (result )[i ] = REAL_ELT (x , ii ),
163
163
REAL0 (result )[i ] = NA_REAL );
164
164
break ;
165
165
case CPLXSXP :
166
166
{
167
167
Rcomplex NA_CPLX = { .r = NA_REAL , .i = NA_REAL };
168
168
EXTRACT_SUBSET_LOOP (const Rcomplex * px = (const Rcomplex * ) DATAPTR_OR_NULL (x ),
169
- COMPLEX0 (result )[i ] = px [ii ],
170
- COMPLEX0 (result )[i ] = COMPLEX_ELT (x , ii ),
171
- COMPLEX0 (result )[i ] = NA_CPLX );
169
+ COMPLEX0 (result )[i ] = px [ii ],
170
+ COMPLEX0 (result )[i ] = COMPLEX_ELT (x , ii ),
171
+ COMPLEX0 (result )[i ] = NA_CPLX );
172
172
}
173
173
break ;
174
174
case STRSXP :
175
175
EXTRACT_SUBSET_LOOP (const SEXP * px = (const SEXP * ) DATAPTR_OR_NULL (x ),
176
- SET_STRING_ELT (result , i , px [ii ]),
177
- SET_STRING_ELT (result , i , STRING_ELT (x , ii )),
176
+ SET_STRING_ELT (result , i , px [ii ]),
177
+ SET_STRING_ELT (result , i , STRING_ELT (x , ii )),
178
178
SET_STRING_ELT (result , i , NA_STRING ));
179
179
break ;
180
180
case VECSXP :
@@ -183,9 +183,9 @@ attribute_hidden SEXP ExtractSubset(SEXP x, SEXP indx, SEXP call)
183
183
/* case and use `DATAPTR_OR_NULL()` there too. Currently it never */
184
184
/* takes the `px[ii]` path - DV. */
185
185
EXTRACT_SUBSET_LOOP (const SEXP * px = NULL ,
186
- SET_VECTOR_ELT (result , i , px [ii ]),
187
- SET_VECTOR_ELT (result , i , VECTOR_ELT_FIX_NAMED (x , ii )),
188
- SET_VECTOR_ELT (result , i , R_NilValue ));
186
+ SET_VECTOR_ELT (result , i , px [ii ]),
187
+ SET_VECTOR_ELT (result , i , VECTOR_ELT_FIX_NAMED (x , ii )),
188
+ SET_VECTOR_ELT (result , i , R_NilValue ));
189
189
break ;
190
190
case RAWSXP :
191
191
EXTRACT_SUBSET_LOOP (const Rbyte * px = (const Rbyte * ) DATAPTR_OR_NULL (x ),
0 commit comments