mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
11accb5cdf
* Include from build dir first
This fixes out of tree builds by ensuring that configure artifacts are included
from the build dir.
Before, out of tree builds would preferably include files from the src dir, as
the include path was defined as follows (ignoring includes from ext/ and sapi/) :
-I$(top_builddir)/main
-I$(top_srcdir)
-I$(top_builddir)/TSRM
-I$(top_builddir)/Zend
-I$(top_srcdir)/main
-I$(top_srcdir)/Zend
-I$(top_srcdir)/TSRM
-I$(top_builddir)/
As a result, an out of tree build would include configure artifacts such as
`main/php_config.h` from the src dir.
After this change, the include path is defined as follows:
-I$(top_builddir)/main
-I$(top_builddir)
-I$(top_srcdir)/main
-I$(top_srcdir)
-I$(top_builddir)/TSRM
-I$(top_builddir)/Zend
-I$(top_srcdir)/Zend
-I$(top_srcdir)/TSRM
* Fix extension include path for out of tree builds
* Include config.h with the brackets form
`#include "config.h"` searches in the directory containing the including-file
before any other include path. This can include the wrong config.h when building
out of tree and a config.h exists in the source tree.
Using `#include <config.h>` uses exclusively the include path, and gives
priority to the build dir.
181 lines
6.3 KiB
C
181 lines
6.3 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| https://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Stanislav Malyshev <stas@zend.com> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include "php_intl.h"
|
|
|
|
#include <unicode/ustring.h>
|
|
|
|
#include "formatter_class.h"
|
|
#include "formatter_format.h"
|
|
#include "intl_convert.h"
|
|
|
|
/* {{{ Format a number. */
|
|
PHP_FUNCTION( numfmt_format )
|
|
{
|
|
zval *number;
|
|
zend_long type = FORMAT_TYPE_DEFAULT;
|
|
UChar format_buf[32];
|
|
UChar* formatted = format_buf;
|
|
int32_t formatted_len = USIZE(format_buf);
|
|
FORMATTER_METHOD_INIT_VARS;
|
|
|
|
/* Parse parameters. */
|
|
if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "On|l",
|
|
&object, NumberFormatter_ce_ptr, &number, &type ) == FAILURE )
|
|
{
|
|
RETURN_THROWS();
|
|
}
|
|
|
|
/* Fetch the object. */
|
|
FORMATTER_METHOD_FETCH_OBJECT;
|
|
|
|
if(type == FORMAT_TYPE_DEFAULT) {
|
|
switch(Z_TYPE_P(number)) {
|
|
case IS_LONG:
|
|
/* take INT32 on 32-bit, int64 on 64-bit */
|
|
type = (sizeof(zend_long) == 8)?FORMAT_TYPE_INT64:FORMAT_TYPE_INT32;
|
|
break;
|
|
case IS_DOUBLE:
|
|
type = FORMAT_TYPE_DOUBLE;
|
|
break;
|
|
EMPTY_SWITCH_DEFAULT_CASE();
|
|
}
|
|
}
|
|
|
|
switch(type) {
|
|
case FORMAT_TYPE_INT32:
|
|
convert_to_long(number);
|
|
formatted_len = unum_format(FORMATTER_OBJECT(nfo), (int32_t)Z_LVAL_P(number),
|
|
formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
if (INTL_DATA_ERROR_CODE(nfo) == U_BUFFER_OVERFLOW_ERROR) {
|
|
intl_error_reset(INTL_DATA_ERROR_P(nfo));
|
|
formatted = eumalloc(formatted_len);
|
|
formatted_len = unum_format(FORMATTER_OBJECT(nfo), (int32_t)Z_LVAL_P(number),
|
|
formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
if (U_FAILURE( INTL_DATA_ERROR_CODE(nfo) ) ) {
|
|
efree(formatted);
|
|
}
|
|
}
|
|
INTL_METHOD_CHECK_STATUS( nfo, "Number formatting failed" );
|
|
break;
|
|
|
|
case FORMAT_TYPE_INT64:
|
|
{
|
|
int64_t value = (Z_TYPE_P(number) == IS_DOUBLE)?(int64_t)Z_DVAL_P(number):Z_LVAL_P(number);
|
|
formatted_len = unum_formatInt64(FORMATTER_OBJECT(nfo), value, formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
if (INTL_DATA_ERROR_CODE(nfo) == U_BUFFER_OVERFLOW_ERROR) {
|
|
intl_error_reset(INTL_DATA_ERROR_P(nfo));
|
|
formatted = eumalloc(formatted_len);
|
|
formatted_len = unum_formatInt64(FORMATTER_OBJECT(nfo), value, formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
if (U_FAILURE( INTL_DATA_ERROR_CODE(nfo) ) ) {
|
|
efree(formatted);
|
|
}
|
|
}
|
|
INTL_METHOD_CHECK_STATUS( nfo, "Number formatting failed" );
|
|
}
|
|
break;
|
|
|
|
case FORMAT_TYPE_DOUBLE:
|
|
convert_to_double(number);
|
|
formatted_len = unum_formatDouble(FORMATTER_OBJECT(nfo), Z_DVAL_P(number), formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
if (INTL_DATA_ERROR_CODE(nfo) == U_BUFFER_OVERFLOW_ERROR) {
|
|
intl_error_reset(INTL_DATA_ERROR_P(nfo));
|
|
formatted = eumalloc(formatted_len);
|
|
unum_formatDouble(FORMATTER_OBJECT(nfo), Z_DVAL_P(number), formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
if (U_FAILURE( INTL_DATA_ERROR_CODE(nfo) ) ) {
|
|
efree(formatted);
|
|
}
|
|
}
|
|
INTL_METHOD_CHECK_STATUS( nfo, "Number formatting failed" );
|
|
break;
|
|
case FORMAT_TYPE_CURRENCY:
|
|
if (getThis()) {
|
|
const char *space;
|
|
const char *class_name = get_active_class_name(&space);
|
|
zend_argument_value_error(2, "cannot be NumberFormatter::TYPE_CURRENCY constant, "
|
|
"use %s%sformatCurrency() method instead", class_name, space);
|
|
} else {
|
|
zend_argument_value_error(3, "cannot be NumberFormatter::TYPE_CURRENCY constant, use numfmt_format_currency() function instead");
|
|
}
|
|
RETURN_THROWS();
|
|
default:
|
|
zend_argument_value_error(hasThis() ? 2 : 3, "must be a NumberFormatter::TYPE_* constant");
|
|
RETURN_THROWS();
|
|
}
|
|
|
|
INTL_METHOD_RETVAL_UTF8( nfo, formatted, formatted_len, ( formatted != format_buf ) );
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ Format a number as currency. */
|
|
PHP_FUNCTION( numfmt_format_currency )
|
|
{
|
|
double number;
|
|
UChar format_buf[32];
|
|
UChar* formatted = format_buf;
|
|
int32_t formatted_len = USIZE(format_buf);
|
|
char* currency = NULL;
|
|
size_t currency_len = 0;
|
|
UChar* scurrency = NULL;
|
|
int32_t scurrency_len = 0;
|
|
FORMATTER_METHOD_INIT_VARS;
|
|
|
|
/* Parse parameters. */
|
|
if( zend_parse_method_parameters( ZEND_NUM_ARGS(), getThis(), "Ods",
|
|
&object, NumberFormatter_ce_ptr, &number, ¤cy, ¤cy_len ) == FAILURE )
|
|
{
|
|
RETURN_THROWS();
|
|
}
|
|
|
|
/* Fetch the object. */
|
|
FORMATTER_METHOD_FETCH_OBJECT;
|
|
|
|
/* Convert currency to UTF-16. */
|
|
intl_convert_utf8_to_utf16(&scurrency, &scurrency_len, currency, currency_len, &INTL_DATA_ERROR_CODE(nfo));
|
|
INTL_METHOD_CHECK_STATUS( nfo, "Currency conversion to UTF-16 failed" );
|
|
|
|
/* Format the number using a fixed-length buffer. */
|
|
formatted_len = unum_formatDoubleCurrency(FORMATTER_OBJECT(nfo), number, scurrency, formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
|
|
/* If the buffer turned out to be too small
|
|
* then allocate another buffer dynamically
|
|
* and use it to format the number.
|
|
*/
|
|
if (INTL_DATA_ERROR_CODE(nfo) == U_BUFFER_OVERFLOW_ERROR) {
|
|
intl_error_reset(INTL_DATA_ERROR_P(nfo));
|
|
formatted = eumalloc(formatted_len);
|
|
unum_formatDoubleCurrency(FORMATTER_OBJECT(nfo), number, scurrency, formatted, formatted_len, NULL, &INTL_DATA_ERROR_CODE(nfo));
|
|
}
|
|
|
|
if( U_FAILURE( INTL_DATA_ERROR_CODE((nfo)) ) ) {
|
|
intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((nfo)) );
|
|
intl_errors_set_custom_msg( INTL_DATA_ERROR_P(nfo), "Number formatting failed", 0 );
|
|
RETVAL_FALSE;
|
|
if (formatted != format_buf) {
|
|
efree(formatted);
|
|
}
|
|
} else {
|
|
INTL_METHOD_RETVAL_UTF8( nfo, formatted, formatted_len, ( formatted != format_buf ) );
|
|
}
|
|
|
|
if(scurrency) {
|
|
efree(scurrency);
|
|
}
|
|
}
|
|
|
|
/* }}} */
|