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

Fix PHP backend for default_args testcase

Browse source
This commit is contained in:
Olly Betts 2015-01-14 10:44:54 +13:00
commit ea5be4e508
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/Modules/php.cxx
View file

@ -1284,7 +1284,8 @@ public:
case T_SCHAR: case T_SCHAR:
case T_SHORT: case T_SHORT:
case T_INT: case T_INT:
case T_LONG: { case T_LONG:
case T_LONGLONG: {
char *p; char *p;
errno = 0; errno = 0;
long n = strtol(Char(value), &p, 0); long n = strtol(Char(value), &p, 0);
@ -1298,7 +1299,8 @@ public:
case T_UCHAR: case T_UCHAR:
case T_USHORT: case T_USHORT:
case T_UINT: case T_UINT:
case T_ULONG: { case T_ULONG:
case T_ULONGLONG: {
char *p; char *p;
errno = 0; errno = 0;
unsigned int n = strtoul(Char(value), &p, 0); unsigned int n = strtoul(Char(value), &p, 0);
@ -1310,7 +1312,8 @@ public:
break; break;
} }
case T_FLOAT: case T_FLOAT:
case T_DOUBLE:{ case T_DOUBLE:
case T_LONGDOUBLE: {
char *p; char *p;
errno = 0; errno = 0;
/* FIXME: strtod is locale dependent... */ /* FIXME: strtod is locale dependent... */
@ -1329,13 +1332,6 @@ public:
} }
break; break;
} }
case T_REFERENCE:
case T_RVALUE_REFERENCE:
case T_USER:
case T_ARRAY:
Clear(value);
Append(value, "?");
break;
case T_STRING: case T_STRING:
if (Len(value) < 2) { if (Len(value) < 2) {
// How can a string (including "" be less than 2 characters?) // How can a string (including "" be less than 2 characters?)
@ -1384,6 +1380,11 @@ public:
} }
break; break;
} }
default:
/* Safe default */
Clear(value);
Append(value, "?");
break;
} }
if (!arg_values[argno]) { if (!arg_values[argno]) {