Skip to content

Commit 3a3ff1e

Browse files
pachadotdevpachadotdev
committed
Merge pull request #14 from pachadotdev/matrix_attr
Matrix attr
1 parent 12bec70 commit 3a3ff1e

File tree

2 files changed

+7
-99
lines changed

2 files changed

+7
-99
lines changed

‎cpp11test/src/cpp11.cpp‎

Lines changed: 5 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,6 @@ extern "C" SEXP _cpp11test_grow_(SEXP n) {
166166
return cpp11::as_sexp(grow_(cpp11::as_cpp<cpp11::decay_t<R_xlen_t>>(n)));
167167
END_CPP11
168168
}
169-
// grow.cpp
170-
cpp11::writable::complexes grow_cplx_(R_xlen_t n);
171-
extern "C" SEXP _cpp11test_grow_cplx_(SEXP n) {
172-
BEGIN_CPP11
173-
return cpp11::as_sexp(grow_cplx_(cpp11::as_cpp<cpp11::decay_t<R_xlen_t>>(n)));
174-
END_CPP11
175-
}
176169
// insert.cpp
177170
SEXP cpp11_insert_(SEXP num_sxp);
178171
extern "C" SEXP _cpp11test_cpp11_insert_(SEXP num_sxp) {
@@ -506,69 +499,6 @@ extern "C" SEXP _cpp11test_sum_dbl_accumulate2_(SEXP x_sxp) {
506499
return cpp11::as_sexp(sum_dbl_accumulate2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
507500
END_CPP11
508501
}
509-
// sum.cpp
510-
cpp11::r_complex sum_cplx_for_(cpp11::complexes x);
511-
extern "C" SEXP _cpp11test_sum_cplx_for_(SEXP x) {
512-
BEGIN_CPP11
513-
return cpp11::as_sexp(sum_cplx_for_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
514-
END_CPP11
515-
}
516-
// sum.cpp
517-
cpp11::complexes sum_cplx_for_2_(cpp11::complexes x);
518-
extern "C" SEXP _cpp11test_sum_cplx_for_2_(SEXP x) {
519-
BEGIN_CPP11
520-
return cpp11::as_sexp(sum_cplx_for_2_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
521-
END_CPP11
522-
}
523-
// sum.cpp
524-
std::complex<double> sum_cplx_for_3_(cpp11::complexes x_sxp);
525-
extern "C" SEXP _cpp11test_sum_cplx_for_3_(SEXP x_sxp) {
526-
BEGIN_CPP11
527-
return cpp11::as_sexp(sum_cplx_for_3_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x_sxp)));
528-
END_CPP11
529-
}
530-
// sum.cpp
531-
std::complex<double> sum_cplx_for_4_(SEXP x_sxp);
532-
extern "C" SEXP _cpp11test_sum_cplx_for_4_(SEXP x_sxp) {
533-
BEGIN_CPP11
534-
return cpp11::as_sexp(sum_cplx_for_4_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
535-
END_CPP11
536-
}
537-
// sum.cpp
538-
SEXP sum_cplx_for_5_(SEXP x_sxp);
539-
extern "C" SEXP _cpp11test_sum_cplx_for_5_(SEXP x_sxp) {
540-
BEGIN_CPP11
541-
return cpp11::as_sexp(sum_cplx_for_5_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
542-
END_CPP11
543-
}
544-
// sum.cpp
545-
cpp11::complexes sum_cplx_for_6_(SEXP x_sxp);
546-
extern "C" SEXP _cpp11test_sum_cplx_for_6_(SEXP x_sxp) {
547-
BEGIN_CPP11
548-
return cpp11::as_sexp(sum_cplx_for_6_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
549-
END_CPP11
550-
}
551-
// sum.cpp
552-
std::complex<double> sum_cplx_foreach_(cpp11::complexes x);
553-
extern "C" SEXP _cpp11test_sum_cplx_foreach_(SEXP x) {
554-
BEGIN_CPP11
555-
return cpp11::as_sexp(sum_cplx_foreach_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
556-
END_CPP11
557-
}
558-
// sum.cpp
559-
std::complex<double> sum_cplx_accumulate_(cpp11::complexes x);
560-
extern "C" SEXP _cpp11test_sum_cplx_accumulate_(SEXP x) {
561-
BEGIN_CPP11
562-
return cpp11::as_sexp(sum_cplx_accumulate_(cpp11::as_cpp<cpp11::decay_t<cpp11::complexes>>(x)));
563-
END_CPP11
564-
}
565-
// sum.cpp
566-
std::complex<double> sum_cplx_for2_(SEXP x_sxp);
567-
extern "C" SEXP _cpp11test_sum_cplx_for2_(SEXP x_sxp) {
568-
BEGIN_CPP11
569-
return cpp11::as_sexp(sum_cplx_for2_(cpp11::as_cpp<cpp11::decay_t<SEXP>>(x_sxp)));
570-
END_CPP11
571-
}
572502
// sum_int.cpp
573503
double sum_int_for_(cpp11::integers x);
574504
extern "C" SEXP _cpp11test_sum_int_for_(SEXP x) {
@@ -700,13 +630,12 @@ static const R_CallMethodDef CallEntries[] = {
700630
{"_cpp11test_gibbs_rcpp", (DL_FUNC) &_cpp11test_gibbs_rcpp, 2},
701631
{"_cpp11test_gibbs_rcpp2", (DL_FUNC) &_cpp11test_gibbs_rcpp2, 2},
702632
{"_cpp11test_grow_", (DL_FUNC) &_cpp11test_grow_, 1},
703-
{"_cpp11test_grow_cplx_", (DL_FUNC) &_cpp11test_grow_cplx_, 1},
704-
{"_cpp11test_grow_strings_cpp11_", (DL_FUNC) &_cpp11test_grow_strings_cpp11_, 2},
705-
{"_cpp11test_grow_strings_manual_", (DL_FUNC) &_cpp11test_grow_strings_manual_, 2},
706-
{"_cpp11test_grow_strings_rcpp_", (DL_FUNC) &_cpp11test_grow_strings_rcpp_, 2},
707633
{"_cpp11test_mat_mat_copy_dimnames", (DL_FUNC) &_cpp11test_mat_mat_copy_dimnames, 1},
708634
{"_cpp11test_mat_mat_create_dimnames", (DL_FUNC) &_cpp11test_mat_mat_create_dimnames, 0},
709635
{"_cpp11test_mat_sexp_copy_dimnames", (DL_FUNC) &_cpp11test_mat_sexp_copy_dimnames, 1},
636+
{"_cpp11test_grow_strings_cpp11_", (DL_FUNC) &_cpp11test_grow_strings_cpp11_, 2},
637+
{"_cpp11test_grow_strings_manual_", (DL_FUNC) &_cpp11test_grow_strings_manual_, 2},
638+
{"_cpp11test_grow_strings_rcpp_", (DL_FUNC) &_cpp11test_grow_strings_rcpp_, 2},
710639
{"_cpp11test_my_message", (DL_FUNC) &_cpp11test_my_message, 2},
711640
{"_cpp11test_my_message_n1", (DL_FUNC) &_cpp11test_my_message_n1, 1},
712641
{"_cpp11test_my_message_n1fmt", (DL_FUNC) &_cpp11test_my_message_n1fmt, 1},
@@ -719,12 +648,10 @@ static const R_CallMethodDef CallEntries[] = {
719648
{"_cpp11test_my_warning_n1", (DL_FUNC) &_cpp11test_my_warning_n1, 1},
720649
{"_cpp11test_my_warning_n1fmt", (DL_FUNC) &_cpp11test_my_warning_n1fmt, 1},
721650
{"_cpp11test_my_warning_n2fmt", (DL_FUNC) &_cpp11test_my_warning_n2fmt, 2},
722-
{"_cpp11test_notroxcpp1_", (DL_FUNC) &_cpp11test_notroxcpp1_, 1},
723-
{"_cpp11test_notroxcpp6_", (DL_FUNC) &_cpp11test_notroxcpp6_, 1},
724-
{"_cpp11test_nullable_extptr_1", (DL_FUNC) &_cpp11test_nullable_extptr_1, 0},
725-
{"_cpp11test_nullable_extptr_2", (DL_FUNC) &_cpp11test_nullable_extptr_2, 0},
726651
{"_cpp11test_ordered_map_to_list_", (DL_FUNC) &_cpp11test_ordered_map_to_list_, 1},
727652
{"_cpp11test_ordered_map_to_list_2_", (DL_FUNC) &_cpp11test_ordered_map_to_list_2_, 1},
653+
{"_cpp11test_nullable_extptr_1", (DL_FUNC) &_cpp11test_nullable_extptr_1, 0},
654+
{"_cpp11test_nullable_extptr_2", (DL_FUNC) &_cpp11test_nullable_extptr_2, 0},
728655
{"_cpp11test_protect_many_", (DL_FUNC) &_cpp11test_protect_many_, 1},
729656
{"_cpp11test_protect_many_cpp11_", (DL_FUNC) &_cpp11test_protect_many_cpp11_, 1},
730657
{"_cpp11test_protect_many_preserve_", (DL_FUNC) &_cpp11test_protect_many_preserve_, 1},
@@ -750,15 +677,6 @@ static const R_CallMethodDef CallEntries[] = {
750677
{"_cpp11test_roxcpp7_", (DL_FUNC) &_cpp11test_roxcpp7_, 1},
751678
{"_cpp11test_string_proxy_assignment_", (DL_FUNC) &_cpp11test_string_proxy_assignment_, 0},
752679
{"_cpp11test_string_push_back_", (DL_FUNC) &_cpp11test_string_push_back_, 0},
753-
{"_cpp11test_sum_cplx_accumulate_", (DL_FUNC) &_cpp11test_sum_cplx_accumulate_, 1},
754-
{"_cpp11test_sum_cplx_for2_", (DL_FUNC) &_cpp11test_sum_cplx_for2_, 1},
755-
{"_cpp11test_sum_cplx_for_", (DL_FUNC) &_cpp11test_sum_cplx_for_, 1},
756-
{"_cpp11test_sum_cplx_for_2_", (DL_FUNC) &_cpp11test_sum_cplx_for_2_, 1},
757-
{"_cpp11test_sum_cplx_for_3_", (DL_FUNC) &_cpp11test_sum_cplx_for_3_, 1},
758-
{"_cpp11test_sum_cplx_for_4_", (DL_FUNC) &_cpp11test_sum_cplx_for_4_, 1},
759-
{"_cpp11test_sum_cplx_for_5_", (DL_FUNC) &_cpp11test_sum_cplx_for_5_, 1},
760-
{"_cpp11test_sum_cplx_for_6_", (DL_FUNC) &_cpp11test_sum_cplx_for_6_, 1},
761-
{"_cpp11test_sum_cplx_foreach_", (DL_FUNC) &_cpp11test_sum_cplx_foreach_, 1},
762680
{"_cpp11test_sum_dbl_accumulate2_", (DL_FUNC) &_cpp11test_sum_dbl_accumulate2_, 1},
763681
{"_cpp11test_sum_dbl_accumulate_", (DL_FUNC) &_cpp11test_sum_dbl_accumulate_, 1},
764682
{"_cpp11test_sum_dbl_for2_", (DL_FUNC) &_cpp11test_sum_dbl_for2_, 1},

‎cpp11test/src/matrix.cpp‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,8 @@ using namespace Rcpp;
143143
out(1, 1) = 4;
144144

145145
cpp11::writable::list dimnames(2);
146-
{
147-
cpp11::writable::strings _tmp;
148-
_tmp.push_back("a");
149-
_tmp.push_back("b");
150-
dimnames[0] = _tmp;
151-
}
152-
{
153-
cpp11::writable::strings _tmp;
154-
_tmp.push_back("c");
155-
_tmp.push_back("d");
156-
dimnames[1] = _tmp;
157-
}
146+
dimnames[0] = cpp11::strings({"a", "b"});
147+
dimnames[1] = cpp11::strings({"c", "d"});
158148

159149
out.attr("dimnames") = dimnames;
160150

0 commit comments

Comments
 (0)