Skip to content

add template specializations to avoid DATAPTR use #1310

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
eddelbuettel merged 15 commits into from
Jun 22, 2024
Merged

add template specializations to avoid DATAPTR use #1310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
936c19b
add template specializations to avoid DATAPTR use
kevinushey Jun 11, 2024
d48a6ed
also implement bounds checking in vector access
kevinushey Jun 11, 2024
84c885a
tweak error message
kevinushey Jun 11, 2024
3addbc9
add tests; implement bounds check for proxy
kevinushey Jun 11, 2024
394e220
finish NEWS
kevinushey Jun 11, 2024
c8c3a5c
don't check index when constructing iterators
kevinushey Jun 11, 2024
1d7ce1b
avoid invoking wrong 'get'
kevinushey Jun 11, 2024
4c8df0c
don't pass 'ncpus'
kevinushey Jun 11, 2024
2520e51
finish NEWS
kevinushey Jun 11, 2024
528f453
test tweaks
kevinushey Jun 11, 2024
69cb4dd
Small robustification for package version check during dev cycle
eddelbuettel Jun 12, 2024
bc529e0
use warning instead of stop
kevinushey Jun 18, 2024
d412e22
update NEWS
kevinushey Jun 18, 2024
3f4d5df
NEWS once more
kevinushey Jun 18, 2024
c1ca0bb
fixup for check_indices in subsetter
kevinushey Jun 18, 2024
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
Prev Previous commit
Next Next commit
also implement bounds checking in vector access
  • Loading branch information
@kevinushey
kevinushey committed Jun 11, 2024
commit d48a6ed7765c2703bba833bb6a5566302128bc30
2 changes: 2 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

* inst/include/Rcpp/internal/r_vector.h: Use template specializations to
avoid DATAPTR usage
* inst/include/Rcpp/vector/traits.h: Implement bounds checks in
r_vector_cache access

2024-06-02 Dirk Eddelbuettel <edd@debian.org>

Expand Down
53 changes: 45 additions & 8 deletions inst/include/Rcpp/vector/traits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,59 @@ namespace traits{
typedef typename r_vector_const_proxy<RTYPE>::type const_proxy ;
typedef typename storage_type<RTYPE>::type storage_type ;

r_vector_cache() : start(0){} ;
r_vector_cache() : start(0), size(0) {} ;

inline void update( const VECTOR& v ) {
start = ::Rcpp::internal::r_vector_start<RTYPE>(v) ;
start = ::Rcpp::internal::r_vector_start<RTYPE>(v) ;
size = v.size();
}

inline iterator get() const { return start; }
inline const_iterator get_const() const { return start; }

inline proxy ref() { return *start ;}
inline proxy ref(R_xlen_t i) { return start[i] ; }
inline proxy ref() {
#ifndef RCPP_NO_BOUNDS_CHECK
check_index(0) ;
#endif
return start[0];
}

inline proxy ref() const {
#ifndef RCPP_NO_BOUNDS_CHECK
check_index(0) ;
#endif
return start[0] ;
}

inline proxy ref(R_xlen_t i) {
#ifndef RCPP_NO_BOUNDS_CHECK
check_index(i) ;
#endif
return start[i] ;
}

inline proxy ref() const { return *start ;}
inline proxy ref(R_xlen_t i) const { return start[i] ; }

private:
iterator start ;
inline proxy ref(R_xlen_t i) const {
#ifndef RCPP_NO_BOUNDS_CHECK
check_index(i) ;
#endif
return start[i] ;
}

private:

#ifndef RCPP_NO_BOUNDS_CHECK
void check_index(R_xlen_t i) const {
if (i >= size) {
stop("index error");
}
}
#endif

iterator start ;
R_xlen_t size ;
} ;

template <int RTYPE, template <class> class StoragePolicy = PreserveStorage>
class proxy_cache{
public:
Expand Down