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

Support for %csconstvalue added (better compile time constants)

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5999 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-06-27 20:56:54 +00:00
commit 56182e04f1
1 changed files with 38 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

25
SWIG/Source/Modules/csharp.cxx
View file

@ -945,9 +945,13 @@ class CSHARP : public Language {
if (!Getattr(n,"_last")) // Only the first enum item has this attribute set if (!Getattr(n,"_last")) // Only the first enum item has this attribute set
Printf(enum_code, ",\n"); Printf(enum_code, ",\n");
Printf(enum_code, " %s", symname); Printf(enum_code, " %s", symname);
if (Getattr(n,"enumvalue")) {
// Check for the %csconstvalue feature
String *value = Getattr(n,"feature:cs:constvalue");
// Note that the enum value must be a true constant and cannot be set from a PINVOKE call, thus no support for %csconst(0) // Note that the enum value must be a true constant and cannot be set from a PINVOKE call, thus no support for %csconst(0)
String *value = Getattr(n,"enumvalue"); value = value ? value : Getattr(n,"enumvalue");
if (value) {
Printf(enum_code, " = %s", value); Printf(enum_code, " = %s", value);
} }
} else { } else {
@ -1001,7 +1005,8 @@ class CSHARP : public Language {
* Also for inline initialised const static primitive type member variables (short, int, double, enums etc). * Also for inline initialised const static primitive type member variables (short, int, double, enums etc).
* C# static const variables are generated for these. * C# static const variables are generated for these.
* If the %csconst(1) feature is used then the C constant value is used to initialise the C# const variable. * If the %csconst(1) feature is used then the C constant value is used to initialise the C# const variable.
* If not, a PINVOKE method is generated to get the C constant value for intialisation of the C# const variable. * If not, a PINVOKE method is generated to get the C constant value for initialisation of the C# const variable.
* However, if the %csconstvalue feature is used, it overrides all other ways to generate the initialisation.
* Also note that this method might be called for wrapping enum items (when the enum is using %csconst(0)). * Also note that this method might be called for wrapping enum items (when the enum is using %csconst(0)).
* ------------------------------------------------------------------------ */ * ------------------------------------------------------------------------ */
@ -1058,7 +1063,12 @@ class CSHARP : public Language {
const String *itemname = (proxy_flag && wrapping_member_flag) ? variable_name : symname; const String *itemname = (proxy_flag && wrapping_member_flag) ? variable_name : symname;
Printf(constants_code, " public %s %s %s = ", (const_feature_flag ? "const" : "static readonly"), return_type, itemname); Printf(constants_code, " public %s %s %s = ", (const_feature_flag ? "const" : "static readonly"), return_type, itemname);
if (!const_feature_flag) { // Check for the %csconstvalue feature
String *value = Getattr(n,"feature:cs:constvalue");
if (value) {
Printf(constants_code, "%s;\n", value);
} else if (!const_feature_flag) {
// Default enum and constant handling will work with any type of C constant and initialises the C# variable from C through a PINVOKE call. // Default enum and constant handling will work with any type of C constant and initialises the C# variable from C through a PINVOKE call.
if(classname_substituted_flag) { if(classname_substituted_flag) {
@ -2062,13 +2072,17 @@ class CSHARP : public Language {
* class call to obtain the enum value. The intermediary class and PINVOKE methods to obtain * class call to obtain the enum value. The intermediary class and PINVOKE methods to obtain
* the enum value will be generated. Otherwise the C/C++ enum value will be used if there * the enum value will be generated. Otherwise the C/C++ enum value will be used if there
* is one and hopefully it will compile as C# code - e.g. 20 as in: enum E{e=20}; * is one and hopefully it will compile as C# code - e.g. 20 as in: enum E{e=20};
* The %csconstvalue feature overrides all other ways to generate the constant value.
* The caller must delete memory allocated for the returned string. * The caller must delete memory allocated for the returned string.
* ------------------------------------------------------------------------ */ * ------------------------------------------------------------------------ */
String *enumValue(Node *n) { String *enumValue(Node *n) {
String *symname = Getattr(n,"sym:name"); String *symname = Getattr(n,"sym:name");
String *value = NULL;
// Check for the %csconstvalue feature
String *value = Getattr(n,"feature:cs:constvalue");
if (!value) {
// The %csconst feature determines how the constant value is obtained // The %csconst feature determines how the constant value is obtained
String *const_feature = Getattr(n,"feature:cs:const"); String *const_feature = Getattr(n,"feature:cs:const");
bool const_feature_flag = const_feature && Cmp(const_feature, "0") != 0; bool const_feature_flag = const_feature && Cmp(const_feature, "0") != 0;
@ -2088,6 +2102,7 @@ class CSHARP : public Language {
value = NewStringf("%s.%s()", imclass_name, Swig_name_get(Swig_name_member(proxy_class_name, symname))); value = NewStringf("%s.%s()", imclass_name, Swig_name_get(Swig_name_member(proxy_class_name, symname)));
} }
} }
}
return value; return value;
} }