diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-12-14 18:20:23 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-12-21 13:23:02 +0000 |
| commit | e5eb9530ab13a174feee83a81d87bfceee37bd88 (patch) | |
| tree | 76ba0f9806f6ad369cacb9c0e9b408fc0a8ba721 /Zend/zend_API.c | |
| parent | e20cbdbe97cbda010fd386cb35a474aa255cd7f6 (diff) | |
| download | php-git-e5eb9530ab13a174feee83a81d87bfceee37bd88.tar.gz | |
Use "float" and "integer" in typehint and zpp errors
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index f62fab1b87..f6fcd356f5 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -168,7 +168,7 @@ ZEND_API char *zend_get_type_by_const(int type) /* {{{ */ case IS_LONG: return "integer"; case IS_DOUBLE: - return "double"; + return "float"; case IS_STRING: return "string"; case IS_OBJECT: @@ -400,16 +400,16 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons int type; if ((type = is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), p, &d, -1)) == 0) { - return "long"; + return "integer"; } else if (type == IS_DOUBLE) { if (zend_isnan(d)) { - return "long"; + return "integer"; } if (!ZEND_DOUBLE_FITS_LONG(d)) { if (c == 'L') { *p = (d > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; } else { - return "long"; + return "integer"; } break; } @@ -421,13 +421,13 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons case IS_DOUBLE: if (zend_isnan(Z_DVAL_P(arg))) { - return "long"; + return "integer"; } if (!ZEND_DOUBLE_FITS_LONG(Z_DVAL_P(arg))) { if (c == 'L') { *p = (Z_DVAL_P(arg) > 0) ? ZEND_LONG_MAX : ZEND_LONG_MIN; } else { - return "long"; + return "integer"; } break; } @@ -443,7 +443,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons case IS_OBJECT: case IS_RESOURCE: default: - return "long"; + return "integer"; } } break; @@ -464,7 +464,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons int type; if ((type = is_numeric_string(Z_STRVAL_P(arg), Z_STRLEN_P(arg), &l, p, -1)) == 0) { - return "double"; + return "float"; } else if (type == IS_LONG) { *p = (double) l; } @@ -484,7 +484,7 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons case IS_OBJECT: case IS_RESOURCE: default: - return "double"; + return "float"; } } break; |