Skip to content

Making things a little bit faster #458

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

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Making things a little bit faster #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7a72ec9
implement fix for #445
pachadotdev May 9, 2025
fcb7756
only one cstdlib in data_frame.hpp
pachadotdev May 9, 2025
012e4e0
use inline constexpr for doubles/integers/list/logicals/strings
pachadotdev May 9, 2025
2be6542
use noexcept in protect/sexp
pachadotdev May 9, 2025
91c3bd4
noexcept in operator SEXP (attribute proxy)
pachadotdev May 9, 2025
472f40f
+ noexcept
pachadotdev May 9, 2025
4209cf0
clang format
pachadotdev May 9, 2025
b0b3f47
rollback noexcept
pachadotdev May 9, 2025
8fdaaef
clang format
pachadotdev May 9, 2025
a80ae91
fix typos
pachadotdev May 9, 2025
ff8e314
fix r_Vector
pachadotdev May 9, 2025
f7fd0e0
fix strings
pachadotdev May 9, 2025
e0229d5
rollback strings
pachadotdev May 9, 2025
ddf5300
rollback strings
pachadotdev May 9, 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
3 changes: 1 addition & 2 deletions inst/include/cpp11/data_frame.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include <cstdlib> // for abs
#include <cstdlib>
#include <cstdlib> // for abs
#include <initializer_list> // for initializer_list
#include <string> // for string, basic_string
#include <utility> // for move
Expand Down
2 changes: 1 addition & 1 deletion inst/include/cpp11/external_pointer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class external_pointer {

T* ptr = static_cast<T*>(R_ExternalPtrAddr(p));

if (ptr == NULL) {
if (ptr == nullptr) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion inst/include/cpp11/function.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include <string.h> // for strcmp
#include <cstring> // for std::strcmp (@pachadotdev use std qualifiers)

#include <cstdio> // for snprintf
#include <string> // for string, basic_string
Expand Down
5 changes: 4 additions & 1 deletion inst/include/cpp11/list.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ inline r_vector<SEXP>::r_vector(std::initializer_list<named_arg> il)
: cpp11::r_vector<SEXP>(safe[Rf_allocVector](VECSXP, il.size())),
capacity_(il.size()) {
unwind_protect([&] {
SEXP names = Rf_allocVector(STRSXP, capacity_);
SEXP names;
PROTECT(names = Rf_allocVector(STRSXP, capacity_));
Rf_setAttrib(data_, R_NamesSymbol, names);

auto it = il.begin();
Expand All @@ -91,6 +92,8 @@ inline r_vector<SEXP>::r_vector(std::initializer_list<named_arg> il)
SEXP name = Rf_mkCharCE(it->name(), CE_UTF8);
SET_STRING_ELT(names, i, name);
}

UNPROTECT(1);
});
}

Expand Down
5 changes: 4 additions & 1 deletion inst/include/cpp11/r_vector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,8 @@ inline r_vector<T>::r_vector(std::initializer_list<named_arg> il)
}

unwind_protect([&] {
SEXP names = Rf_allocVector(STRSXP, capacity_);
SEXP names;
PROTECT(names = Rf_allocVector(STRSXP, capacity_));
Rf_setAttrib(data_, R_NamesSymbol, names);

auto it = il.begin();
Expand All @@ -890,6 +891,8 @@ inline r_vector<T>::r_vector(std::initializer_list<named_arg> il)
SEXP name = Rf_mkCharCE(it->name(), CE_UTF8);
SET_STRING_ELT(names, i, name);
}

UNPROTECT(1);
});
}

Expand Down