XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for closing off C# property declaration 

Consistently handle variables as constants or as variable wrappers
to match code in Language::staticmembervariableHandler(). This fixes
the following:

  #define constexpr
  %immutable Foo::Constant;
  struct Foo {
      static size_t constexpr ConstantA = 22;
      static constexpr size_t ConstantB = 64;
  };

which is actually invalid C++, but being done to workaround a SWIG
parser limitation for parsing ConstantA (ConstantB is okay) if constexpr
is left in.

Closes #2573
This commit is contained in:
William S Fulton 2023-11-17 07:25:06 +00:00
parent 3ce0174a0c
commit 7b4e562dc1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Modules/csharp.cxx
View File

@ -2647,6 +2647,8 @@ public:
const String *methodmods = Getattr(n, "feature:cs:methodmodifiers");
if (!methodmods)
methodmods = (is_public(n) ? public_string : protected_string);
// Start property declaration
Printf(proxy_class_code, " %s %s%s %s {", methodmods, static_flag ? "static " : "", variable_type, variable_name);
}
generate_property_declaration_flag = false;
@ -2949,6 +2951,7 @@ public:
variable_wrapper_flag = false;
generate_property_declaration_flag = false;
// End property declaration
Printf(proxy_class_code, "\n }\n\n");
return SWIG_OK;
@ -2960,8 +2963,6 @@ public:
virtual int staticmembervariableHandler(Node *n) {
bool static_const_member_flag = (Getattr(n, "value") == 0);
generate_property_declaration_flag = true;
variable_name = Getattr(n, "sym:name");
wrapping_member_flag = true;
@ -2971,8 +2972,10 @@ public:
static_flag = false;
generate_property_declaration_flag = false;
if (static_const_member_flag)
if (!GetFlag(n, "wrappedasconstant")) {
// End property declaration
Printf(proxy_class_code, "\n }\n\n");
}
return SWIG_OK;
}