Skip to content

Commit 5308aa7

Browse files
authored
return *this from the free-getter, member-setter property() overload (#1520)
* return *this from the free-getter, member-setter property() overload * separate changelog entries after merge
1 parent 39af520 commit 5308aa7

4 files changed

Lines changed: 63 additions & 0 deletions

File tree

‎ChangeLog‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
2026-10-29 Kevin Ushey <kevinushey@gmail.com>
22

3+
* inst/include/Rcpp/module/Module_Add_Property.h: Return *this from
4+
the property() overload taking a free-function getter and a member
5+
function setter, which fell off the end and trapped at module load
6+
(#1519)
7+
* inst/tinytest/cpp/Module.cpp: Expose one property per property()
8+
overload
9+
* inst/tinytest/test_module.R: Test them
10+
311
* src/module.cpp (InternalFunction_invoke): Raise an error when fewer
412
arguments are supplied than the arity stored in the function pointer's
513
tag, instead of reading the missing ones from uninitialized memory

‎inst/include/Rcpp/module/Module_Add_Property.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
name_,
8484
new CppProperty_GetPointer_SetMethod<Class,PROP>(GetMethod, SetMethod, docstring)
8585
) ;
86+
return *this ;
8687
}
8788

8889
template <typename PROP>

‎inst/tinytest/cpp/Module.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,24 @@ class ModuleNum{
8989
int y;
9090
};
9191

92+
class ModuleProperties {
93+
public:
94+
ModuleProperties() : value(0.0) {}
95+
96+
double get() { return value; }
97+
double get_const() const { return value; }
98+
void set(double value_) { value = value_; }
99+
100+
double value;
101+
};
102+
103+
double ModuleProperties_get(ModuleProperties* p) {
104+
return p->value;
105+
}
106+
void ModuleProperties_set(ModuleProperties* p, double value) {
107+
p->value = value;
108+
}
109+
92110
class ModuleNumber{
93111
public:
94112
ModuleNumber() : x(0.0), y(0) {};
@@ -197,6 +215,21 @@ RCPP_MODULE(demoModule) {
197215
.property("y", &ModuleNum::getY)
198216
;
199217

218+
// one property per class_::property() overload: getters are member,
219+
// const member or free functions, setters are member or free functions
220+
class_<ModuleProperties>("ModuleProperties")
221+
.constructor()
222+
.property("get", &ModuleProperties::get)
223+
.property("get_const", &ModuleProperties::get_const)
224+
.property("get_free", &ModuleProperties_get, "free getter")
225+
.property("get_set", &ModuleProperties::get, &ModuleProperties::set)
226+
.property("get_const_set", &ModuleProperties::get_const, &ModuleProperties::set)
227+
.property("get_set_free", &ModuleProperties::get, &ModuleProperties_set)
228+
.property("get_const_set_free", &ModuleProperties::get_const, &ModuleProperties_set)
229+
.property("get_free_set", &ModuleProperties_get, &ModuleProperties::set)
230+
.property("get_free_set_free", &ModuleProperties_get, &ModuleProperties_set)
231+
;
232+
200233
class_<ModuleNumber>("ModuleNumber")
201234

202235
.constructor()

‎inst/tinytest/test_module.R‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,27 @@ expect_equal( w$x, 2.0 )
100100

101101
expect_error( { w$y <- 3 } )
102102

103+
## every class_::property() overload; the free getter + member setter one
104+
## did not return *this, which aborted loading the whole module (#1519)
105+
p <- new( ModuleProperties )
106+
p$get_set <- 1.0
107+
expect_equal( p$get_set, 1.0 )
108+
p$get_const_set <- 2.0
109+
expect_equal( p$get_const_set, 2.0 )
110+
p$get_set_free <- 3.0
111+
expect_equal( p$get_set_free, 3.0 )
112+
p$get_const_set_free <- 4.0
113+
expect_equal( p$get_const_set_free, 4.0 )
114+
p$get_free_set <- 5.0
115+
expect_equal( p$get_free_set, 5.0 )
116+
p$get_free_set_free <- 6.0
117+
expect_equal( p$get_free_set_free, 6.0 )
118+
119+
expect_equal( c(p$get, p$get_const, p$get_free), c(6.0, 6.0, 6.0) )
120+
expect_error( { p$get <- 7.0 } )
121+
expect_error( { p$get_const <- 7.0 } )
122+
expect_error( { p$get_free <- 7.0 } )
123+
103124
# test.Module.member <- function(){
104125
w <- new( ModuleNumber )
105126
expect_equal( w$x, 0.0 )

0 commit comments

Comments
 (0)