diff options
Diffstat (limited to 'deps/v8/test')
-rw-r--r-- | deps/v8/test/cctest/cctest.gyp | 2 | ||||
-rw-r--r-- | deps/v8/test/cctest/test-api.cc | 235 | ||||
-rw-r--r-- | deps/v8/test/cctest/test-assembler-mips.cc | 8 | ||||
-rw-r--r-- | deps/v8/test/cctest/test-debug.cc | 2 | ||||
-rw-r--r-- | deps/v8/test/cctest/test-strings.cc | 52 | ||||
-rw-r--r-- | deps/v8/test/mjsunit/assert-opt-and-deopt.js | 4 | ||||
-rw-r--r-- | deps/v8/test/mjsunit/debug-script.js | 8 | ||||
-rw-r--r-- | deps/v8/test/mjsunit/function-caller.js | 7 | ||||
-rw-r--r-- | deps/v8/test/mjsunit/string-slices-regexp.js | 81 | ||||
-rwxr-xr-x | deps/v8/test/mjsunit/string-slices.js | 198 | ||||
-rwxr-xr-x | deps/v8/test/mjsunit/substr.js | 17 |
11 files changed, 592 insertions, 22 deletions
diff --git a/deps/v8/test/cctest/cctest.gyp b/deps/v8/test/cctest/cctest.gyp index 5843440e3..c0b531636 100644 --- a/deps/v8/test/cctest/cctest.gyp +++ b/deps/v8/test/cctest/cctest.gyp @@ -26,10 +26,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { + 'includes': ['../../build/common.gypi'], 'variables': { 'generated_file': '<(SHARED_INTERMEDIATE_DIR)/resources.cc', }, - 'includes': [ '../../build/v8-features.gypi' ], 'targets': [ { 'target_name': 'cctest', diff --git a/deps/v8/test/cctest/test-api.cc b/deps/v8/test/cctest/test-api.cc index aeb4cbe52..f2af81eb7 100644 --- a/deps/v8/test/cctest/test-api.cc +++ b/deps/v8/test/cctest/test-api.cc @@ -14452,34 +14452,34 @@ TEST(RegExp) { v8::Handle<v8::RegExp> re = v8::RegExp::New(v8_str("foo"), v8::RegExp::kNone); CHECK(re->IsRegExp()); CHECK(re->GetSource()->Equals(v8_str("foo"))); - CHECK_EQ(re->GetFlags(), v8::RegExp::kNone); + CHECK_EQ(v8::RegExp::kNone, re->GetFlags()); re = v8::RegExp::New(v8_str("bar"), static_cast<v8::RegExp::Flags>(v8::RegExp::kIgnoreCase | v8::RegExp::kGlobal)); CHECK(re->IsRegExp()); CHECK(re->GetSource()->Equals(v8_str("bar"))); - CHECK_EQ(static_cast<int>(re->GetFlags()), - v8::RegExp::kIgnoreCase | v8::RegExp::kGlobal); + CHECK_EQ(v8::RegExp::kIgnoreCase | v8::RegExp::kGlobal, + static_cast<int>(re->GetFlags())); re = v8::RegExp::New(v8_str("baz"), static_cast<v8::RegExp::Flags>(v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline)); CHECK(re->IsRegExp()); CHECK(re->GetSource()->Equals(v8_str("baz"))); - CHECK_EQ(static_cast<int>(re->GetFlags()), - v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline); + CHECK_EQ(v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline, + static_cast<int>(re->GetFlags())); re = CompileRun("/quux/").As<v8::RegExp>(); CHECK(re->IsRegExp()); CHECK(re->GetSource()->Equals(v8_str("quux"))); - CHECK_EQ(re->GetFlags(), v8::RegExp::kNone); + CHECK_EQ(v8::RegExp::kNone, re->GetFlags()); re = CompileRun("/quux/gm").As<v8::RegExp>(); CHECK(re->IsRegExp()); CHECK(re->GetSource()->Equals(v8_str("quux"))); - CHECK_EQ(static_cast<int>(re->GetFlags()), - v8::RegExp::kGlobal | v8::RegExp::kMultiline); + CHECK_EQ(v8::RegExp::kGlobal | v8::RegExp::kMultiline, + static_cast<int>(re->GetFlags())); // Override the RegExp constructor and check the API constructor // still works. @@ -14488,15 +14488,15 @@ TEST(RegExp) { re = v8::RegExp::New(v8_str("foobar"), v8::RegExp::kNone); CHECK(re->IsRegExp()); CHECK(re->GetSource()->Equals(v8_str("foobar"))); - CHECK_EQ(re->GetFlags(), v8::RegExp::kNone); + CHECK_EQ(v8::RegExp::kNone, re->GetFlags()); re = v8::RegExp::New(v8_str("foobarbaz"), static_cast<v8::RegExp::Flags>(v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline)); CHECK(re->IsRegExp()); CHECK(re->GetSource()->Equals(v8_str("foobarbaz"))); - CHECK_EQ(static_cast<int>(re->GetFlags()), - v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline); + CHECK_EQ(v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline, + static_cast<int>(re->GetFlags())); context->Global()->Set(v8_str("re"), re); ExpectTrue("re.test('FoobarbaZ')"); @@ -14937,3 +14937,216 @@ THREADED_TEST(Regress1516) { } } } + + +static bool BlockProtoNamedSecurityTestCallback(Local<v8::Object> global, + Local<Value> name, + v8::AccessType type, + Local<Value> data) { + // Only block read access to __proto__. + if (type == v8::ACCESS_GET && + name->IsString() && + name->ToString()->Length() == 9 && + name->ToString()->Utf8Length() == 9) { + char buffer[10]; + CHECK_EQ(10, name->ToString()->WriteUtf8(buffer)); + return strncmp(buffer, "__proto__", 9) != 0; + } + + return true; +} + + +THREADED_TEST(Regress93759) { + HandleScope scope; + + // Template for object with security check. + Local<ObjectTemplate> no_proto_template = v8::ObjectTemplate::New(); + // We don't do indexing, so any callback can be used for that. + no_proto_template->SetAccessCheckCallbacks( + BlockProtoNamedSecurityTestCallback, + IndexedSecurityTestCallback); + + // Templates for objects with hidden prototypes and possibly security check. + Local<FunctionTemplate> hidden_proto_template = v8::FunctionTemplate::New(); + hidden_proto_template->SetHiddenPrototype(true); + + Local<FunctionTemplate> protected_hidden_proto_template = + v8::FunctionTemplate::New(); + protected_hidden_proto_template->InstanceTemplate()->SetAccessCheckCallbacks( + BlockProtoNamedSecurityTestCallback, + IndexedSecurityTestCallback); + protected_hidden_proto_template->SetHiddenPrototype(true); + + // Context for "foreign" objects used in test. + Persistent<Context> context = v8::Context::New(); + context->Enter(); + + // Plain object, no security check. + Local<Object> simple_object = Object::New(); + + // Object with explicit security check. + Local<Object> protected_object = + no_proto_template->NewInstance(); + + // JSGlobalProxy object, always have security check. + Local<Object> proxy_object = + context->Global(); + + // Global object, the prototype of proxy_object. No security checks. + Local<Object> global_object = + proxy_object->GetPrototype()->ToObject(); + + // Hidden prototype without security check. + Local<Object> hidden_prototype = + hidden_proto_template->GetFunction()->NewInstance(); + Local<Object> object_with_hidden = + Object::New(); + object_with_hidden->SetPrototype(hidden_prototype); + + // Hidden prototype with security check on the hidden prototype. + Local<Object> protected_hidden_prototype = + protected_hidden_proto_template->GetFunction()->NewInstance(); + Local<Object> object_with_protected_hidden = + Object::New(); + object_with_protected_hidden->SetPrototype(protected_hidden_prototype); + + context->Exit(); + + // Template for object for second context. Values to test are put on it as + // properties. + Local<ObjectTemplate> global_template = ObjectTemplate::New(); + global_template->Set(v8_str("simple"), simple_object); + global_template->Set(v8_str("protected"), protected_object); + global_template->Set(v8_str("global"), global_object); + global_template->Set(v8_str("proxy"), proxy_object); + global_template->Set(v8_str("hidden"), object_with_hidden); + global_template->Set(v8_str("phidden"), object_with_protected_hidden); + + LocalContext context2(NULL, global_template); + + Local<Value> result1 = CompileRun("Object.getPrototypeOf(simple)"); + CHECK(result1->Equals(simple_object->GetPrototype())); + + Local<Value> result2 = CompileRun("Object.getPrototypeOf(protected)"); + CHECK(result2->Equals(Undefined())); + + Local<Value> result3 = CompileRun("Object.getPrototypeOf(global)"); + CHECK(result3->Equals(global_object->GetPrototype())); + + Local<Value> result4 = CompileRun("Object.getPrototypeOf(proxy)"); + CHECK(result4->Equals(Undefined())); + + Local<Value> result5 = CompileRun("Object.getPrototypeOf(hidden)"); + CHECK(result5->Equals( + object_with_hidden->GetPrototype()->ToObject()->GetPrototype())); + + Local<Value> result6 = CompileRun("Object.getPrototypeOf(phidden)"); + CHECK(result6->Equals(Undefined())); + + context.Dispose(); +} + + +static void TestReceiver(Local<Value> expected_result, + Local<Value> expected_receiver, + const char* code) { + Local<Value> result = CompileRun(code); + CHECK(result->IsObject()); + CHECK(expected_receiver->Equals(result->ToObject()->Get(1))); + CHECK(expected_result->Equals(result->ToObject()->Get(0))); +} + + +THREADED_TEST(ForeignFunctionReceiver) { + HandleScope scope; + + // Create two contexts with different "id" properties ('i' and 'o'). + // Call a function both from its own context and from a the foreign + // context, and see what "this" is bound to (returning both "this" + // and "this.id" for comparison). + + Persistent<Context> foreign_context = v8::Context::New(); + foreign_context->Enter(); + Local<Value> foreign_function = + CompileRun("function func() { return { 0: this.id, " + " 1: this, " + " toString: function() { " + " return this[0];" + " }" + " };" + "}" + "var id = 'i';" + "func;"); + CHECK(foreign_function->IsFunction()); + foreign_context->Exit(); + + LocalContext context; + + Local<String> password = v8_str("Password"); + // Don't get hit by security checks when accessing foreign_context's + // global receiver (aka. global proxy). + context->SetSecurityToken(password); + foreign_context->SetSecurityToken(password); + + Local<String> i = v8_str("i"); + Local<String> o = v8_str("o"); + Local<String> id = v8_str("id"); + + CompileRun("function ownfunc() { return { 0: this.id, " + " 1: this, " + " toString: function() { " + " return this[0];" + " }" + " };" + "}" + "var id = 'o';" + "ownfunc"); + context->Global()->Set(v8_str("func"), foreign_function); + + // Sanity check the contexts. + CHECK(i->Equals(foreign_context->Global()->Get(id))); + CHECK(o->Equals(context->Global()->Get(id))); + + // Checking local function's receiver. + // Calling function using its call/apply methods. + TestReceiver(o, context->Global(), "ownfunc.call()"); + TestReceiver(o, context->Global(), "ownfunc.apply()"); + // Making calls through built-in functions. + TestReceiver(o, context->Global(), "[1].map(ownfunc)[0]"); + CHECK(o->Equals(CompileRun("'abcbd'.replace(/b/,ownfunc)[1]"))); + CHECK(o->Equals(CompileRun("'abcbd'.replace(/b/g,ownfunc)[1]"))); + CHECK(o->Equals(CompileRun("'abcbd'.replace(/b/g,ownfunc)[3]"))); + // Calling with environment record as base. + TestReceiver(o, context->Global(), "ownfunc()"); + // Calling with no base. + TestReceiver(o, context->Global(), "(1,ownfunc)()"); + + // Checking foreign function return value. + // Calling function using its call/apply methods. + TestReceiver(i, foreign_context->Global(), "func.call()"); + TestReceiver(i, foreign_context->Global(), "func.apply()"); + // Calling function using another context's call/apply methods. + TestReceiver(i, foreign_context->Global(), + "Function.prototype.call.call(func)"); + TestReceiver(i, foreign_context->Global(), + "Function.prototype.call.apply(func)"); + TestReceiver(i, foreign_context->Global(), + "Function.prototype.apply.call(func)"); + TestReceiver(i, foreign_context->Global(), + "Function.prototype.apply.apply(func)"); + // Making calls through built-in functions. + TestReceiver(i, foreign_context->Global(), "[1].map(func)[0]"); + // ToString(func()) is func()[0], i.e., the returned this.id. + CHECK(i->Equals(CompileRun("'abcbd'.replace(/b/,func)[1]"))); + CHECK(i->Equals(CompileRun("'abcbd'.replace(/b/g,func)[1]"))); + CHECK(i->Equals(CompileRun("'abcbd'.replace(/b/g,func)[3]"))); + + // TODO(1547): Make the following also return "i". + // Calling with environment record as base. + TestReceiver(o, context->Global(), "func()"); + // Calling with no base. + TestReceiver(o, context->Global(), "(1,func)()"); + + foreign_context.Dispose(); +} diff --git a/deps/v8/test/cctest/test-assembler-mips.cc b/deps/v8/test/cctest/test-assembler-mips.cc index 8ac89f6b3..065569dd1 100644 --- a/deps/v8/test/cctest/test-assembler-mips.cc +++ b/deps/v8/test/cctest/test-assembler-mips.cc @@ -1083,17 +1083,17 @@ TEST(MIPS13) { CpuFeatures::Scope scope(FPU); __ sw(t0, MemOperand(a0, OFFSET_OF(T, cvt_small_in))); - __ Cvt_d_uw(f10, t0); + __ Cvt_d_uw(f10, t0, f22); __ sdc1(f10, MemOperand(a0, OFFSET_OF(T, cvt_small_out))); - __ Trunc_uw_d(f10, f10); + __ Trunc_uw_d(f10, f10, f22); __ swc1(f10, MemOperand(a0, OFFSET_OF(T, trunc_small_out))); __ sw(t0, MemOperand(a0, OFFSET_OF(T, cvt_big_in))); - __ Cvt_d_uw(f8, t0); + __ Cvt_d_uw(f8, t0, f22); __ sdc1(f8, MemOperand(a0, OFFSET_OF(T, cvt_big_out))); - __ Trunc_uw_d(f8, f8); + __ Trunc_uw_d(f8, f8, f22); __ swc1(f8, MemOperand(a0, OFFSET_OF(T, trunc_big_out))); __ jr(ra); diff --git a/deps/v8/test/cctest/test-debug.cc b/deps/v8/test/cctest/test-debug.cc index 58d970cb7..b7962de2e 100644 --- a/deps/v8/test/cctest/test-debug.cc +++ b/deps/v8/test/cctest/test-debug.cc @@ -2174,7 +2174,7 @@ TEST(ScriptBreakPointLine) { f = v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("f"))); g = v8::Local<v8::Function>::Cast(env->Global()->Get(v8::String::New("g"))); - // Chesk that a break point was hit when the script was run. + // Check that a break point was hit when the script was run. CHECK_EQ(1, break_point_hit_count); CHECK_EQ(0, StrLength(last_function_hit)); diff --git a/deps/v8/test/cctest/test-strings.cc b/deps/v8/test/cctest/test-strings.cc index 4d9b264e9..17020a325 100644 --- a/deps/v8/test/cctest/test-strings.cc +++ b/deps/v8/test/cctest/test-strings.cc @@ -430,8 +430,7 @@ TEST(ExternalShortStringAdd) { " return 0;" "};" "test()"; - CHECK_EQ(0, - v8::Script::Compile(v8::String::New(source))->Run()->Int32Value()); + CHECK_EQ(0, CompileRun(source)->Int32Value()); } @@ -481,3 +480,52 @@ TEST(CachedHashOverflow) { } } } + + +TEST(SliceFromCons) { + FLAG_string_slices = true; + InitializeVM(); + v8::HandleScope scope; + Handle<String> string = + FACTORY->NewStringFromAscii(CStrVector("parentparentparent")); + Handle<String> parent = FACTORY->NewConsString(string, string); + CHECK(parent->IsConsString()); + CHECK(!parent->IsFlat()); + Handle<String> slice = FACTORY->NewSubString(parent, 1, 25); + // After slicing, the original string becomes a flat cons. + CHECK(parent->IsFlat()); + CHECK(slice->IsSlicedString()); + CHECK_EQ(SlicedString::cast(*slice)->parent(), + ConsString::cast(*parent)->first()); + CHECK(SlicedString::cast(*slice)->parent()->IsSeqString()); + CHECK(slice->IsFlat()); +} + + +TEST(TrivialSlice) { + // This tests whether a slice that contains the entire parent string + // actually creates a new string (it should not). + FLAG_string_slices = true; + InitializeVM(); + HandleScope scope; + v8::Local<v8::Value> result; + Handle<String> string; + const char* init = "var str = 'abcdefghijklmnopqrstuvwxyz';"; + const char* check = "str.slice(0,26)"; + const char* crosscheck = "str.slice(1,25)"; + + CompileRun(init); + + result = CompileRun(check); + CHECK(result->IsString()); + string = v8::Utils::OpenHandle(v8::String::Cast(*result)); + CHECK(!string->IsSlicedString()); + + string = FACTORY->NewSubString(string, 0, 26); + CHECK(!string->IsSlicedString()); + result = CompileRun(crosscheck); + CHECK(result->IsString()); + string = v8::Utils::OpenHandle(v8::String::Cast(*result)); + CHECK(string->IsSlicedString()); + CHECK_EQ("bcdefghijklmnopqrstuvwxy", *(string->ToCString())); +} diff --git a/deps/v8/test/mjsunit/assert-opt-and-deopt.js b/deps/v8/test/mjsunit/assert-opt-and-deopt.js index f58986865..c9adb5bb1 100644 --- a/deps/v8/test/mjsunit/assert-opt-and-deopt.js +++ b/deps/v8/test/mjsunit/assert-opt-and-deopt.js @@ -54,7 +54,7 @@ OptTracker.OptimizationState = { * that you later want to track de/optimizations for. It is necessary because * tests are sometimes executed several times in a row, and you want to * disregard counts from previous runs. - */ + */ OptTracker.prototype.CheckpointOptCount = function(func) { this.opt_counts_[func] = %GetOptimizationCount(func); }; @@ -148,7 +148,7 @@ tracker.AssertIsOptimized(f, false); tracker.AssertDeoptHappened(f, false); tracker.AssertDeoptCount(f, 0); -for (var i = 0; i < 2; i++) f(1); +f(1); tracker.AssertOptCount(f, 0); tracker.AssertIsOptimized(f, false); diff --git a/deps/v8/test/mjsunit/debug-script.js b/deps/v8/test/mjsunit/debug-script.js index 643dd8ce4..9767888f7 100644 --- a/deps/v8/test/mjsunit/debug-script.js +++ b/deps/v8/test/mjsunit/debug-script.js @@ -34,13 +34,19 @@ RegExp(); // Count script types. var named_native_count = 0; +var named_native_names = {}; var extension_count = 0; var normal_count = 0; var scripts = Debug.scripts(); for (i = 0; i < scripts.length; i++) { if (scripts[i].type == Debug.ScriptType.Native) { if (scripts[i].name) { - named_native_count++; + // TODO(1641): Remove check for equally named native scripts once the + // underlying issue is fixed. + if (!named_native_names[scripts[i].name]) { + named_native_names[scripts[i].name] = true; + named_native_count++; + } } } else if (scripts[i].type == Debug.ScriptType.Extension) { extension_count++; diff --git a/deps/v8/test/mjsunit/function-caller.js b/deps/v8/test/mjsunit/function-caller.js index ddc7b5df2..bc01750f9 100644 --- a/deps/v8/test/mjsunit/function-caller.js +++ b/deps/v8/test/mjsunit/function-caller.js @@ -46,3 +46,10 @@ f(null); // Check called from eval. eval('f(null)'); +// Check called from builtin functions. Only show the initially called +// (publicly exposed) builtin function, not it's internal helper functions. +[Array.prototype.sort, Array.prototype.sort].sort(f); + +"abel".replace(/b/g, function h() { + assertEquals(String.prototype.replace, h.caller); +}); diff --git a/deps/v8/test/mjsunit/string-slices-regexp.js b/deps/v8/test/mjsunit/string-slices-regexp.js new file mode 100644 index 000000000..a8cadaedd --- /dev/null +++ b/deps/v8/test/mjsunit/string-slices-regexp.js @@ -0,0 +1,81 @@ +// Copyright 2009 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. +// +// Flags: --string-slices + +//assertEquals('345"12345 6"1234567"123', +// '12345""12345 6""1234567""1234'.slice(2,-1).replace(/""/g, '"')); + +var foo = "lsdfj sldkfj sdklfj læsdfjl sdkfjlsdk fjsdl fjsdljskdj flsj flsdkj flskd regexp: /foobar/\nldkfj sdlkfj sdkl"; +for(var i = 0; i < 1000; i++) { + assertTrue(/^([a-z]+): (.*)/.test(foo.substring(foo.indexOf("regexp:")))); + assertEquals("regexp", RegExp.$1, "RegExp.$1"); +} + +var re = /^(((N({)?)|(R)|(U)|(V)|(B)|(H)|(n((n)|(r)|(v)|(h))?)|(r(r)?)|(v)|(b((n)|(b))?)|(h))|((Y)|(A)|(E)|(o(u)?)|(p(u)?)|(q(u)?)|(s)|(t)|(u)|(w)|(x(u)?)|(y)|(z)|(a((T)|(A)|(L))?)|(c)|(e)|(f(u)?)|(g(u)?)|(i)|(j)|(l)|(m(u)?)))+/; +var r = new RegExp(re) +var str = "_Avtnennan gunzvmu pubExnY nEvln vaTxh rmuhguhaTxnY_".slice(1,-1); +str = str + str; +assertTrue(r.test(str)); +assertTrue(r.test(str)); +var re = /x/; +assertEquals("a.yb", "_axyb_".slice(1,-1).replace(re, ".")); +re.compile("y"); +assertEquals("ax.b", "_axyb_".slice(1,-1).replace(re, ".")); +re.compile("(x)"); +assertEquals(["x", "x"], re.exec("_axyb_".slice(1,-1))); +re.compile("(y)"); +assertEquals(["y", "y"], re.exec("_axyb_".slice(1,-1))); + +for(var i = 0; i < 100; i++) { + var a = "aaaaaaaaaaaaaaaaaaaaaaaabbaacabbabaaaaabbaaaabbac".slice(24,-1); + var b = "bbaacabbabaaaaabbaaaabba" + a; + // The first time, the cons string will be flattened and handled by the + // runtime system. + assertEquals(["bbaa", "a", "", "a"], /((\3|b)\2(a)){2,}/.exec(b)); + // The second time, the cons string is already flattened and will be + // handled by generated code. + assertEquals(["bbaa", "a", "", "a"], /((\3|b)\2(a)){2,}/.exec(b)); + assertEquals(["bbaa", "a", "", "a"], /((\3|b)\2(a)){2,}/.exec(a)); + assertEquals(["bbaa", "a", "", "a"], /((\3|b)\2(a)){2,}/.exec(a)); +} + +var c = "ABCDEFGHIJKLMN".slice(2,-2); +var d = "ABCDEF\u1234GHIJKLMN".slice(2,-2); +var e = "ABCDEFGHIJKLMN".slice(0,-2); +assertTrue(/^C.*L$/.test(c)); +assertTrue(/^C.*L$/.test(c)); +assertTrue(/^C.*L$/.test(d)); +assertTrue(/^C.*L$/.test(d)); +assertTrue(/^A\w{10}L$/.test(e)); +assertTrue(/^A\w{10}L$/.test(e)); + +var e = "qui-opIasd-fghjklzx-cvbn-mqwer-tyuio-pasdf-ghIjkl-zx".slice(6,-6); +var e_split = e.split("-"); +assertEquals(e_split[0], "Iasd"); +assertEquals(e_split[1], "fghjklzx"); +assertEquals(e_split[6], "ghI"); diff --git a/deps/v8/test/mjsunit/string-slices.js b/deps/v8/test/mjsunit/string-slices.js new file mode 100755 index 000000000..b0b05eca3 --- /dev/null +++ b/deps/v8/test/mjsunit/string-slices.js @@ -0,0 +1,198 @@ +// Copyright 2008 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. + +// Flags: --string-slices --expose-externalize-string + +var s = 'abcdefghijklmn'; +assertEquals(s, s.substr()); +assertEquals(s, s.substr(0)); +assertEquals(s, s.substr('0')); +assertEquals(s, s.substr(void 0)); +assertEquals(s, s.substr(null)); +assertEquals(s, s.substr(false)); +assertEquals(s, s.substr(0.9)); +assertEquals(s, s.substr({ valueOf: function() { return 0; } })); +assertEquals(s, s.substr({ toString: function() { return '0'; } })); + +var s1 = s.substring(1); +assertEquals(s1, s.substr(1)); +assertEquals(s1, s.substr('1')); +assertEquals(s1, s.substr(true)); +assertEquals(s1, s.substr(1.1)); +assertEquals(s1, s.substr({ valueOf: function() { return 1; } })); +assertEquals(s1, s.substr({ toString: function() { return '1'; } })); + + +assertEquals(s.substring(s.length - 1), s.substr(-1)); +assertEquals(s.substring(s.length - 1), s.substr(-1.2)); +assertEquals(s.substring(s.length - 1), s.substr(-1.7)); +assertEquals(s.substring(s.length - 2), s.substr(-2)); +assertEquals(s.substring(s.length - 2), s.substr(-2.3)); +assertEquals(s.substring(s.length - 2, s.length - 1), s.substr(-2, 1)); +assertEquals(s, s.substr(-100)); +assertEquals('abc', s.substr(-100, 3)); +assertEquals(s1, s.substr(-s.length + 1)); + +// assertEquals('', s.substr(0, void 0)); // smjs and rhino +assertEquals('abcdefghijklmn', s.substr(0, void 0)); // kjs and v8 +assertEquals('', s.substr(0, null)); +assertEquals(s, s.substr(0, String(s.length))); +assertEquals('a', s.substr(0, true)); + + +// Test substrings of different lengths and alignments. +// First ASCII. +var x = "ASCII"; +for (var i = 0; i < 25; i++) { + x += (i >> 4).toString(16) + (i & 0x0f).toString(16); +} +/x/.exec(x); // Try to force a flatten. +for (var i = 5; i < 25; i++) { + for (var j = 12; j < 25; j++) { + var z = x.substring(i, i+j); + var w = Math.random() * 42; // Allocate something new in new-space. + assertEquals(j, z.length); + for (var k = 0; k < j; k++) { + assertEquals(x.charAt(i+k), z.charAt(k)); + } + } +} +// Then two-byte strings. +x = "UC16\u2028"; // Non-ascii char forces two-byte string. +for (var i = 0; i < 25; i++) { + x += (i >> 4).toString(16) + (i & 0x0f).toString(16); +} +/x/.exec(x); // Try to force a flatten. +for (var i = 5; i < 25; i++) { + for (var j = 0; j < 25; j++) { + var z = x.substring(i, i + j); + var w = Math.random() * 42; // Allocate something new in new-space. + assertEquals(j, z.length); + for (var k = 0; k < j; k++) { + assertEquals(x.charAt(i+k), z.charAt(k)); + } + } +} + +// Keep creating strings to to force allocation failure on substring creation. +var x = "0123456789ABCDEF"; +x += x; // 2^5 +x += x; +x += x; +x += x; +x += x; +x += x; // 2^10 +x += x; +x += x; +var xl = x.length; +var cache = []; +for (var i = 0; i < 10000; i++) { + var z = x.substring(i % xl); + assertEquals(xl - (i % xl), z.length); + cache.push(z); +} + + +// Same with two-byte strings +var x = "\u2028123456789ABCDEF"; +x += x; // 2^5 +x += x; +x += x; +x += x; +x += x; +x += x; // 2^10 +x += x; +x += x; +var xl = x.length; +var cache = []; +for (var i = 0; i < 10000; i++) { + var z = x.substring(i % xl); + assertEquals(xl - (i % xl), z.length); + cache.push(z); +} + +// Substring of substring. +var cache = []; +var last = x; +var offset = 0; +for (var i = 0; i < 64; i++) { + var z = last.substring(i); + last = z; + cache.push(z); + offset += i; +} +for (var i = 63; i >= 0; i--) { + var z = cache.pop(); + assertTrue(/\u2028123456789ABCDEF/.test(z)); + assertEquals(xl - offset, z.length); + offset -= i; +} + +// Test charAt for different strings. +function f(s1, s2, s3, i) { + assertEquals(String.fromCharCode(97+i%11), s1.charAt(i%11)); + assertEquals(String.fromCharCode(97+i%11), s2.charAt(i%11)); + assertEquals(String.fromCharCode(98+i%11), s3.charAt(i%11)); + assertEquals(String.fromCharCode(101), s3.charAt(3)); +} + +flat = "abcdefghijkl12345"; +cons = flat + flat.toUpperCase(); +slice = "abcdefghijklmn12345".slice(1, -1); +for ( var i = 0; i < 1000; i++) { + f(flat, cons, slice, i); +} +flat = "abcdefghijkl1\u20232345"; +cons = flat + flat.toUpperCase(); +slice = "abcdefghijklmn1\u20232345".slice(1, -1); +for ( var i = 0; i < 1000; i++) { + f(flat, cons, slice, i); +} + +// Concatenate substrings. +var ascii = 'abcdefghijklmnop'; +var utf = '\u03B1\u03B2\u03B3\u03B4\u03B5\u03B6\u03B7\u03B8\u03B9\u03BA\u03BB'; +assertEquals("klmno", ascii.substring(10,15) + ascii.substring(16)); +assertEquals("\u03B4\u03B7", utf.substring(3,4) + utf.substring(6,7)); +assertEquals("klp", ascii.substring(10,12) + ascii.substring(15,16)); +assertEquals("\u03B1\u03B4\u03B5", utf.substring(0,1) + utf.substring(5,3)); +assertEquals("", ascii.substring(16) + utf.substring(16)); +assertEquals("bcdef\u03B4\u03B5\u03B6\u03B7\u03B8\u03B9", + ascii.substring(1,6) + utf.substring(3,9)); +assertEquals("\u03B4\u03B5\u03B6\u03B7\u03B8\u03B9abcdefghijklmnop", + utf.substring(3,9) + ascii); +assertEquals("\u03B2\u03B3\u03B4\u03B5\u03B4\u03B5\u03B6\u03B7", + utf.substring(5,1) + utf.substring(3,7)); + +/* +// Externalizing strings. +var a = "123456789qwertyuiopasdfghjklzxcvbnm"; +var b = a.slice(1,-1); +assertEquals(a.slice(1,-1), b); +externalizeString(a); +assertEquals(a.slice(1,-1), b); +*/
\ No newline at end of file diff --git a/deps/v8/test/mjsunit/substr.js b/deps/v8/test/mjsunit/substr.js index f69a9c045..cffaf94da 100755 --- a/deps/v8/test/mjsunit/substr.js +++ b/deps/v8/test/mjsunit/substr.js @@ -135,3 +135,20 @@ for (var i = 0; i < 10000; i++) { assertEquals(xl - (i % xl), z.length); cache.push(z); } + +// Substring of substring. +var cache = []; +var last = x; +var offset = 0; +for (var i = 0; i < 64; i++) { + var z = last.substring(i); + last = z; + cache.push(z); + offset += i; +} +for (var i = 63; i >= 0; i--) { + var z = cache.pop(); + assertTrue(/\u2028123456789ABCDEF/.test(z)); + assertEquals(xl - offset, z.length); + offset -= i; +} |