languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-19 20:17:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "[dart:io] Adds Platform.localeName"

Browse source 
This reverts commit ae6d854ec6.

The build failed on the mac build bots. Need to investigate.

Review-Url: https://codereview.chromium.org/2791453002 .
This commit is contained in:
Zachary Anderson 2017-03-30 13:35:00 -07:00
parent ae6d854ec6
commit e75df3cce3
16 changed files with 2 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -4,9 +4,6 @@
### Core library changes
* `dart:io`
* Added `Platform.localeName`.
### Dart VM
### Strong Mode

4
pkg/dev_compiler/tool/input_sdk/patch/io_patch.dart
View file

@ -252,8 +252,8 @@ class _Platform {
}
@patch
static String _localeName() {
throw new UnsupportedError("Platform._localeName");
static _ansiSupported() {
throw new UnsupportedError("Platform._ansiSupported");
}
}

1
runtime/bin/io_natives.cc
View file

@ -91,7 +91,6 @@ namespace bin {
V(Platform_Environment, 0) \
V(Platform_ExecutableArguments, 0) \
V(Platform_GetVersion, 0) \
V(Platform_LocaleName, 0) \
V(Process_Start, 11) \
V(Process_Wait, 5) \
V(Process_KillPid, 2) \

10
runtime/bin/platform.cc
View file

@ -109,16 +109,6 @@ void FUNCTION_NAME(Platform_GetVersion)(Dart_NativeArguments args) {
Dart_SetReturnValue(args, Dart_NewStringFromCString(Dart_VersionString()));
}
void FUNCTION_NAME(Platform_LocaleName)(Dart_NativeArguments args) {
const char* locale = Platform::LocaleName();
if (locale == NULL) {
Dart_SetReturnValue(args, DartUtils::NewDartOSError());
} else {
Dart_SetReturnValue(args, Dart_NewStringFromCString(locale));
}
}
} // namespace bin
} // namespace dart

2
runtime/bin/platform.h
View file

@ -52,8 +52,6 @@ class Platform {
// Extracts the local hostname.
static bool LocalHostname(char* buffer, intptr_t buffer_length);
static const char* LocaleName();
// Extracts the environment variables for the current process. The array of
// strings is Dart_ScopeAllocated. The number of elements in the array is
// returned in the count argument.

5
runtime/bin/platform_android.cc
View file

@ -57,11 +57,6 @@ const char* Platform::LibraryExtension() {
}
const char* Platform::LocaleName() {
return getenv("LANG");
}
bool Platform::LocalHostname(char* buffer, intptr_t buffer_length) {
return gethostname(buffer, buffer_length) == 0;
}

5
runtime/bin/platform_fuchsia.cc
View file

@ -47,11 +47,6 @@ const char* Platform::LibraryExtension() {
}
const char* Platform::LocaleName() {
return getenv("LANG");
}
bool Platform::LocalHostname(char* buffer, intptr_t buffer_length) {
return gethostname(buffer, buffer_length) == 0;
}

5
runtime/bin/platform_linux.cc
View file

@ -82,11 +82,6 @@ const char* Platform::LibraryExtension() {
}
const char* Platform::LocaleName() {
return getenv("LANG");
}
bool Platform::LocalHostname(char* buffer, intptr_t buffer_length) {
return gethostname(buffer, buffer_length) == 0;
}

56
runtime/bin/platform_macos.cc
View file

@ -7,8 +7,6 @@
#include "bin/platform.h"
#include <CoreFoundation/CoreFoundation.h>
#if !HOST_OS_IOS
#include <crt_externs.h> // NOLINT
#endif // !HOST_OS_IOS
@ -100,60 +98,6 @@ const char* Platform::LibraryExtension() {
}
static const char* GetLocaleName() {
CFLocaleRef locale = CFLocaleCopyCurrent();
CFLocaleIdentifier locale_id = CFLocaleGetIdentifier(locale);
CFStringRef locale_string = reinterpret_cast<CFStringRef>(locale_id);
CFIndex len = CFStringGetLength(locale_string);
CFIndex max_len =
CFStringGetMaximumSizeForEncoding(len, kCFStringEncodingUTF8) + 1;
char* result = reinterpret_cast<char*>(Dart_ScopeAllocate(max_len));
ASSERT(result != NULL);
bool success =
CFStringGetCString(locale_string, result, max_len, kCFStringEncodingUTF8);
CFRelease(locale);
if (!success) {
return NULL;
}
return result;
}
static const char* GetPreferredLanguageName() {
CFArrayRef languages = CFLocaleCopyPreferredLanguages();
CFIndex languages_length = CFArrayGetCount(languages);
if (languages_length < 1) {
CFRelease(languages);
return NULL;
}
CFTypeRef item =
reinterpret_cast<CFTypeRef>(CFArrayGetValueAtIndex(languages, 0));
CFTypeID item_type = CFGetTypeID(item);
ASSERT(item_type == CFStringGetTypeID());
CFStringRef language = reinterpret_cast<CFStringRef>(item);
CFIndex len = CFStringGetLength(language);
CFIndex max_len =
CFStringGetMaximumSizeForEncoding(len, kCFStringEncodingUTF8) + 1;
char* result = reinterpret_cast<char*>(Dart_ScopeAllocate(max_len));
ASSERT(result != NULL);
bool success =
CFStringGetCString(language, result, max_len, kCFStringEncodingUTF8);
CFRelease(languages);
if (!success) {
return NULL;
}
return result;
}
const char* Platform::LocaleName() {
// First see if there is a preferred language. If not, return the
// current locale name.
const char* preferred_langauge = GetPreferredLanguageName();
return (preferred_langauge != NULL) ? preferred_langauge : GetLocaleName();
}
bool Platform::LocalHostname(char* buffer, intptr_t buffer_length) {
return gethostname(buffer, buffer_length) == 0;
}

3
runtime/bin/platform_patch.dart
View file

@ -24,9 +24,6 @@ class _Platform {
@patch
static String _version() native "Platform_GetVersion";
@patch
static String _localeName() native "Platform_LocaleName";
@patch
static String _packageRoot() => VMLibraryHooks.packageRootString;
@patch

6
runtime/bin/platform_unsupported.cc
View file

@ -64,12 +64,6 @@ void FUNCTION_NAME(Platform_GetVersion)(Dart_NativeArguments args) {
"Platform is not supported on this platform"));
}
void FUNCTION_NAME(Platform_LocaleName)(Dart_NativeArguments args) {
Dart_ThrowException(DartUtils::NewInternalError(
"Platform is not supported on this platform"));
}
} // namespace bin
} // namespace dart

10
runtime/bin/platform_win.cc
View file

@ -198,16 +198,6 @@ const char* Platform::LibraryExtension() {
}
const char* Platform::LocaleName() {
wchar_t locale_name[LOCALE_NAME_MAX_LENGTH];
int result = GetUserDefaultLocaleName(locale_name, LOCALE_NAME_MAX_LENGTH);
if (result == 0) {
return NULL;
}
return StringUtilsWin::WideToUtf8(locale_name);
}
bool Platform::LocalHostname(char* buffer, intptr_t buffer_length) {
#if defined(DART_IO_DISABLED) || defined(PLATFORM_DISABLE_SOCKET)
return false;

5
sdk/lib/_internal/js_runtime/lib/io_patch.dart
View file

@ -250,11 +250,6 @@ class _Platform {
static String _version() {
throw new UnsupportedError("Platform._version");
}
@patch
static String _localeName() {
throw new UnsupportedError("Platform._localeName");
}
}
@patch

6
sdk/lib/io/platform.dart
View file

@ -71,7 +71,6 @@ class Platform {
static final _operatingSystem = _Platform.operatingSystem;
static final _localHostname = _Platform.localHostname;
static final _version = _Platform.version;
static final _localeName = _Platform.localeName;
/**
* Get the number of processors of the machine.
@ -84,11 +83,6 @@ class Platform {
*/
static String get pathSeparator => _pathSeparator;
/**
* Get the name of the current locale.
*/
static String get localeName => _localeName;
/**
* Get a string (`linux`, `macos`, `windows`, `android`, or `ios`)
* representing the operating system.

13
sdk/lib/io/platform_impl.dart
View file

@ -32,25 +32,12 @@ class _Platform {
external static String _packageRoot();
external static String _packageConfig();
external static String _version();
external static String _localeName();
static String executable = _executable();
static String resolvedExecutable = _resolvedExecutable();
static String packageRoot = _packageRoot();
static String packageConfig = _packageConfig();
static String _cachedLocaleName;
static String get localeName {
if (_cachedLocaleName == null) {
var result = _localeName();
if (result is OSError) {
throw result;
}
_cachedLocaleName = result;
}
return _cachedLocaleName;
}
// Cache the OS environment. This can be an OSError instance if
// retrieving the environment failed.
static var /*OSError|Map<String,String>*/ _environmentCache;

18
tests/standalone/io/locale_name_test.dart
View file

@ -1,18 +0,0 @@
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
import 'dart:io';
import "package:expect/expect.dart";
main() {
try {
Platform.localeName;
} catch (e, s) {
Expect.fail("Platform.localeName threw: $e\n$s\n");
}
Expect.isNotNull(Platform.localeName);
Expect.isTrue(Platform.localeName is String);
print(Platform.localeName);
}