averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

stdlib: on Linux, create a non-NULL locale for strto*_l functions

Browse Source 
Unlike Darwin, GNU libc does not provide a shortcut to access the C
locale by using a NULL locale_t.

Swift SVN r25847
This commit is contained in:
Dmitri Hrybenko
2015-03-08 04:06:43 +00:00
parent 4de6fa990d
commit 652eb8f948
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
stdlib/runtime/Stubs.cpp
View File

@@ -106,14 +106,34 @@ extern "C" uint64_t swift_uint64ToString(char *Buffer, intptr_t BufferLength,
/*Negative=*/false);
}
#if defined(__APPLE__) || defined(__FreeBSD__)
static inline locale_t getCLocale() {
// On these platforms convenience functions from xlocale.h interpret nullptr
// as C locale.
return nullptr;
}
#else
static locale_t makeCLocale() {
locale_t CLocale = newlocale(LC_ALL_MASK, "C", nullptr);
if (!CLocale) {
swift::crash("makeCLocale: newlocale() returned a null pointer");
}
return CLocale;
}
static locale_t getCLocale() {
static locale_t CLocale = makeCLocale();
return CLocale;
}
#endif
#if defined(__APPLE__)
#define swift_snprintf_l snprintf_l
#else
static int swift_snprintf_l(char *Str, size_t StrSize, locale_t Locale,
const char *Format, ...) {
if (Locale == nullptr) {
static locale_t CLocale = newlocale(LC_ALL_MASK, NULL, NULL);
Locale = CLocale;
Locale = getCLocale();
}
locale_t OldLocale = uselocale(Locale);
@@ -316,7 +336,7 @@ static const char *_swift_stdlib_strtoX_clocale_impl(
) {
char *EndPtr;
errno = 0;
const auto result = posixImpl(nptr, &EndPtr, NULL);
const auto result = posixImpl(nptr, &EndPtr, getCLocale());
*outResult = result;
if (result == huge || result == -huge || result == 0.0 || result == -0.0) {
if (errno == ERANGE)

3
test/1_stdlib/NumericParsing.swift.gyb
View File

@@ -14,8 +14,6 @@
// RUN: %S/../../utils/gyb -DCMAKE_SIZEOF_VOID_P=%target-ptrsize %s -o %t/NumericParsing.swift
// RUN: %S/../../utils/line-directive %t/NumericParsing.swift -- %target-build-swift %t/NumericParsing.swift -o %t/a.out
// RUN: %S/../../utils/line-directive %t/NumericParsing.swift -- %target-run %t/a.out
//
// XFAIL: linux
%{
from SwiftIntTypes import *
@@ -47,7 +45,6 @@ number_of_values = 23
}%
import StdlibUnittest
import Darwin
var tests = TestSuite("NumericParsing")