AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Moving locale code from i18n-extension.cc. Each part of the API now has separate cc file, and only extension related code is left in i18n-extension.{cc,h}.

Browse Source 
There are no functional changes in this CL.
Review URL: http://codereview.chromium.org/6840024

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@7608 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
cira@chromium.org 2011-04-13 21:09:22 +00:00
parent 98c17a2bf3
commit 261318b6a1
5 changed files with 236 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/extensions/experimental/experimental.gyp
View File

@ -41,6 +41,8 @@
'break-iterator.h',
'i18n-extension.cc',
'i18n-extension.h',
'i18n-locale.cc',
'i18n-locale.h',
'<(SHARED_INTERMEDIATE_DIR)/i18n-js.cc',
],
'include_dirs': [

160
src/extensions/experimental/i18n-extension.cc
View File

@ -27,13 +27,9 @@
#include "i18n-extension.h"
#include <algorithm>
#include <string>
#include "break-iterator.h"
#include "i18n-locale.h"
#include "natives.h"
#include "unicode/locid.h"
#include "unicode/uloc.h"
namespace v8 {
namespace internal {
@ -57,21 +53,21 @@ I18NExtension::I18NExtension()
v8::Handle<v8::FunctionTemplate> I18NExtension::GetNativeFunction(
v8::Handle<v8::String> name) {
if (name->Equals(v8::String::New("NativeJSLocale"))) {
return v8::FunctionTemplate::New(JSLocale);
return v8::FunctionTemplate::New(I18NLocale::JSLocale);
} else if (name->Equals(v8::String::New("NativeJSAvailableLocales"))) {
return v8::FunctionTemplate::New(JSAvailableLocales);
return v8::FunctionTemplate::New(I18NLocale::JSAvailableLocales);
} else if (name->Equals(v8::String::New("NativeJSMaximizedLocale"))) {
return v8::FunctionTemplate::New(JSMaximizedLocale);
return v8::FunctionTemplate::New(I18NLocale::JSMaximizedLocale);
} else if (name->Equals(v8::String::New("NativeJSMinimizedLocale"))) {
return v8::FunctionTemplate::New(JSMinimizedLocale);
return v8::FunctionTemplate::New(I18NLocale::JSMinimizedLocale);
} else if (name->Equals(v8::String::New("NativeJSDisplayLanguage"))) {
return v8::FunctionTemplate::New(JSDisplayLanguage);
return v8::FunctionTemplate::New(I18NLocale::JSDisplayLanguage);
} else if (name->Equals(v8::String::New("NativeJSDisplayScript"))) {
return v8::FunctionTemplate::New(JSDisplayScript);
return v8::FunctionTemplate::New(I18NLocale::JSDisplayScript);
} else if (name->Equals(v8::String::New("NativeJSDisplayRegion"))) {
return v8::FunctionTemplate::New(JSDisplayRegion);
return v8::FunctionTemplate::New(I18NLocale::JSDisplayRegion);
} else if (name->Equals(v8::String::New("NativeJSDisplayName"))) {
return v8::FunctionTemplate::New(JSDisplayName);
return v8::FunctionTemplate::New(I18NLocale::JSDisplayName);
} else if (name->Equals(v8::String::New("NativeJSBreakIterator"))) {
return v8::FunctionTemplate::New(BreakIterator::JSBreakIterator);
}
@ -79,144 +75,6 @@ v8::Handle<v8::FunctionTemplate> I18NExtension::GetNativeFunction(
return v8::Handle<v8::FunctionTemplate>();
}
v8::Handle<v8::Value> I18NExtension::JSLocale(const v8::Arguments& args) {
// TODO(cira): Fetch browser locale. Accept en-US as good default for now.
// We could possibly pass browser locale as a parameter in the constructor.
std::string locale_name("en-US");
if (args.Length() == 1 && args[0]->IsString()) {
locale_name = *v8::String::Utf8Value(args[0]->ToString());
}
v8::Local<v8::Object> locale = v8::Object::New();
locale->Set(v8::String::New("locale"), v8::String::New(locale_name.c_str()));
icu::Locale icu_locale(locale_name.c_str());
const char* language = icu_locale.getLanguage();
locale->Set(v8::String::New("language"), v8::String::New(language));
const char* script = icu_locale.getScript();
if (strlen(script)) {
locale->Set(v8::String::New("script"), v8::String::New(script));
}
const char* region = icu_locale.getCountry();
if (strlen(region)) {
locale->Set(v8::String::New("region"), v8::String::New(region));
}
return locale;
}
// TODO(cira): Filter out locales that Chrome doesn't support.
v8::Handle<v8::Value> I18NExtension::JSAvailableLocales(
const v8::Arguments& args) {
v8::Local<v8::Array> all_locales = v8::Array::New();
int count = 0;
const icu::Locale* icu_locales = icu::Locale::getAvailableLocales(count);
for (int i = 0; i < count; ++i) {
all_locales->Set(i, v8::String::New(icu_locales[i].getName()));
}
return all_locales;
}
// Use - as tag separator, not _ that ICU uses.
static std::string NormalizeLocale(const std::string& locale) {
std::string result(locale);
// TODO(cira): remove STL dependency.
std::replace(result.begin(), result.end(), '_', '-');
return result;
}
v8::Handle<v8::Value> I18NExtension::JSMaximizedLocale(
const v8::Arguments& args) {
if (!args.Length() || !args[0]->IsString()) {
return v8::Undefined();
}
UErrorCode status = U_ZERO_ERROR;
std::string locale_name = *v8::String::Utf8Value(args[0]->ToString());
char max_locale[ULOC_FULLNAME_CAPACITY];
uloc_addLikelySubtags(locale_name.c_str(), max_locale,
sizeof(max_locale), &status);
if (U_FAILURE(status)) {
return v8::Undefined();
}
return v8::String::New(NormalizeLocale(max_locale).c_str());
}
v8::Handle<v8::Value> I18NExtension::JSMinimizedLocale(
const v8::Arguments& args) {
if (!args.Length() || !args[0]->IsString()) {
return v8::Undefined();
}
UErrorCode status = U_ZERO_ERROR;
std::string locale_name = *v8::String::Utf8Value(args[0]->ToString());
char min_locale[ULOC_FULLNAME_CAPACITY];
uloc_minimizeSubtags(locale_name.c_str(), min_locale,
sizeof(min_locale), &status);
if (U_FAILURE(status)) {
return v8::Undefined();
}
return v8::String::New(NormalizeLocale(min_locale).c_str());
}
// Common code for JSDisplayXXX methods.
static v8::Handle<v8::Value> GetDisplayItem(const v8::Arguments& args,
const std::string& item) {
if (args.Length() != 2 || !args[0]->IsString() || !args[1]->IsString()) {
return v8::Undefined();
}
std::string base_locale = *v8::String::Utf8Value(args[0]->ToString());
icu::Locale icu_locale(base_locale.c_str());
icu::Locale display_locale =
icu::Locale(*v8::String::Utf8Value(args[1]->ToString()));
icu::UnicodeString result;
if (item == "language") {
icu_locale.getDisplayLanguage(display_locale, result);
} else if (item == "script") {
icu_locale.getDisplayScript(display_locale, result);
} else if (item == "region") {
icu_locale.getDisplayCountry(display_locale, result);
} else if (item == "name") {
icu_locale.getDisplayName(display_locale, result);
} else {
return v8::Undefined();
}
if (result.length()) {
return v8::String::New(
reinterpret_cast<const uint16_t*>(result.getBuffer()), result.length());
}
return v8::Undefined();
}
v8::Handle<v8::Value> I18NExtension::JSDisplayLanguage(
const v8::Arguments& args) {
return GetDisplayItem(args, "language");
}
v8::Handle<v8::Value> I18NExtension::JSDisplayScript(
const v8::Arguments& args) {
return GetDisplayItem(args, "script");
}
v8::Handle<v8::Value> I18NExtension::JSDisplayRegion(
const v8::Arguments& args) {
return GetDisplayItem(args, "region");
}
v8::Handle<v8::Value> I18NExtension::JSDisplayName(const v8::Arguments& args) {
return GetDisplayItem(args, "name");
}
I18NExtension* I18NExtension::get() {
if (!extension_) {
extension_ = new I18NExtension();

10
src/extensions/experimental/i18n-extension.h
View File

@ -41,16 +41,6 @@ class I18NExtension : public v8::Extension {
virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
v8::Handle<v8::String> name);
// Implementations of window.Locale methods.
static v8::Handle<v8::Value> JSLocale(const v8::Arguments& args);
static v8::Handle<v8::Value> JSAvailableLocales(const v8::Arguments& args);
static v8::Handle<v8::Value> JSMaximizedLocale(const v8::Arguments& args);
static v8::Handle<v8::Value> JSMinimizedLocale(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayLanguage(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayScript(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayRegion(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayName(const v8::Arguments& args);
// V8 code prefers Register, while Chrome and WebKit use get kind of methods.
static void Register();
static I18NExtension* get();

172
src/extensions/experimental/i18n-locale.cc Normal file
View File

@ -0,0 +1,172 @@
// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "i18n-locale.h"
#include <algorithm>
#include <string>
#include "unicode/locid.h"
#include "unicode/uloc.h"
namespace v8 {
namespace internal {
v8::Handle<v8::Value> I18NLocale::JSLocale(const v8::Arguments& args) {
// TODO(cira): Fetch browser locale. Accept en-US as good default for now.
// We could possibly pass browser locale as a parameter in the constructor.
std::string locale_name("en-US");
if (args.Length() == 1 && args[0]->IsString()) {
locale_name = *v8::String::Utf8Value(args[0]->ToString());
}
v8::Local<v8::Object> locale = v8::Object::New();
locale->Set(v8::String::New("locale"), v8::String::New(locale_name.c_str()));
icu::Locale icu_locale(locale_name.c_str());
const char* language = icu_locale.getLanguage();
locale->Set(v8::String::New("language"), v8::String::New(language));
const char* script = icu_locale.getScript();
if (strlen(script)) {
locale->Set(v8::String::New("script"), v8::String::New(script));
}
const char* region = icu_locale.getCountry();
if (strlen(region)) {
locale->Set(v8::String::New("region"), v8::String::New(region));
}
return locale;
}
// TODO(cira): Filter out locales that Chrome doesn't support.
v8::Handle<v8::Value> I18NLocale::JSAvailableLocales(
const v8::Arguments& args) {
v8::Local<v8::Array> all_locales = v8::Array::New();
int count = 0;
const icu::Locale* icu_locales = icu::Locale::getAvailableLocales(count);
for (int i = 0; i < count; ++i) {
all_locales->Set(i, v8::String::New(icu_locales[i].getName()));
}
return all_locales;
}
// Use - as tag separator, not _ that ICU uses.
static std::string NormalizeLocale(const std::string& locale) {
std::string result(locale);
// TODO(cira): remove STL dependency.
std::replace(result.begin(), result.end(), '_', '-');
return result;
}
v8::Handle<v8::Value> I18NLocale::JSMaximizedLocale(const v8::Arguments& args) {
if (!args.Length() || !args[0]->IsString()) {
return v8::Undefined();
}
UErrorCode status = U_ZERO_ERROR;
std::string locale_name = *v8::String::Utf8Value(args[0]->ToString());
char max_locale[ULOC_FULLNAME_CAPACITY];
uloc_addLikelySubtags(locale_name.c_str(), max_locale,
sizeof(max_locale), &status);
if (U_FAILURE(status)) {
return v8::Undefined();
}
return v8::String::New(NormalizeLocale(max_locale).c_str());
}
v8::Handle<v8::Value> I18NLocale::JSMinimizedLocale(const v8::Arguments& args) {
if (!args.Length() || !args[0]->IsString()) {
return v8::Undefined();
}
UErrorCode status = U_ZERO_ERROR;
std::string locale_name = *v8::String::Utf8Value(args[0]->ToString());
char min_locale[ULOC_FULLNAME_CAPACITY];
uloc_minimizeSubtags(locale_name.c_str(), min_locale,
sizeof(min_locale), &status);
if (U_FAILURE(status)) {
return v8::Undefined();
}
return v8::String::New(NormalizeLocale(min_locale).c_str());
}
// Common code for JSDisplayXXX methods.
static v8::Handle<v8::Value> GetDisplayItem(const v8::Arguments& args,
const std::string& item) {
if (args.Length() != 2 || !args[0]->IsString() || !args[1]->IsString()) {
return v8::Undefined();
}
std::string base_locale = *v8::String::Utf8Value(args[0]->ToString());
icu::Locale icu_locale(base_locale.c_str());
icu::Locale display_locale =
icu::Locale(*v8::String::Utf8Value(args[1]->ToString()));
icu::UnicodeString result;
if (item == "language") {
icu_locale.getDisplayLanguage(display_locale, result);
} else if (item == "script") {
icu_locale.getDisplayScript(display_locale, result);
} else if (item == "region") {
icu_locale.getDisplayCountry(display_locale, result);
} else if (item == "name") {
icu_locale.getDisplayName(display_locale, result);
} else {
return v8::Undefined();
}
if (result.length()) {
return v8::String::New(
reinterpret_cast<const uint16_t*>(result.getBuffer()), result.length());
}
return v8::Undefined();
}
v8::Handle<v8::Value> I18NLocale::JSDisplayLanguage(const v8::Arguments& args) {
return GetDisplayItem(args, "language");
}
v8::Handle<v8::Value> I18NLocale::JSDisplayScript(const v8::Arguments& args) {
return GetDisplayItem(args, "script");
}
v8::Handle<v8::Value> I18NLocale::JSDisplayRegion(const v8::Arguments& args) {
return GetDisplayItem(args, "region");
}
v8::Handle<v8::Value> I18NLocale::JSDisplayName(const v8::Arguments& args) {
return GetDisplayItem(args, "name");
}
} } // namespace v8::internal

53
src/extensions/experimental/i18n-locale.h Normal file
View File

@ -0,0 +1,53 @@
// Copyright 2011 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef V8_EXTENSIONS_EXPERIMENTAL_I18N_LOCALE_H_
#define V8_EXTENSIONS_EXPERIMENTAL_I18N_LOCALE_H_
#include <v8.h>
namespace v8 {
namespace internal {
class I18NLocale {
public:
I18NLocale() {}
// Implementations of window.Locale methods.
static v8::Handle<v8::Value> JSLocale(const v8::Arguments& args);
static v8::Handle<v8::Value> JSAvailableLocales(const v8::Arguments& args);
static v8::Handle<v8::Value> JSMaximizedLocale(const v8::Arguments& args);
static v8::Handle<v8::Value> JSMinimizedLocale(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayLanguage(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayScript(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayRegion(const v8::Arguments& args);
static v8::Handle<v8::Value> JSDisplayName(const v8::Arguments& args);
};
} } // namespace v8::internal
#endif // V8_EXTENSIONS_EXPERIMENTAL_I18N_LOCALE_H_