Author: a...@chromium.org
Date: Mon Feb 2 00:33:31 2009
New Revision: 1200
Modified:
trunk/src/jsregexp.cc
Log:
Push bleeding_edge revision 1199 to trunk. Fixes chromium issue 7258.
Modified: trunk/src/jsregexp.cc
==============================================================================
--- trunk/src/jsregexp.cc (original)
+++ trunk/src/jsregexp.cc Mon Feb 2 00:33:31 2009
@@ -672,8 +672,7 @@
JSRegExp::Flags flags = re->GetFlags();
Handle<String> pattern(re->Pattern());
- StringShape shape(*pattern);
- if (!pattern->IsFlat(shape)) {
+ if (!pattern->IsFlat(StringShape(*pattern))) {
FlattenString(pattern);
}
@@ -783,8 +782,7 @@
Handle<String> subject) {
ASSERT_EQ(regexp->TypeTag(), JSRegExp::IRREGEXP);
- StringShape shape(*subject);
- bool is_ascii = shape.IsAsciiRepresentation();
+ bool is_ascii = StringShape(*subject).IsAsciiRepresentation();
Handle<FixedArray> irregexp = GetCompiledIrregexp(regexp, is_ascii);
if (irregexp.is_null()) {
return Handle<Object>::null();
@@ -800,7 +798,7 @@
int i = 0;
Handle<Object> matches;
- if (!subject->IsFlat(shape)) {
+ if (!subject->IsFlat(StringShape(*subject))) {
FlattenString(subject);
}
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
