OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
445 } | 445 } |
446 if (!terminate_left && left.is_null()) { | 446 if (!terminate_left && left.is_null()) { |
447 left = ConstructRandomString(data, max_recursion - 1); | 447 left = ConstructRandomString(data, max_recursion - 1); |
448 } | 448 } |
449 // Build the cons string. | 449 // Build the cons string. |
450 Handle<String> root = factory->NewConsString(left, right).ToHandleChecked(); | 450 Handle<String> root = factory->NewConsString(left, right).ToHandleChecked(); |
451 CHECK(root->IsConsString() && !root->IsFlat()); | 451 CHECK(root->IsConsString() && !root->IsFlat()); |
452 // Special work needed for flat string. | 452 // Special work needed for flat string. |
453 if (flat) { | 453 if (flat) { |
454 data->stats_.empty_leaves_++; | 454 data->stats_.empty_leaves_++; |
455 FlattenString(root); | 455 String::Flatten(root); |
456 CHECK(root->IsConsString() && root->IsFlat()); | 456 CHECK(root->IsConsString() && root->IsFlat()); |
457 } | 457 } |
458 return root; | 458 return root; |
459 } | 459 } |
460 | 460 |
461 | 461 |
462 static Handle<String> ConstructLeft( | 462 static Handle<String> ConstructLeft( |
463 ConsStringGenerationData* data, | 463 ConsStringGenerationData* data, |
464 int depth) { | 464 int depth) { |
465 Factory* factory = CcTest::i_isolate()->factory(); | 465 Factory* factory = CcTest::i_isolate()->factory(); |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
566 s2->Get(s2->length() - 1); | 566 s2->Get(s2->length() - 1); |
567 } | 567 } |
568 | 568 |
569 | 569 |
570 TEST(Traverse) { | 570 TEST(Traverse) { |
571 printf("TestTraverse\n"); | 571 printf("TestTraverse\n"); |
572 CcTest::InitializeVM(); | 572 CcTest::InitializeVM(); |
573 v8::HandleScope scope(CcTest::isolate()); | 573 v8::HandleScope scope(CcTest::isolate()); |
574 ConsStringGenerationData data(false); | 574 ConsStringGenerationData data(false); |
575 Handle<String> flat = ConstructBalanced(&data); | 575 Handle<String> flat = ConstructBalanced(&data); |
576 FlattenString(flat); | 576 String::Flatten(flat); |
577 Handle<String> left_asymmetric = ConstructLeft(&data, DEEP_DEPTH); | 577 Handle<String> left_asymmetric = ConstructLeft(&data, DEEP_DEPTH); |
578 Handle<String> right_asymmetric = ConstructRight(&data, DEEP_DEPTH); | 578 Handle<String> right_asymmetric = ConstructRight(&data, DEEP_DEPTH); |
579 Handle<String> symmetric = ConstructBalanced(&data); | 579 Handle<String> symmetric = ConstructBalanced(&data); |
580 printf("1\n"); | 580 printf("1\n"); |
581 Traverse(flat, symmetric); | 581 Traverse(flat, symmetric); |
582 printf("2\n"); | 582 printf("2\n"); |
583 Traverse(flat, left_asymmetric); | 583 Traverse(flat, left_asymmetric); |
584 printf("3\n"); | 584 printf("3\n"); |
585 Traverse(flat, right_asymmetric); | 585 Traverse(flat, right_asymmetric); |
586 printf("4\n"); | 586 printf("4\n"); |
587 Handle<String> left_deep_asymmetric = | 587 Handle<String> left_deep_asymmetric = |
588 ConstructLeft(&data, SUPER_DEEP_DEPTH); | 588 ConstructLeft(&data, SUPER_DEEP_DEPTH); |
589 Handle<String> right_deep_asymmetric = | 589 Handle<String> right_deep_asymmetric = |
590 ConstructRight(&data, SUPER_DEEP_DEPTH); | 590 ConstructRight(&data, SUPER_DEEP_DEPTH); |
591 printf("5\n"); | 591 printf("5\n"); |
592 TraverseFirst(left_asymmetric, left_deep_asymmetric, 1050); | 592 TraverseFirst(left_asymmetric, left_deep_asymmetric, 1050); |
593 printf("6\n"); | 593 printf("6\n"); |
594 TraverseFirst(left_asymmetric, right_deep_asymmetric, 65536); | 594 TraverseFirst(left_asymmetric, right_deep_asymmetric, 65536); |
595 printf("7\n"); | 595 printf("7\n"); |
596 FlattenString(left_asymmetric); | 596 String::Flatten(left_asymmetric); |
597 printf("10\n"); | 597 printf("10\n"); |
598 Traverse(flat, left_asymmetric); | 598 Traverse(flat, left_asymmetric); |
599 printf("11\n"); | 599 printf("11\n"); |
600 FlattenString(right_asymmetric); | 600 String::Flatten(right_asymmetric); |
601 printf("12\n"); | 601 printf("12\n"); |
602 Traverse(flat, right_asymmetric); | 602 Traverse(flat, right_asymmetric); |
603 printf("14\n"); | 603 printf("14\n"); |
604 FlattenString(symmetric); | 604 String::Flatten(symmetric); |
605 printf("15\n"); | 605 printf("15\n"); |
606 Traverse(flat, symmetric); | 606 Traverse(flat, symmetric); |
607 printf("16\n"); | 607 printf("16\n"); |
608 FlattenString(left_deep_asymmetric); | 608 String::Flatten(left_deep_asymmetric); |
609 printf("18\n"); | 609 printf("18\n"); |
610 } | 610 } |
611 | 611 |
612 | 612 |
613 static void VerifyCharacterStream( | 613 static void VerifyCharacterStream( |
614 String* flat_string, String* cons_string) { | 614 String* flat_string, String* cons_string) { |
615 // Do not want to test ConString traversal on flat string. | 615 // Do not want to test ConString traversal on flat string. |
616 CHECK(flat_string->IsFlat() && !flat_string->IsConsString()); | 616 CHECK(flat_string->IsFlat() && !flat_string->IsConsString()); |
617 CHECK(cons_string->IsConsString()); | 617 CHECK(cons_string->IsConsString()); |
618 // TODO(dcarney) Test stream reset as well. | 618 // TODO(dcarney) Test stream reset as well. |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
663 ConsStringGenerationData data(true); | 663 ConsStringGenerationData data(true); |
664 for (int i = 0; i < test_cases; i++) { | 664 for (int i = 0; i < test_cases; i++) { |
665 printf("%d\n", i); | 665 printf("%d\n", i); |
666 HandleScope inner_scope(isolate); | 666 HandleScope inner_scope(isolate); |
667 AlwaysAllocateScope always_allocate(isolate); | 667 AlwaysAllocateScope always_allocate(isolate); |
668 // Build flat version of cons string. | 668 // Build flat version of cons string. |
669 Handle<String> flat_string = build(i, &data); | 669 Handle<String> flat_string = build(i, &data); |
670 ConsStringStats flat_string_stats; | 670 ConsStringStats flat_string_stats; |
671 AccumulateStats(flat_string, &flat_string_stats); | 671 AccumulateStats(flat_string, &flat_string_stats); |
672 // Flatten string. | 672 // Flatten string. |
673 FlattenString(flat_string); | 673 String::Flatten(flat_string); |
674 // Build unflattened version of cons string to test. | 674 // Build unflattened version of cons string to test. |
675 Handle<String> cons_string = build(i, &data); | 675 Handle<String> cons_string = build(i, &data); |
676 ConsStringStats cons_string_stats; | 676 ConsStringStats cons_string_stats; |
677 AccumulateStats(cons_string, &cons_string_stats); | 677 AccumulateStats(cons_string, &cons_string_stats); |
678 DisallowHeapAllocation no_allocation; | 678 DisallowHeapAllocation no_allocation; |
679 PrintStats(data); | 679 PrintStats(data); |
680 // Full verify of cons string. | 680 // Full verify of cons string. |
681 cons_string_stats.VerifyEqual(flat_string_stats); | 681 cons_string_stats.VerifyEqual(flat_string_stats); |
682 cons_string_stats.VerifyEqual(data.stats_); | 682 cons_string_stats.VerifyEqual(data.stats_); |
683 VerifyConsString(cons_string, &data); | 683 VerifyConsString(cons_string, &data); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
718 case 6: | 718 case 6: |
719 // Simple flattened tree. | 719 // Simple flattened tree. |
720 data->stats_.chars_ += data->block(0)->length(); | 720 data->stats_.chars_ += data->block(0)->length(); |
721 data->stats_.chars_ += data->block(1)->length(); | 721 data->stats_.chars_ += data->block(1)->length(); |
722 data->stats_.leaves_ += 2; | 722 data->stats_.leaves_ += 2; |
723 data->stats_.empty_leaves_ += 1; | 723 data->stats_.empty_leaves_ += 1; |
724 { | 724 { |
725 Handle<String> string = | 725 Handle<String> string = |
726 factory->NewConsString(data->block(0), data->block(1)) | 726 factory->NewConsString(data->block(0), data->block(1)) |
727 .ToHandleChecked(); | 727 .ToHandleChecked(); |
728 FlattenString(string); | 728 String::Flatten(string); |
729 return string; | 729 return string; |
730 } | 730 } |
731 case 7: | 731 case 7: |
732 // Left node flattened. | 732 // Left node flattened. |
733 data->stats_.chars_ += data->block(0)->length(); | 733 data->stats_.chars_ += data->block(0)->length(); |
734 data->stats_.chars_ += data->block(1)->length(); | 734 data->stats_.chars_ += data->block(1)->length(); |
735 data->stats_.chars_ += data->block(2)->length(); | 735 data->stats_.chars_ += data->block(2)->length(); |
736 data->stats_.leaves_ += 3; | 736 data->stats_.leaves_ += 3; |
737 data->stats_.empty_leaves_ += 1; | 737 data->stats_.empty_leaves_ += 1; |
738 data->stats_.left_traversals_ += 1; | 738 data->stats_.left_traversals_ += 1; |
739 { | 739 { |
740 Handle<String> left = | 740 Handle<String> left = |
741 factory->NewConsString(data->block(0), data->block(1)) | 741 factory->NewConsString(data->block(0), data->block(1)) |
742 .ToHandleChecked(); | 742 .ToHandleChecked(); |
743 FlattenString(left); | 743 String::Flatten(left); |
744 return factory->NewConsString(left, data->block(2)).ToHandleChecked(); | 744 return factory->NewConsString(left, data->block(2)).ToHandleChecked(); |
745 } | 745 } |
746 case 8: | 746 case 8: |
747 // Left node and right node flattened. | 747 // Left node and right node flattened. |
748 data->stats_.chars_ += data->block(0)->length(); | 748 data->stats_.chars_ += data->block(0)->length(); |
749 data->stats_.chars_ += data->block(1)->length(); | 749 data->stats_.chars_ += data->block(1)->length(); |
750 data->stats_.chars_ += data->block(2)->length(); | 750 data->stats_.chars_ += data->block(2)->length(); |
751 data->stats_.chars_ += data->block(3)->length(); | 751 data->stats_.chars_ += data->block(3)->length(); |
752 data->stats_.leaves_ += 4; | 752 data->stats_.leaves_ += 4; |
753 data->stats_.empty_leaves_ += 2; | 753 data->stats_.empty_leaves_ += 2; |
754 data->stats_.left_traversals_ += 1; | 754 data->stats_.left_traversals_ += 1; |
755 data->stats_.right_traversals_ += 1; | 755 data->stats_.right_traversals_ += 1; |
756 { | 756 { |
757 Handle<String> left = | 757 Handle<String> left = |
758 factory->NewConsString(data->block(0), data->block(1)) | 758 factory->NewConsString(data->block(0), data->block(1)) |
759 .ToHandleChecked(); | 759 .ToHandleChecked(); |
760 FlattenString(left); | 760 String::Flatten(left); |
761 Handle<String> right = | 761 Handle<String> right = |
762 factory->NewConsString(data->block(2), data->block(2)) | 762 factory->NewConsString(data->block(2), data->block(2)) |
763 .ToHandleChecked(); | 763 .ToHandleChecked(); |
764 FlattenString(right); | 764 String::Flatten(right); |
765 return factory->NewConsString(left, right).ToHandleChecked(); | 765 return factory->NewConsString(left, right).ToHandleChecked(); |
766 } | 766 } |
767 } | 767 } |
768 UNREACHABLE(); | 768 UNREACHABLE(); |
769 return Handle<String>(); | 769 return Handle<String>(); |
770 } | 770 } |
771 | 771 |
772 | 772 |
773 TEST(StringCharacterStreamEdgeCases) { | 773 TEST(StringCharacterStreamEdgeCases) { |
774 printf("TestStringCharacterStreamEdgeCases\n"); | 774 printf("TestStringCharacterStreamEdgeCases\n"); |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
871 foo[i] = "foo "[i % 4]; | 871 foo[i] = "foo "[i % 4]; |
872 } | 872 } |
873 Handle<String> string = | 873 Handle<String> string = |
874 factory->NewStringFromAscii(Vector<const char>(foo, DEEP_ASCII_DEPTH)); | 874 factory->NewStringFromAscii(Vector<const char>(foo, DEEP_ASCII_DEPTH)); |
875 Handle<String> foo_string = factory->NewStringFromAscii(CStrVector("foo")); | 875 Handle<String> foo_string = factory->NewStringFromAscii(CStrVector("foo")); |
876 for (int i = 0; i < DEEP_ASCII_DEPTH; i += 10) { | 876 for (int i = 0; i < DEEP_ASCII_DEPTH; i += 10) { |
877 string = factory->NewConsString(string, foo_string).ToHandleChecked(); | 877 string = factory->NewConsString(string, foo_string).ToHandleChecked(); |
878 } | 878 } |
879 Handle<String> flat_string = | 879 Handle<String> flat_string = |
880 factory->NewConsString(string, foo_string).ToHandleChecked(); | 880 factory->NewConsString(string, foo_string).ToHandleChecked(); |
881 FlattenString(flat_string); | 881 String::Flatten(flat_string); |
882 | 882 |
883 for (int i = 0; i < 500; i++) { | 883 for (int i = 0; i < 500; i++) { |
884 TraverseFirst(flat_string, string, DEEP_ASCII_DEPTH); | 884 TraverseFirst(flat_string, string, DEEP_ASCII_DEPTH); |
885 } | 885 } |
886 DeleteArray<char>(foo); | 886 DeleteArray<char>(foo); |
887 } | 887 } |
888 | 888 |
889 | 889 |
890 TEST(Utf8Conversion) { | 890 TEST(Utf8Conversion) { |
891 // Smoke test for converting strings to utf-8. | 891 // Smoke test for converting strings to utf-8. |
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1415 dummy.Dispose(); \ | 1415 dummy.Dispose(); \ |
1416 } | 1416 } |
1417 | 1417 |
1418 INVALID_STRING_TEST(NewStringFromAscii, char) | 1418 INVALID_STRING_TEST(NewStringFromAscii, char) |
1419 INVALID_STRING_TEST(NewStringFromUtf8, char) | 1419 INVALID_STRING_TEST(NewStringFromUtf8, char) |
1420 INVALID_STRING_TEST(NewStringFromOneByte, uint8_t) | 1420 INVALID_STRING_TEST(NewStringFromOneByte, uint8_t) |
1421 INVALID_STRING_TEST(InternalizeOneByteString, uint8_t) | 1421 INVALID_STRING_TEST(InternalizeOneByteString, uint8_t) |
1422 INVALID_STRING_TEST(InternalizeUtf8String, char) | 1422 INVALID_STRING_TEST(InternalizeUtf8String, char) |
1423 | 1423 |
1424 #undef INVALID_STRING_TEST | 1424 #undef INVALID_STRING_TEST |
OLD | NEW |