Improve nullptr constant wrapping

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-matevz@13842 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2012-09-20 19:09:38 +00:00
commit ecac2d2a68
6 changed files with 13 additions and 7 deletions

View file

@ -390,7 +390,7 @@ public:
Append(decl_str, tex_name);
if (value) {
if (Strcmp(value, "NULL") == 0)
if (Strcmp(value, "NULL") == 0 || Strcmp(value, "nullptr") == 0)
value = NewString("nil");
else if (Strcmp(value, "true") == 0 || Strcmp(value, "TRUE") == 0)
value = NewString("true");

View file

@ -1345,6 +1345,7 @@ public:
}
}
if (Strcmp(value, "NULL") == 0 ||
Strcmp(value, "nullptr") == 0 ||
Strcmp(value, "0") == 0 ||
Strcmp(value, "0L") == 0) {
Clear(value);

View file

@ -1444,7 +1444,7 @@ public:
return NewString("True");
if (Strcmp(v, "false")==0 || Strcmp(v, "FALSE")==0)
return NewString("False");
if (Strcmp(v, "NULL")==0)
if (Strcmp(v, "NULL")==0 || Strcmp(v, "nullptr")==0)
return NewString("None");
}
return 0;

View file

@ -384,7 +384,7 @@ private:
}
if (value) {
if (Strcmp(value, "NULL") == 0)
if (Strcmp(value, "NULL") == 0 || Strcmp(value, "nullptr") == 0)
value = NewString("nil");
else if (Strcmp(value, "true") == 0 || Strcmp(value, "TRUE") == 0)
value = NewString("true");