Revision: 5846
Author: [email protected]
Date: Thu Nov 18 00:45:17 2010
Log: Leverage Lasse's StringSearch object to speed up calculations of script
line ends.
Review URL: http://codereview.chromium.org/5100002
http://code.google.com/p/v8/source/detail?r=5846
Modified:
/branches/bleeding_edge/src/handles.cc
=======================================
--- /branches/bleeding_edge/src/handles.cc Wed Nov 17 04:49:27 2010
+++ /branches/bleeding_edge/src/handles.cc Thu Nov 18 00:45:17 2010
@@ -36,6 +36,7 @@
#include "execution.h"
#include "global-handles.h"
#include "natives.h"
+#include "string-search.h"
#include "runtime.h"
#include "stub-cache.h"
@@ -508,22 +509,21 @@
}
-Handle<FixedArray> CalculateLineEnds(Handle<String> src,
- bool with_imaginary_last_new_line) {
- const int src_len = src->length();
- Handle<String> new_line = Factory::NewStringFromAscii(CStrVector("\n"));
+template <typename SourceChar>
+static Handle<FixedArray> CalculateLineEnds(Vector<const SourceChar> src,
+ bool with_last_line) {
+ const int src_len = src.length();
+ StringSearch<char, SourceChar> search(CStrVector("\n"));
// Pass 1: Identify line count.
int line_count = 0;
int position = 0;
while (position != -1 && position < src_len) {
- position = Runtime::StringMatch(src, new_line, position);
+ position = search.Search(src, position);
if (position != -1) {
position++;
- }
- if (position != -1) {
line_count++;
- } else if (with_imaginary_last_new_line) {
+ } else if (with_last_line) {
// Even if the last line misses a line end, it is counted.
line_count++;
}
@@ -534,10 +534,10 @@
int array_index = 0;
position = 0;
while (position != -1 && position < src_len) {
- position = Runtime::StringMatch(src, new_line, position);
+ position = search.Search(src, position);
if (position != -1) {
array->set(array_index++, Smi::FromInt(position++));
- } else if (with_imaginary_last_new_line) {
+ } else if (with_last_line) {
// If the script does not end with a line ending add the final end
// position as just past the last line ending.
array->set(array_index++, Smi::FromInt(src_len));
@@ -547,6 +547,20 @@
return array;
}
+
+Handle<FixedArray> CalculateLineEnds(Handle<String> src,
+ bool with_last_line) {
+ if (!src->IsFlat()) FlattenString(src);
+ AssertNoAllocation no_heap_allocation; // ensure vectors stay valid
+ // Extract flattened substring of cons string before determining
asciiness.
+ String* seq_src = *src;
+ if (seq_src->IsConsString()) seq_src =
ConsString::cast(seq_src)->first();
+ // Dispatch on type of strings.
+ if (seq_src->IsAsciiRepresentation()) {
+ return CalculateLineEnds(seq_src->ToAsciiVector(), with_last_line);
+ }
+ return CalculateLineEnds(seq_src->ToUC16Vector(), with_last_line);
+}
// Convert code position into line number.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
