diff options
| -rw-r--r-- | embed.fnc | 2 | ||||
| -rw-r--r-- | embed.h | 2 | ||||
| -rw-r--r-- | locale.c | 6 | ||||
| -rw-r--r-- | perl.h | 18 | ||||
| -rw-r--r-- | proto.h | 2 |
5 files changed, 15 insertions, 15 deletions
@@ -1268,7 +1268,7 @@ ApOM |int |init_i18nl14n |int printwarn p |char* |my_strerror |const int errnum Xpn |void |_warn_problematic_locale p |void |new_numeric |NULLOK const char* newcoll -Xp |void |set_numeric_local +Xp |void |set_numeric_underlying Xp |void |set_numeric_standard ApM |bool |_is_in_locale_category|const bool compiling|const int category Apd |void |sync_locale @@ -1377,8 +1377,8 @@ #define scalar(a) Perl_scalar(aTHX_ a) #define scalarvoid(a) Perl_scalarvoid(aTHX_ a) #define set_caret_X() Perl_set_caret_X(aTHX) -#define set_numeric_local() Perl_set_numeric_local(aTHX) #define set_numeric_standard() Perl_set_numeric_standard(aTHX) +#define set_numeric_underlying() Perl_set_numeric_underlying(aTHX) #define sub_crush_depth(a) Perl_sub_crush_depth(aTHX_ a) #define sv_2num(a) Perl_sv_2num(aTHX_ a) #define sv_clean_all() Perl_sv_clean_all(aTHX) @@ -201,8 +201,8 @@ Perl_new_numeric(pTHX_ const char *newnum) * It installs this locale as the current underlying default. * * The default locale and the C locale can be toggled between by use of the - * set_numeric_local() and set_numeric_standard() functions, which should - * probably not be called directly, but only via macros like + * set_numeric_underlying() and set_numeric_standard() functions, which + * should probably not be called directly, but only via macros like * SET_NUMERIC_STANDARD() in perl.h. * * The toggling is necessary mainly so that a non-dot radix decimal point @@ -289,7 +289,7 @@ Perl_set_numeric_standard(pTHX) } void -Perl_set_numeric_local(pTHX) +Perl_set_numeric_underlying(pTHX) { #ifdef USE_LOCALE_NUMERIC @@ -5690,14 +5690,14 @@ expression, but with an empty argument list, like this: # define STORE_LC_NUMERIC_SET_TO_NEEDED() \ if (IN_LC(LC_NUMERIC)) { \ if (_NOT_IN_NUMERIC_UNDERLYING) { \ - Perl_set_numeric_local(aTHX); \ + Perl_set_numeric_underlying(aTHX); \ _restore_LC_NUMERIC_function = &Perl_set_numeric_standard; \ } \ } \ else { \ if (_NOT_IN_NUMERIC_STANDARD) { \ SET_NUMERIC_STANDARD(); \ - _restore_LC_NUMERIC_function = &Perl_set_numeric_local; \ + _restore_LC_NUMERIC_function = &Perl_set_numeric_underlying; \ } \ } @@ -5715,26 +5715,26 @@ expression, but with an empty argument list, like this: # define SET_NUMERIC_UNDERLYING() \ STMT_START { if (_NOT_IN_NUMERIC_UNDERLYING) \ - Perl_set_numeric_local(aTHX); } STMT_END + Perl_set_numeric_underlying(aTHX); } STMT_END /* The rest of these LC_NUMERIC macros toggle to one or the other state, with * the RESTORE_foo ones called to switch back, but only if need be */ # define STORE_LC_NUMERIC_UNDERLYING_SET_STANDARD() \ - bool _was_local = _NOT_IN_NUMERIC_STANDARD; \ - if (_was_local) Perl_set_numeric_standard(aTHX); + bool _was_underlying = _NOT_IN_NUMERIC_STANDARD; \ + if (_was_underlying) Perl_set_numeric_standard(aTHX); /* Doesn't change to underlying locale unless within the scope of some form of * 'use locale'. This is the usual desired behavior. */ # define STORE_LC_NUMERIC_STANDARD_SET_UNDERLYING() \ bool _was_standard = _NOT_IN_NUMERIC_UNDERLYING \ && IN_LC(LC_NUMERIC); \ - if (_was_standard) Perl_set_numeric_local(aTHX); + if (_was_standard) Perl_set_numeric_underlying(aTHX); /* Rarely, we want to change to the underlying locale even outside of 'use * locale'. This is principally in the POSIX:: functions */ # define STORE_LC_NUMERIC_FORCE_TO_UNDERLYING() \ if (_NOT_IN_NUMERIC_UNDERLYING) { \ - Perl_set_numeric_local(aTHX); \ + Perl_set_numeric_underlying(aTHX); \ _restore_LC_NUMERIC_function = &Perl_set_numeric_standard; \ } @@ -5753,8 +5753,8 @@ expression, but with an empty argument list, like this: } \ } STMT_END -# define RESTORE_LC_NUMERIC_UNDERLYING() \ - if (_was_local) Perl_set_numeric_local(aTHX); +# define RESTORE_LC_NUMERIC_UNDERLYING() \ + if (_was_underlying) Perl_set_numeric_underlying(aTHX); # define RESTORE_LC_NUMERIC_STANDARD() \ if (_restore_LC_NUMERIC_function) { \ @@ -2925,8 +2925,8 @@ PERL_CALLCONV void Perl_set_caret_X(pTHX); PERL_CALLCONV void Perl_set_context(void *t); #define PERL_ARGS_ASSERT_SET_CONTEXT \ assert(t) -PERL_CALLCONV void Perl_set_numeric_local(pTHX); PERL_CALLCONV void Perl_set_numeric_standard(pTHX); +PERL_CALLCONV void Perl_set_numeric_underlying(pTHX); PERL_CALLCONV void Perl_setdefout(pTHX_ GV* gv); #define PERL_ARGS_ASSERT_SETDEFOUT \ assert(gv) |