Skip to content

V
V8
Commit 0cf12839 authored by dcarney@chromium.org's avatar dcarney@chromium.org
Browse files
Options

deprecate WriteAscii and MayContainNonAscii 

R=svenpanne@chromium.org
BUG=

Review URL: https://codereview.chromium.org/14638003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14533 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent ae287f04
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 39 deletions
include/v8.h
View file @ 0cf12839
......@@ -1443,8 +1443,7 @@ class V8EXPORT String : public Primitive {
/**
* This function is no longer useful.
*/
// TODO(dcarney): deprecate
V8_INLINE(bool MayContainNonAscii()) const { return true; }
V8_DEPRECATED(V8_INLINE(bool MayContainNonAscii()) const) { return true; }
/**
* Returns whether this string contains only one byte data.
......@@ -1489,10 +1488,10 @@ class V8EXPORT String : public Primitive {
int length = -1,
int options = NO_OPTIONS) const;
// ASCII characters.
int WriteAscii(char* buffer,
int start = 0,
int length = -1,
int options = NO_OPTIONS) const;
V8_DEPRECATED(int WriteAscii(char* buffer,
int start = 0,
int length = -1,
int options = NO_OPTIONS) const);
// One byte characters.
int WriteOneByte(uint8_t* buffer,
int start = 0,
......
src/api.cc
View file @ 0cf12839
......@@ -3350,7 +3350,7 @@ Local<String> v8::Object::ObjectProtoToString() {
const char* postfix = "]";
int prefix_len = i::StrLength(prefix);
int str_len = str->Length();
int str_len = str->Utf8Length();
int postfix_len = i::StrLength(postfix);
int buf_len = prefix_len + str_len + postfix_len;
......@@ -3362,7 +3362,7 @@ Local<String> v8::Object::ObjectProtoToString() {
ptr += prefix_len;
// Write real content.
str->WriteAscii(ptr, 0, str_len);
str->WriteUtf8(ptr, str_len);
ptr += str_len;
// Write postfix.
......@@ -6502,9 +6502,10 @@ String::AsciiValue::AsciiValue(v8::Handle<v8::Value> obj)
TryCatch try_catch;
Handle<String> str = obj->ToString();
if (str.IsEmpty()) return;
length_ = str->Length();
length_ = str->Utf8Length();
str_ = i::NewArray<char>(length_ + 1);
str->WriteAscii(str_);
str->WriteUtf8(str_);
ASSERT(i::String::NonAsciiStart(str_, length_) >= length_);
}
......
src/debug.cc
View file @ 0cf12839
......@@ -76,12 +76,12 @@ Debug::~Debug() {
static void PrintLn(v8::Local<v8::Value> value) {
v8::Local<v8::String> s = value->ToString();
ScopedVector<char> data(s->Length() + 1);
ScopedVector<char> data(s->Utf8Length() + 1);
if (data.start() == NULL) {
V8::FatalProcessOutOfMemory("PrintLn");
return;
}
s->WriteAscii(data.start());
s->WriteUtf8(data.start());
PrintF("%s\n", data.start());
}
......
test/cctest/test-api.cc
View file @ 0cf12839
......@@ -292,8 +292,8 @@ THREADED_TEST(HulIgennem) {
v8::HandleScope scope(env->GetIsolate());
v8::Handle<v8::Primitive> undef = v8::Undefined();
Local<String> undef_str = undef->ToString();
char* value = i::NewArray<char>(undef_str->Length() + 1);
undef_str->WriteAscii(value);
char* value = i::NewArray<char>(undef_str->Utf8Length() + 1);
undef_str->WriteUtf8(value);
CHECK_EQ(0, strcmp(value, "undefined"));
i::DeleteArray(value);
}
......@@ -6565,7 +6565,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf));
CHECK_EQ(5, len);
len = str->Write(wbuf);
CHECK_EQ(5, len);
......@@ -6575,7 +6575,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf, 0, 4);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf), 0, 4);
CHECK_EQ(4, len);
len = str->Write(wbuf, 0, 4);
CHECK_EQ(4, len);
......@@ -6585,7 +6585,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf, 0, 5);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf), 0, 5);
CHECK_EQ(5, len);
len = str->Write(wbuf, 0, 5);
CHECK_EQ(5, len);
......@@ -6595,7 +6595,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf, 0, 6);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf), 0, 6);
CHECK_EQ(5, len);
len = str->Write(wbuf, 0, 6);
CHECK_EQ(5, len);
......@@ -6605,7 +6605,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf, 4, -1);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf), 4, -1);
CHECK_EQ(1, len);
len = str->Write(wbuf, 4, -1);
CHECK_EQ(1, len);
......@@ -6615,7 +6615,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf, 4, 6);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf), 4, 6);
CHECK_EQ(1, len);
len = str->Write(wbuf, 4, 6);
CHECK_EQ(1, len);
......@@ -6624,7 +6624,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf, 4, 1);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf), 4, 1);
CHECK_EQ(1, len);
len = str->Write(wbuf, 4, 1);
CHECK_EQ(1, len);
......@@ -6634,7 +6634,7 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
memset(wbuf, 0x1, sizeof(wbuf));
len = str->WriteAscii(buf, 3, 1);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf), 3, 1);
CHECK_EQ(1, len);
len = str->Write(wbuf, 3, 1);
CHECK_EQ(1, len);
......@@ -6656,7 +6656,10 @@ THREADED_TEST(StringWrite) {
memset(buf, 0x1, sizeof(buf));
buf[5] = 'X';
len = str->WriteAscii(buf, 0, 6, String::NO_NULL_TERMINATION);
len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf),
0,
6,
String::NO_NULL_TERMINATION);
CHECK_EQ(5, len);
CHECK_EQ('X', buf[5]);
CHECK_EQ(0, strncmp("abcde", buf, 5));
......@@ -6687,18 +6690,13 @@ THREADED_TEST(StringWrite) {
CHECK_EQ(0, strcmp(utf8buf, "abcde"));
memset(buf, 0x1, sizeof(buf));
len = str3->WriteAscii(buf);
CHECK_EQ(7, len);
CHECK_EQ(0, strcmp("abc def", buf));
memset(buf, 0x1, sizeof(buf));
len = str3->WriteAscii(buf, 0, -1, String::PRESERVE_ASCII_NULL);
len = str3->WriteOneByte(reinterpret_cast<uint8_t*>(buf));
CHECK_EQ(7, len);
CHECK_EQ(0, strcmp("abc", buf));
CHECK_EQ(0, buf[3]);
CHECK_EQ(0, strcmp("def", buf + 4));
CHECK_EQ(0, str->WriteAscii(NULL, 0, 0, String::NO_NULL_TERMINATION));
CHECK_EQ(0, str->WriteOneByte(NULL, 0, 0, String::NO_NULL_TERMINATION));
CHECK_EQ(0, str->WriteUtf8(NULL, 0, 0, String::NO_NULL_TERMINATION));
CHECK_EQ(0, str->Write(NULL, 0, 0, String::NO_NULL_TERMINATION));
}
......@@ -8248,7 +8246,7 @@ static bool NamedAccessFlatten(Local<v8::Object> global,
CHECK(name->IsString());
memset(buf, 0x1, sizeof(buf));
len = name.As<String>()->WriteAscii(buf);
len = name.As<String>()->WriteOneByte(reinterpret_cast<uint8_t*>(buf));
CHECK_EQ(4, len);
uint16_t buf2[100];
......
test/cctest/test-debug.cc
View file @ 0cf12839
......@@ -679,7 +679,7 @@ static void DebugEventBreakPointHitCount(v8::DebugEvent event,
} else {
CHECK(result->IsString());
v8::Handle<v8::String> function_name(result->ToString());
function_name->WriteAscii(last_function_hit);
function_name->WriteUtf8(last_function_hit);
}
}
......@@ -714,7 +714,7 @@ static void DebugEventBreakPointHitCount(v8::DebugEvent event,
} else {
CHECK(result->IsString());
v8::Handle<v8::String> script_name(result->ToString());
script_name->WriteAscii(last_script_name_hit);
script_name->WriteUtf8(last_script_name_hit);
}
}
......@@ -730,7 +730,7 @@ static void DebugEventBreakPointHitCount(v8::DebugEvent event,
result = result->ToString();
CHECK(result->IsString());
v8::Handle<v8::String> script_data(result->ToString());
script_data->WriteAscii(last_script_data_hit);
script_data->WriteUtf8(last_script_data_hit);
}
}
......@@ -750,7 +750,7 @@ static void DebugEventBreakPointHitCount(v8::DebugEvent event,
result = result->ToString();
CHECK(result->IsString());
v8::Handle<v8::String> script_data(result->ToString());
script_data->WriteAscii(last_script_data_hit);
script_data->WriteUtf8(last_script_data_hit);
}
}
}
......@@ -6385,7 +6385,7 @@ static void DebugEventDebugBreak(
} else {
CHECK(result->IsString());
v8::Handle<v8::String> function_name(result->ToString());
function_name->WriteAscii(last_function_hit);
function_name->WriteUtf8(last_function_hit);
}
}
......@@ -7187,7 +7187,7 @@ static void DebugEventBreakDeoptimize(v8::DebugEvent event,
char fn[80];
CHECK(result->IsString());
v8::Handle<v8::String> function_name(result->ToString());
function_name->WriteAscii(fn);
function_name->WriteUtf8(fn);
if (strcmp(fn, "bar") == 0) {
i::Deoptimizer::DeoptimizeAll(v8::internal::Isolate::Current());
debug_event_break_deoptimize_done = true;
......
test/cctest/test-log.cc
View file @ 0cf12839
......@@ -569,9 +569,9 @@ TEST(EquivalenceOfLoggingAndTraversal) {
// The result either be a "true" literal or problem description.
if (!result->IsTrue()) {
v8::Local<v8::String> s = result->ToString();
i::ScopedVector<char> data(s->Length() + 1);
i::ScopedVector<char> data(s->Utf8Length() + 1);
CHECK_NE(NULL, data.start());
s->WriteAscii(data.start());
s->WriteUtf8(data.start());
printf("%s\n", data.start());
// Make sure that our output is written prior crash due to CHECK failure.
fflush(stdout);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment