jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't mark as "noassign" when a variable is immutable

Browse source 
I had assumed member variables could only be noassign by being "const",
but I had forgotten about the `%immutable` keyword being applied via
SWIG.
This commit is contained in:
Seth R Johnson 2022-02-04 13:57:08 -05:00
commit 5a2656ab80
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/test-suite/cpp_basic.i
View file

@ -80,6 +80,12 @@ private:
*/ */
}; };
// This class is valid C++ but cannot be assigned to.
struct JustConstMemberData {
explicit JustConstMemberData(int i_inp) : i(i_inp) {}
const int i;
};
%} %}
%{ %{

5
Source/Modules/allocate.cxx
View file

@ -781,10 +781,7 @@ Allocate():
Setattr(n, "cplus:staticbase", inclass); Setattr(n, "cplus:staticbase", inclass);
} else if (Cmp(Getattr(n, "kind"), "variable") == 0) { } else if (Cmp(Getattr(n, "kind"), "variable") == 0) {
/* Check member variable to determine whether assignment is valid */ /* Check member variable to determine whether assignment is valid */
if (GetFlag(n, "feature:immutable")) { if (SwigType_isreference(Getattr(n, "type"))) {
/* Can't assign a class with an immutable member variable */
Setattr(inclass, "allocate:noassign", "1");
} else if (SwigType_isreference(Getattr(n, "type"))) {
/* Can't assign a class with reference member data */ /* Can't assign a class with reference member data */
Setattr(inclass, "allocate:noassign", "1"); Setattr(inclass, "allocate:noassign", "1");
} }