Avoids allocating a JSArray of capture information on each non-global
regular expression match. Also moves all last-match information into one place where it can be updated from C++ code (this will be used in another afsnit). Review URL: http://codereview.chromium.org/28184 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1383 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
erik.corry@gmail.com
parent
0864b2d646
commit
5b8c63f9d5
151
src/jsregexp.cc
151
src/jsregexp.cc
@ -256,12 +256,14 @@ Handle<Object> RegExpImpl::Compile(Handle<JSRegExp> re,
|
||||
|
||||
Handle<Object> RegExpImpl::Exec(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject,
|
||||
Handle<Object> index) {
|
||||
int index,
|
||||
Handle<JSArray> last_match_info) {
|
||||
switch (regexp->TypeTag()) {
|
||||
case JSRegExp::ATOM:
|
||||
return AtomExec(regexp, subject, index);
|
||||
return AtomExec(regexp, subject, index, last_match_info);
|
||||
case JSRegExp::IRREGEXP: {
|
||||
Handle<Object> result = IrregexpExec(regexp, subject, index);
|
||||
Handle<Object> result =
|
||||
IrregexpExec(regexp, subject, index, last_match_info);
|
||||
ASSERT(!result.is_null() || Top::has_pending_exception());
|
||||
return result;
|
||||
}
|
||||
@ -273,12 +275,14 @@ Handle<Object> RegExpImpl::Exec(Handle<JSRegExp> regexp,
|
||||
|
||||
|
||||
Handle<Object> RegExpImpl::ExecGlobal(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject) {
|
||||
Handle<String> subject,
|
||||
Handle<JSArray> last_match_info) {
|
||||
switch (regexp->TypeTag()) {
|
||||
case JSRegExp::ATOM:
|
||||
return AtomExecGlobal(regexp, subject);
|
||||
return AtomExecGlobal(regexp, subject, last_match_info);
|
||||
case JSRegExp::IRREGEXP: {
|
||||
Handle<Object> result = IrregexpExecGlobal(regexp, subject);
|
||||
Handle<Object> result =
|
||||
IrregexpExecGlobal(regexp, subject, last_match_info);
|
||||
ASSERT(!result.is_null() || Top::has_pending_exception());
|
||||
return result;
|
||||
}
|
||||
@ -301,51 +305,79 @@ Handle<Object> RegExpImpl::AtomCompile(Handle<JSRegExp> re,
|
||||
}
|
||||
|
||||
|
||||
static void SetAtomLastCapture(FixedArray* array,
|
||||
String* subject,
|
||||
int from,
|
||||
int to) {
|
||||
RegExpImpl::SetLastCaptureCount(array, 2);
|
||||
RegExpImpl::SetLastSubject(array, subject);
|
||||
RegExpImpl::SetLastInput(array, subject);
|
||||
RegExpImpl::SetCapture(array, 0, from);
|
||||
RegExpImpl::SetCapture(array, 1, to);
|
||||
}
|
||||
|
||||
|
||||
Handle<Object> RegExpImpl::AtomExec(Handle<JSRegExp> re,
|
||||
Handle<String> subject,
|
||||
Handle<Object> index) {
|
||||
int index,
|
||||
Handle<JSArray> last_match_info) {
|
||||
Handle<String> needle(String::cast(re->DataAt(JSRegExp::kAtomPatternIndex)));
|
||||
|
||||
uint32_t start_index;
|
||||
if (!Array::IndexFromObject(*index, &start_index)) {
|
||||
return Handle<Smi>(Smi::FromInt(-1));
|
||||
}
|
||||
uint32_t start_index = index;
|
||||
|
||||
int value = Runtime::StringMatch(subject, needle, start_index);
|
||||
if (value == -1) return Factory::null_value();
|
||||
ASSERT(last_match_info->HasFastElements());
|
||||
|
||||
Handle<FixedArray> array = Factory::NewFixedArray(2);
|
||||
array->set(0, Smi::FromInt(value));
|
||||
array->set(1, Smi::FromInt(value + needle->length()));
|
||||
return Factory::NewJSArrayWithElements(array);
|
||||
Handle<FixedArray> array(last_match_info->elements());
|
||||
SetAtomLastCapture(*array, *subject, value, value + needle->length());
|
||||
return last_match_info;
|
||||
}
|
||||
|
||||
|
||||
Handle<Object> RegExpImpl::AtomExecGlobal(Handle<JSRegExp> re,
|
||||
Handle<String> subject) {
|
||||
Handle<String> subject,
|
||||
Handle<JSArray> last_match_info) {
|
||||
Handle<String> needle(String::cast(re->DataAt(JSRegExp::kAtomPatternIndex)));
|
||||
ASSERT(last_match_info->HasFastElements());
|
||||
Handle<JSArray> result = Factory::NewJSArray(1);
|
||||
int index = 0;
|
||||
int match_count = 0;
|
||||
int subject_length = subject->length();
|
||||
int needle_length = needle->length();
|
||||
int last_value = -1;
|
||||
while (true) {
|
||||
HandleScope scope;
|
||||
int value = -1;
|
||||
if (index + needle_length <= subject_length) {
|
||||
value = Runtime::StringMatch(subject, needle, index);
|
||||
}
|
||||
if (value == -1) break;
|
||||
HandleScope scope;
|
||||
if (value == -1) {
|
||||
if (last_value != -1) {
|
||||
Handle<FixedArray> array(last_match_info->elements());
|
||||
SetAtomLastCapture(*array,
|
||||
*subject,
|
||||
last_value,
|
||||
last_value + needle->length());
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
int end = value + needle_length;
|
||||
|
||||
Handle<FixedArray> array = Factory::NewFixedArray(2);
|
||||
array->set(0, Smi::FromInt(value));
|
||||
array->set(1, Smi::FromInt(end));
|
||||
// Create an array that looks like the static last_match_info array
|
||||
// that is attached to the global RegExp object. We will be returning
|
||||
// an array of these.
|
||||
Handle<FixedArray> array = Factory::NewFixedArray(kFirstCapture + 2);
|
||||
SetCapture(*array, 0, value);
|
||||
SetCapture(*array, 1, end);
|
||||
SetLastCaptureCount(*array, 2);
|
||||
Handle<JSArray> pair = Factory::NewJSArrayWithElements(array);
|
||||
SetElement(result, match_count, pair);
|
||||
match_count++;
|
||||
index = end;
|
||||
if (needle_length == 0) index++;
|
||||
last_value = value;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
@ -445,7 +477,8 @@ Handle<Object>RegExpImpl::IrregexpPrepare(Handle<JSRegExp> re,
|
||||
|
||||
Handle<Object> RegExpImpl::IrregexpExec(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject,
|
||||
Handle<Object> index) {
|
||||
int index,
|
||||
Handle<JSArray> last_match_info) {
|
||||
ASSERT_EQ(regexp->TypeTag(), JSRegExp::IRREGEXP);
|
||||
ASSERT(regexp->DataAt(JSRegExp::kIrregexpDataIndex)->IsFixedArray());
|
||||
|
||||
@ -457,12 +490,11 @@ Handle<Object> RegExpImpl::IrregexpExec(Handle<JSRegExp> regexp,
|
||||
}
|
||||
|
||||
// Prepare space for the return values.
|
||||
int number_of_registers = IrregexpNumberOfRegisters(irregexp);
|
||||
OffsetsVector offsets(number_of_registers);
|
||||
int number_of_capture_registers =
|
||||
(IrregexpNumberOfCaptures(irregexp) + 1) * 2;
|
||||
OffsetsVector offsets(number_of_capture_registers);
|
||||
|
||||
int num_captures = IrregexpNumberOfCaptures(irregexp);
|
||||
|
||||
int previous_index = static_cast<int>(DoubleToInteger(index->Number()));
|
||||
int previous_index = index;
|
||||
|
||||
#ifdef DEBUG
|
||||
if (FLAG_trace_regexp_bytecodes) {
|
||||
@ -476,8 +508,11 @@ Handle<Object> RegExpImpl::IrregexpExec(Handle<JSRegExp> regexp,
|
||||
FlattenString(subject);
|
||||
}
|
||||
|
||||
last_match_info->EnsureSize(number_of_capture_registers + kLastMatchOverhead);
|
||||
|
||||
return IrregexpExecOnce(irregexp,
|
||||
num_captures,
|
||||
number_of_capture_registers,
|
||||
last_match_info,
|
||||
subject,
|
||||
previous_index,
|
||||
offsets.vector(),
|
||||
@ -486,7 +521,8 @@ Handle<Object> RegExpImpl::IrregexpExec(Handle<JSRegExp> regexp,
|
||||
|
||||
|
||||
Handle<Object> RegExpImpl::IrregexpExecGlobal(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject) {
|
||||
Handle<String> subject,
|
||||
Handle<JSArray> last_match_info) {
|
||||
ASSERT_EQ(regexp->TypeTag(), JSRegExp::IRREGEXP);
|
||||
|
||||
bool is_ascii = StringShape(*subject).IsAsciiRepresentation();
|
||||
@ -496,19 +532,22 @@ Handle<Object> RegExpImpl::IrregexpExecGlobal(Handle<JSRegExp> regexp,
|
||||
}
|
||||
|
||||
// Prepare space for the return values.
|
||||
int number_of_registers = IrregexpNumberOfRegisters(irregexp);
|
||||
OffsetsVector offsets(number_of_registers);
|
||||
int number_of_capture_registers =
|
||||
(IrregexpNumberOfCaptures(irregexp) + 1) * 2;
|
||||
OffsetsVector offsets(number_of_capture_registers);
|
||||
|
||||
int previous_index = 0;
|
||||
|
||||
Handle<JSArray> result = Factory::NewJSArray(0);
|
||||
int i = 0;
|
||||
int result_length = 0;
|
||||
Handle<Object> matches;
|
||||
|
||||
if (!subject->IsFlat(StringShape(*subject))) {
|
||||
FlattenString(subject);
|
||||
}
|
||||
|
||||
last_match_info->EnsureSize(number_of_capture_registers + kLastMatchOverhead);
|
||||
|
||||
while (true) {
|
||||
if (previous_index > subject->length() || previous_index < 0) {
|
||||
// Per ECMA-262 15.10.6.2, if the previous index is greater than the
|
||||
@ -523,8 +562,10 @@ Handle<Object> RegExpImpl::IrregexpExecGlobal(Handle<JSRegExp> regexp,
|
||||
PrintF("\n\nSubject string: '%s'\n\n", *(subject->ToCString()));
|
||||
}
|
||||
#endif
|
||||
HandleScope scope;
|
||||
matches = IrregexpExecOnce(irregexp,
|
||||
IrregexpNumberOfCaptures(irregexp),
|
||||
number_of_capture_registers,
|
||||
last_match_info,
|
||||
subject,
|
||||
previous_index,
|
||||
offsets.vector(),
|
||||
@ -536,12 +577,25 @@ Handle<Object> RegExpImpl::IrregexpExecGlobal(Handle<JSRegExp> regexp,
|
||||
}
|
||||
|
||||
if (matches->IsJSArray()) {
|
||||
SetElement(result, i, matches);
|
||||
i++;
|
||||
previous_index = offsets.vector()[1];
|
||||
if (offsets.vector()[0] == offsets.vector()[1]) {
|
||||
previous_index++;
|
||||
// Create an array that looks like the static last_match_info array
|
||||
// that is attached to the global RegExp object. We will be returning
|
||||
// an array of these.
|
||||
Handle<FixedArray> matches_array(JSArray::cast(*matches)->elements());
|
||||
Handle<JSArray> latest_match =
|
||||
Factory::NewJSArray(kFirstCapture + number_of_capture_registers);
|
||||
Handle<FixedArray> latest_match_array(latest_match->elements());
|
||||
|
||||
for (int i = 0; i < number_of_capture_registers; i++) {
|
||||
SetCapture(*latest_match_array, i, GetCapture(*matches_array, i));
|
||||
}
|
||||
SetLastCaptureCount(*latest_match_array, number_of_capture_registers);
|
||||
|
||||
SetElement(result, result_length, latest_match);
|
||||
result_length++;
|
||||
previous_index = GetCapture(*matches_array, 1);
|
||||
if (GetCapture(*matches_array, 0) == previous_index)
|
||||
previous_index++;
|
||||
|
||||
} else {
|
||||
ASSERT(matches->IsNull());
|
||||
return result;
|
||||
@ -552,7 +606,8 @@ Handle<Object> RegExpImpl::IrregexpExecGlobal(Handle<JSRegExp> regexp,
|
||||
|
||||
|
||||
Handle<Object> RegExpImpl::IrregexpExecOnce(Handle<FixedArray> irregexp,
|
||||
int num_captures,
|
||||
int number_of_capture_registers,
|
||||
Handle<JSArray> last_match_info,
|
||||
Handle<String> subject,
|
||||
int previous_index,
|
||||
int* offsets_vector,
|
||||
@ -642,7 +697,7 @@ Handle<Object> RegExpImpl::IrregexpExecOnce(Handle<FixedArray> irregexp,
|
||||
#endif
|
||||
}
|
||||
case RegExpMacroAssembler::kBytecodeImplementation: {
|
||||
for (int i = (num_captures + 1) * 2 - 1; i >= 0; i--) {
|
||||
for (int i = number_of_capture_registers - 1; i >= 0; i--) {
|
||||
offsets_vector[i] = -1;
|
||||
}
|
||||
Handle<ByteArray> byte_codes = IrregexpByteCode(irregexp);
|
||||
@ -664,13 +719,16 @@ Handle<Object> RegExpImpl::IrregexpExecOnce(Handle<FixedArray> irregexp,
|
||||
return Factory::null_value();
|
||||
}
|
||||
|
||||
Handle<FixedArray> array = Factory::NewFixedArray(2 * (num_captures+1));
|
||||
Handle<FixedArray> array(last_match_info->elements());
|
||||
// The captures come in (start, end+1) pairs.
|
||||
for (int i = 0; i < 2 * (num_captures + 1); i += 2) {
|
||||
array->set(i, Smi::FromInt(offsets_vector[i]));
|
||||
array->set(i + 1, Smi::FromInt(offsets_vector[i + 1]));
|
||||
for (int i = 0; i < number_of_capture_registers; i += 2) {
|
||||
SetCapture(*array, i, offsets_vector[i]);
|
||||
SetCapture(*array, i + 1, offsets_vector[i + 1]);
|
||||
}
|
||||
return Factory::NewJSArrayWithElements(array);
|
||||
SetLastCaptureCount(*array, number_of_capture_registers);
|
||||
SetLastSubject(*array, *subject);
|
||||
SetLastInput(*array, *subject);
|
||||
return last_match_info;
|
||||
}
|
||||
|
||||
|
||||
@ -3723,9 +3781,6 @@ RegExpNode* RegExpQuantifier::ToNode(int min,
|
||||
// |
|
||||
// [if r >= f] \----> ...
|
||||
//
|
||||
//
|
||||
// TODO(someone): clear captures on repetition and handle empty
|
||||
// matches.
|
||||
|
||||
// 15.10.2.5 RepeatMatcher algorithm.
|
||||
// The parser has already eliminated the case where max is 0. In the case
|
||||
|
||||
@ -59,13 +59,15 @@ class RegExpImpl {
|
||||
// This function calls the garbage collector if necessary.
|
||||
static Handle<Object> Exec(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject,
|
||||
Handle<Object> index);
|
||||
int index,
|
||||
Handle<JSArray> lastMatchInfo);
|
||||
|
||||
// Call RegExp.prototyp.exec(string) in a loop.
|
||||
// Used by String.prototype.match and String.prototype.replace.
|
||||
// This function calls the garbage collector if necessary.
|
||||
static Handle<Object> ExecGlobal(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject);
|
||||
Handle<String> subject,
|
||||
Handle<JSArray> lastMatchInfo);
|
||||
|
||||
// Prepares a JSRegExp object with Irregexp-specific data.
|
||||
static Handle<Object> IrregexpPrepare(Handle<JSRegExp> re,
|
||||
@ -79,18 +81,22 @@ class RegExpImpl {
|
||||
Handle<String> match_pattern);
|
||||
static Handle<Object> AtomExec(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject,
|
||||
Handle<Object> index);
|
||||
int index,
|
||||
Handle<JSArray> lastMatchInfo);
|
||||
|
||||
static Handle<Object> AtomExecGlobal(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject);
|
||||
Handle<String> subject,
|
||||
Handle<JSArray> lastMatchInfo);
|
||||
|
||||
// Execute an Irregexp bytecode pattern.
|
||||
static Handle<Object> IrregexpExec(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject,
|
||||
Handle<Object> index);
|
||||
int index,
|
||||
Handle<JSArray> lastMatchInfo);
|
||||
|
||||
static Handle<Object> IrregexpExecGlobal(Handle<JSRegExp> regexp,
|
||||
Handle<String> subject);
|
||||
Handle<String> subject,
|
||||
Handle<JSArray> lastMatchInfo);
|
||||
|
||||
static void NewSpaceCollectionPrologue();
|
||||
static void OldSpaceCollectionPrologue();
|
||||
@ -107,6 +113,30 @@ class RegExpImpl {
|
||||
static const int kIrregexpCodeIndex = 3;
|
||||
static const int kIrregexpDataLength = 4;
|
||||
|
||||
// Offsets in the lastMatchInfo array.
|
||||
static const int kLastCaptureCount = 0;
|
||||
static const int kLastSubject = 1;
|
||||
static const int kLastInput = 2;
|
||||
static const int kFirstCapture = 1;
|
||||
static const int kLastMatchOverhead = 3;
|
||||
static int GetCapture(FixedArray* array, int index) {
|
||||
return Smi::cast(array->get(index + kFirstCapture))->value();
|
||||
}
|
||||
static void SetLastCaptureCount(FixedArray* array, int to) {
|
||||
array->set(kLastCaptureCount, Smi::FromInt(to));
|
||||
}
|
||||
static void SetLastSubject(FixedArray* array, String* to) {
|
||||
int capture_count = GetLastCaptureCount(array);
|
||||
array->set(capture_count + kLastSubject, to);
|
||||
}
|
||||
static void SetLastInput(FixedArray* array, String* to) {
|
||||
int capture_count = GetLastCaptureCount(array);
|
||||
array->set(capture_count + kLastInput, to);
|
||||
}
|
||||
static void SetCapture(FixedArray* array, int index, int to) {
|
||||
array->set(index + kFirstCapture, Smi::FromInt(to));
|
||||
}
|
||||
|
||||
private:
|
||||
static String* last_ascii_string_;
|
||||
static String* two_byte_cached_string_;
|
||||
@ -121,6 +151,7 @@ class RegExpImpl {
|
||||
// Returns an empty handle in case of an exception.
|
||||
static Handle<Object> IrregexpExecOnce(Handle<FixedArray> regexp,
|
||||
int num_captures,
|
||||
Handle<JSArray> lastMatchInfo,
|
||||
Handle<String> subject16,
|
||||
int previous_index,
|
||||
int* ovector,
|
||||
@ -134,6 +165,10 @@ class RegExpImpl {
|
||||
int character_position,
|
||||
int utf8_position);
|
||||
|
||||
// Used to access the lastMatchInfo array.
|
||||
static int GetLastCaptureCount(FixedArray* array) {
|
||||
return Smi::cast(array->get(kLastCaptureCount))->value();
|
||||
}
|
||||
// A one element cache of the last utf8_subject string and its length. The
|
||||
// subject JS String object is cached in the heap. We also cache a
|
||||
// translation between position and utf8 position.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 2006-2008 the V8 project authors. All rights reserved.
|
||||
# Copyright 2006-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:
|
||||
@ -99,3 +99,22 @@ python macro CHAR_CODE(str) = ord(str[1]);
|
||||
# Accessors for original global properties that ensure they have been loaded.
|
||||
const ORIGINAL_REGEXP = (global.RegExp, $RegExp);
|
||||
const ORIGINAL_DATE = (global.Date, $Date);
|
||||
|
||||
# Constants used on an array to implement the properties of the RegExp object.
|
||||
const REGEXP_NUMBER_OF_CAPTURES = 0;
|
||||
const REGEXP_FIRST_CAPTURE = 1;
|
||||
|
||||
# We can't put macros in macros so we use constants here.
|
||||
# REGEXP_NUMBER_OF_CAPTURES
|
||||
macro NUMBER_OF_CAPTURES(array) = ((array)[0]);
|
||||
|
||||
# Last input and last subject are after the captures so we can omit them on
|
||||
# results returned from global searches. Beware - these evaluate their
|
||||
# arguments twice.
|
||||
macro LAST_SUBJECT(array) = ((array)[(array)[0] + 1]);
|
||||
macro LAST_INPUT(array) = ((array)[(array)[0] + 2]);
|
||||
|
||||
# REGEXP_FIRST_CAPTURE
|
||||
macro CAPTURE(index) = (1 + (index));
|
||||
const CAPTURE0 = 1;
|
||||
const CAPTURE1 = 2;
|
||||
|
||||
@ -4879,6 +4879,20 @@ Object* JSArray::Initialize(int capacity) {
|
||||
}
|
||||
|
||||
|
||||
void JSArray::EnsureSize(int required_size) {
|
||||
ASSERT(HasFastElements());
|
||||
if (elements()->length() >= required_size) return;
|
||||
Handle<FixedArray> old_backing(elements());
|
||||
int old_size = old_backing->length();
|
||||
// Doubling in size would be overkill, but leave some slack to avoid
|
||||
// constantly growing.
|
||||
int new_size = required_size + (required_size >> 3);
|
||||
Handle<FixedArray> new_backing = Factory::NewFixedArray(new_size);
|
||||
for (int i = 0; i < old_size; i++) new_backing->set(i, old_backing->get(i));
|
||||
SetContent(*new_backing);
|
||||
}
|
||||
|
||||
|
||||
// Computes the new capacity when expanding the elements of a JSObject.
|
||||
static int NewElementsCapacity(int old_capacity) {
|
||||
// (old_capacity + 50%) + 16
|
||||
|
||||
@ -3779,6 +3779,10 @@ class JSArray: public JSObject {
|
||||
// Casting.
|
||||
static inline JSArray* cast(Object* obj);
|
||||
|
||||
// Uses handles. Ensures that the fixed array backing the JSArray has at
|
||||
// least the stated size.
|
||||
void EnsureSize(int minimum_size_of_backing_fixed_array);
|
||||
|
||||
// Dispatched behavior.
|
||||
#ifdef DEBUG
|
||||
void JSArrayPrint();
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright 2006-2008 the V8 project authors. All rights reserved.
|
||||
// Copyright 2006-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:
|
||||
@ -52,7 +52,7 @@ function DoConstructRegExp(object, pattern, flags, isConstructorCall) {
|
||||
var multiline = false;
|
||||
|
||||
for (var i = 0; i < flags.length; i++) {
|
||||
var c = flags.charAt(i);
|
||||
var c = StringCharAt.call(flags, i);
|
||||
switch (c) {
|
||||
case 'g':
|
||||
// Allow duplicate flags to be consistent with JSC and others.
|
||||
@ -117,15 +117,15 @@ function RegExpConstructor(pattern, flags) {
|
||||
|
||||
// Deprecated RegExp.prototype.compile method. We behave like the constructor
|
||||
// were called again. In SpiderMonkey, this method returns the regexp object.
|
||||
// In KJS, it returns undefined. For compatibility with KJS, we match their
|
||||
// In JSC, it returns undefined. For compatibility with JSC, we match their
|
||||
// behavior.
|
||||
function CompileRegExp(pattern, flags) {
|
||||
// Both KJS and SpiderMonkey treat a missing pattern argument as the
|
||||
// Both JSC and SpiderMonkey treat a missing pattern argument as the
|
||||
// empty subject string, and an actual undefined value passed as the
|
||||
// patter as the string 'undefined'. Note that KJS is inconsistent
|
||||
// pattern as the string 'undefined'. Note that JSC is inconsistent
|
||||
// here, treating undefined values differently in
|
||||
// RegExp.prototype.compile and in the constructor, where they are
|
||||
// the empty string. For compatibility with KJS, we match their
|
||||
// the empty string. For compatibility with JSC, we match their
|
||||
// behavior.
|
||||
if (IS_UNDEFINED(pattern) && %_ArgumentsLength() != 0) {
|
||||
DoConstructRegExp(this, 'undefined', flags, false);
|
||||
@ -135,32 +135,20 @@ function CompileRegExp(pattern, flags) {
|
||||
}
|
||||
|
||||
|
||||
// DoRegExpExec and DoRegExpExecGlobal are wrappers around the runtime
|
||||
// %RegExp and %RegExpGlobal functions that ensure that the static
|
||||
// properties of the RegExp constructor are set.
|
||||
function DoRegExpExec(regexp, string, index) {
|
||||
var matchIndices = %RegExpExec(regexp, string, index);
|
||||
if (!IS_NULL(matchIndices)) {
|
||||
regExpCaptures = matchIndices;
|
||||
regExpSubject = regExpInput = string;
|
||||
}
|
||||
return matchIndices;
|
||||
return %RegExpExec(regexp, string, index, lastMatchInfo);
|
||||
}
|
||||
|
||||
|
||||
function DoRegExpExecGlobal(regexp, string) {
|
||||
// Here, matchIndices is an array of arrays of substring indices.
|
||||
var matchIndices = %RegExpExecGlobal(regexp, string);
|
||||
if (matchIndices.length != 0) {
|
||||
regExpCaptures = matchIndices[matchIndices.length - 1];
|
||||
regExpSubject = regExpInput = string;
|
||||
}
|
||||
return matchIndices;
|
||||
// Returns an array of arrays of substring indices.
|
||||
return %RegExpExecGlobal(regexp, string, lastMatchInfo);
|
||||
}
|
||||
|
||||
|
||||
function RegExpExec(string) {
|
||||
if (%_ArgumentsLength() == 0) {
|
||||
var regExpInput = LAST_INPUT(lastMatchInfo);
|
||||
if (IS_UNDEFINED(regExpInput)) {
|
||||
throw MakeError('no_input_to_regexp', [this]);
|
||||
}
|
||||
@ -177,23 +165,21 @@ function RegExpExec(string) {
|
||||
}
|
||||
|
||||
%_Log('regexp', 'regexp-exec,%0r,%1S,%2i', [this, s, lastIndex]);
|
||||
// matchIndices is an array of integers with length of captures*2,
|
||||
// each pair of integers specified the start and the end of index
|
||||
// in the string.
|
||||
var matchIndices = DoRegExpExec(this, s, i);
|
||||
// matchIndices is either null or the lastMatchInfo array.
|
||||
var matchIndices = %RegExpExec(this, s, i, lastMatchInfo);
|
||||
|
||||
if (matchIndices == null) {
|
||||
if (this.global) this.lastIndex = 0;
|
||||
return matchIndices; // no match
|
||||
}
|
||||
|
||||
var numResults = matchIndices.length >> 1;
|
||||
var numResults = NUMBER_OF_CAPTURES(lastMatchInfo) >> 1;
|
||||
var result = new $Array(numResults);
|
||||
for (var i = 0; i < numResults; i++) {
|
||||
var matchStart = matchIndices[2*i];
|
||||
var matchEnd = matchIndices[2*i + 1];
|
||||
var matchStart = lastMatchInfo[CAPTURE(i << 1)];
|
||||
var matchEnd = lastMatchInfo[CAPTURE((i << 1) + 1)];
|
||||
if (matchStart != -1 && matchEnd != -1) {
|
||||
result[i] = s.slice(matchStart, matchEnd);
|
||||
result[i] = SubString(s, matchStart, matchEnd);
|
||||
} else {
|
||||
// Make sure the element is present. Avoid reading the undefined
|
||||
// property from the global object since this may change.
|
||||
@ -202,13 +188,15 @@ function RegExpExec(string) {
|
||||
}
|
||||
|
||||
if (this.global)
|
||||
this.lastIndex = matchIndices[1];
|
||||
result.index = matchIndices[0];
|
||||
this.lastIndex = lastMatchInfo[CAPTURE1];
|
||||
result.index = lastMatchInfo[CAPTURE0];
|
||||
result.input = s;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
// Section 15.10.6.3 doesn't actually make sense, but the intention seems to be
|
||||
// that test is defined in terms of String.prototype.exec even if it changes.
|
||||
function RegExpTest(string) {
|
||||
var result = (%_ArgumentsLength() == 0) ? this.exec() : this.exec(string);
|
||||
return result != null;
|
||||
@ -236,56 +224,69 @@ function RegExpToString() {
|
||||
// on the captures array of the last successful match and the subject string
|
||||
// of the last successful match.
|
||||
function RegExpGetLastMatch() {
|
||||
return regExpSubject.slice(regExpCaptures[0], regExpCaptures[1]);
|
||||
var regExpSubject = LAST_SUBJECT(lastMatchInfo);
|
||||
return SubString(regExpSubject,
|
||||
lastMatchInfo[CAPTURE0],
|
||||
lastMatchInfo[CAPTURE1]);
|
||||
}
|
||||
|
||||
|
||||
function RegExpGetLastParen() {
|
||||
var length = regExpCaptures.length;
|
||||
var length = NUMBER_OF_CAPTURES(lastMatchInfo);
|
||||
if (length <= 2) return ''; // There were no captures.
|
||||
// We match the SpiderMonkey behavior: return the substring defined by the
|
||||
// last pair (after the first pair) of elements of the capture array even if
|
||||
// it is empty.
|
||||
return regExpSubject.slice(regExpCaptures[length - 2],
|
||||
regExpCaptures[length - 1]);
|
||||
var regExpSubject = LAST_SUBJECT(lastMatchInfo);
|
||||
return SubString(regExpSubject,
|
||||
lastMatchInfo[CAPTURE(length - 2)],
|
||||
lastMatchInfo[CAPTURE(length - 1)]);
|
||||
}
|
||||
|
||||
|
||||
function RegExpGetLeftContext() {
|
||||
return regExpSubject.slice(0, regExpCaptures[0]);
|
||||
return SubString(LAST_SUBJECT(lastMatchInfo),
|
||||
0,
|
||||
lastMatchInfo[CAPTURE0]);
|
||||
}
|
||||
|
||||
|
||||
function RegExpGetRightContext() {
|
||||
return regExpSubject.slice(regExpCaptures[1], regExpSubject.length);
|
||||
var subject = LAST_SUBJECT(lastMatchInfo);
|
||||
return SubString(subject,
|
||||
lastMatchInfo[CAPTURE1],
|
||||
subject.length);
|
||||
}
|
||||
|
||||
|
||||
// The properties $1..$9 are the first nine capturing substrings of the last
|
||||
// successful match, or ''. The function RegExpMakeCaptureGetter will be
|
||||
// called with an index greater than or equal to 1 but it actually works for
|
||||
// any non-negative index.
|
||||
// called with indeces from 1 to 9.
|
||||
function RegExpMakeCaptureGetter(n) {
|
||||
return function() {
|
||||
var index = n * 2;
|
||||
if (index >= regExpCaptures.length) return '';
|
||||
var matchStart = regExpCaptures[index];
|
||||
var matchEnd = regExpCaptures[index + 1];
|
||||
if (index >= NUMBER_OF_CAPTURES(lastMatchInfo)) return '';
|
||||
var matchStart = lastMatchInfo[CAPTURE(index)];
|
||||
var matchEnd = lastMatchInfo[CAPTURE(index + 1)];
|
||||
if (matchStart == -1 || matchEnd == -1) return '';
|
||||
return regExpSubject.slice(matchStart, matchEnd);
|
||||
return SubString(LAST_SUBJECT(lastMatchInfo), matchStart, matchEnd);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
// Properties of the builtins object for recording the result of the last
|
||||
// regexp match. The property regExpCaptures is the matchIndices array of the
|
||||
// last successful regexp match (an array of start/end index pairs for the
|
||||
// match and all the captured substrings), the invariant is that there is at
|
||||
// least two elements. The property regExpSubject is the subject string for
|
||||
// the last successful match.
|
||||
var regExpCaptures = [0, 0];
|
||||
var regExpSubject = '';
|
||||
var regExpInput;
|
||||
// Property of the builtins object for recording the result of the last
|
||||
// regexp match. The property lastMatchInfo includes the matchIndices
|
||||
// array of the last successful regexp match (an array of start/end index
|
||||
// pairs for the match and all the captured substrings), the invariant is
|
||||
// that there are at least two capture indeces. The array also contains
|
||||
// the subject string for the last successful match.
|
||||
var lastMatchInfo = [
|
||||
2, // REGEXP_NUMBER_OF_CAPTURES
|
||||
0, // REGEXP_FIRST_CAPTURE + 0
|
||||
0, // REGEXP_FIRST_CAPTURE + 1
|
||||
"", // Last subject.
|
||||
void 0, // Last input - settable with RegExpSetInput.
|
||||
];
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
@ -303,7 +304,7 @@ function SetupRegExp() {
|
||||
));
|
||||
|
||||
// The spec says nothing about the length of exec and test, but
|
||||
// SpiderMonkey and KJS have length equal to 0.
|
||||
// SpiderMonkey and JSC have length equal to 0.
|
||||
%FunctionSetLength($RegExp.prototype.exec, 0);
|
||||
%FunctionSetLength($RegExp.prototype.test, 0);
|
||||
// The length of compile is 1 in SpiderMonkey.
|
||||
@ -313,9 +314,12 @@ function SetupRegExp() {
|
||||
// value is set the value it is set to is coerced to a string.
|
||||
// Getter and setter for the input.
|
||||
function RegExpGetInput() {
|
||||
var regExpInput = LAST_INPUT(lastMatchInfo);
|
||||
return IS_UNDEFINED(regExpInput) ? "" : regExpInput;
|
||||
}
|
||||
function RegExpSetInput(string) { regExpInput = ToString(string); }
|
||||
function RegExpSetInput(string) {
|
||||
lastMatchInfo[lastMatchInfo[REGEXP_NUMBER_OF_CAPTURES] + 2] = string;
|
||||
};
|
||||
|
||||
%DefineAccessor($RegExp, 'input', GETTER, RegExpGetInput, DONT_DELETE);
|
||||
%DefineAccessor($RegExp, 'input', SETTER, RegExpSetInput, DONT_DELETE);
|
||||
|
||||
@ -858,14 +858,21 @@ static Object* Runtime_InitializeConstContextSlot(Arguments args) {
|
||||
|
||||
static Object* Runtime_RegExpExec(Arguments args) {
|
||||
HandleScope scope;
|
||||
ASSERT(args.length() == 3);
|
||||
ASSERT(args.length() == 4);
|
||||
CONVERT_CHECKED(JSRegExp, raw_regexp, args[0]);
|
||||
Handle<JSRegExp> regexp(raw_regexp);
|
||||
CONVERT_CHECKED(String, raw_subject, args[1]);
|
||||
Handle<String> subject(raw_subject);
|
||||
Handle<Object> index(args[2]);
|
||||
ASSERT(index->IsNumber());
|
||||
Handle<Object> result = RegExpImpl::Exec(regexp, subject, index);
|
||||
// Due to the way the JS files are constructed this must be less than the
|
||||
// length of a string, i.e. it is always a Smi. We check anyway for security.
|
||||
CONVERT_CHECKED(Smi, index, args[2]);
|
||||
CONVERT_CHECKED(JSArray, raw_last_match_info, args[3]);
|
||||
Handle<JSArray> last_match_info(raw_last_match_info);
|
||||
CHECK(last_match_info->HasFastElements());
|
||||
Handle<Object> result = RegExpImpl::Exec(regexp,
|
||||
subject,
|
||||
index->value(),
|
||||
last_match_info);
|
||||
if (result.is_null()) return Failure::Exception();
|
||||
return *result;
|
||||
}
|
||||
@ -873,12 +880,16 @@ static Object* Runtime_RegExpExec(Arguments args) {
|
||||
|
||||
static Object* Runtime_RegExpExecGlobal(Arguments args) {
|
||||
HandleScope scope;
|
||||
ASSERT(args.length() == 2);
|
||||
ASSERT(args.length() == 3);
|
||||
CONVERT_CHECKED(JSRegExp, raw_regexp, args[0]);
|
||||
Handle<JSRegExp> regexp(raw_regexp);
|
||||
CONVERT_CHECKED(String, raw_subject, args[1]);
|
||||
Handle<String> subject(raw_subject);
|
||||
Handle<Object> result = RegExpImpl::ExecGlobal(regexp, subject);
|
||||
CONVERT_CHECKED(JSArray, raw_last_match_info, args[2]);
|
||||
Handle<JSArray> last_match_info(raw_last_match_info);
|
||||
CHECK(last_match_info->HasFastElements());
|
||||
Handle<Object> result =
|
||||
RegExpImpl::ExecGlobal(regexp, subject, last_match_info);
|
||||
if (result.is_null()) return Failure::Exception();
|
||||
return *result;
|
||||
}
|
||||
|
||||
@ -137,8 +137,8 @@ namespace v8 { namespace internal {
|
||||
\
|
||||
/* Regular expressions */ \
|
||||
F(RegExpCompile, 3) \
|
||||
F(RegExpExec, 3) \
|
||||
F(RegExpExecGlobal, 2) \
|
||||
F(RegExpExec, 4) \
|
||||
F(RegExpExecGlobal, 3) \
|
||||
\
|
||||
/* Strings */ \
|
||||
F(StringCharCodeAt, 2) \
|
||||
|
||||
157
src/string.js
157
src/string.js
@ -165,8 +165,9 @@ function StringMatch(regexp) {
|
||||
// Build the result array.
|
||||
var result = new $Array(match_string);
|
||||
for (var i = 0; i < matches.length; ++i) {
|
||||
var match = matches[i];
|
||||
var match_string = subject.slice(match[0], match[1]);
|
||||
var matchInfo = matches[i];
|
||||
var match_string = subject.slice(matchInfo[CAPTURE0],
|
||||
matchInfo[CAPTURE1]);
|
||||
result[i] = match_string;
|
||||
}
|
||||
|
||||
@ -218,7 +219,9 @@ function StringReplace(search, replace) {
|
||||
if (IS_FUNCTION(replace)) {
|
||||
builder.add(replace.call(null, search, start, subject));
|
||||
} else {
|
||||
ExpandReplacement(ToString(replace), subject, [ start, end ], builder);
|
||||
reusableMatchInfo[CAPTURE0] = start;
|
||||
reusableMatchInfo[CAPTURE1] = end;
|
||||
ExpandReplacement(ToString(replace), subject, reusableMatchInfo, builder);
|
||||
}
|
||||
|
||||
// suffix
|
||||
@ -228,6 +231,15 @@ function StringReplace(search, replace) {
|
||||
}
|
||||
|
||||
|
||||
// This has the same size as the lastMatchInfo array, and can be used for
|
||||
// functions that expect that structure to be returned. It is used when the
|
||||
// needle is a string rather than a regexp. In this case we can't update
|
||||
// lastMatchArray without erroneously affecting the properties on the global
|
||||
// RegExp object.
|
||||
var reusableMatchInfo = [2, -1, -1, "", ""];
|
||||
var reusableMatchArray = [ void 0 ];
|
||||
|
||||
|
||||
// Helper function for regular expressions in String.prototype.replace.
|
||||
function StringReplaceRegExp(subject, regexp, replace) {
|
||||
// Compute an array of matches; each match is really a list of
|
||||
@ -237,9 +249,10 @@ function StringReplaceRegExp(subject, regexp, replace) {
|
||||
matches = DoRegExpExecGlobal(regexp, subject);
|
||||
if (matches.length == 0) return subject;
|
||||
} else {
|
||||
var captures = DoRegExpExec(regexp, subject, 0);
|
||||
if (IS_NULL(captures)) return subject;
|
||||
matches = [ captures ];
|
||||
var lastMatchInfo = DoRegExpExec(regexp, subject, 0);
|
||||
if (IS_NULL(lastMatchInfo)) return subject;
|
||||
reusableMatchArray[0] = lastMatchInfo;
|
||||
matches = reusableMatchArray;
|
||||
}
|
||||
|
||||
// Determine the number of matches.
|
||||
@ -253,17 +266,17 @@ function StringReplaceRegExp(subject, regexp, replace) {
|
||||
replace = ToString(replace);
|
||||
if (%StringIndexOf(replace, "$", 0) < 0) {
|
||||
for (var i = 0; i < length; i++) {
|
||||
var captures = matches[i];
|
||||
result.addSpecialSlice(previous, captures[0]);
|
||||
var matchInfo = matches[i];
|
||||
result.addSpecialSlice(previous, matchInfo[CAPTURE0]);
|
||||
result.add(replace);
|
||||
previous = captures[1]; // continue after match
|
||||
previous = matchInfo[CAPTURE1]; // continue after match
|
||||
}
|
||||
} else {
|
||||
for (var i = 0; i < length; i++) {
|
||||
var captures = matches[i];
|
||||
result.addSpecialSlice(previous, captures[0]);
|
||||
ExpandReplacement(replace, subject, captures, result);
|
||||
previous = captures[1]; // continue after match
|
||||
var matchInfo = matches[i];
|
||||
result.addSpecialSlice(previous, matchInfo[CAPTURE0]);
|
||||
ExpandReplacement(replace, subject, matchInfo, result);
|
||||
previous = matchInfo[CAPTURE1]; // continue after match
|
||||
}
|
||||
}
|
||||
result.addSpecialSlice(previous, subject.length);
|
||||
@ -273,7 +286,7 @@ function StringReplaceRegExp(subject, regexp, replace) {
|
||||
|
||||
// Expand the $-expressions in the string and return a new string with
|
||||
// the result.
|
||||
function ExpandReplacement(string, subject, captures, builder) {
|
||||
function ExpandReplacement(string, subject, matchInfo, builder) {
|
||||
var next = %StringIndexOf(string, '$', 0);
|
||||
if (next < 0) {
|
||||
builder.add(string);
|
||||
@ -281,11 +294,12 @@ function ExpandReplacement(string, subject, captures, builder) {
|
||||
}
|
||||
|
||||
// Compute the number of captures; see ECMA-262, 15.5.4.11, p. 102.
|
||||
var m = captures.length >> 1; // includes the match
|
||||
var m = NUMBER_OF_CAPTURES(matchInfo) >> 1; // Includes the match.
|
||||
|
||||
if (next > 0) builder.add(SubString(string, 0, next));
|
||||
var length = string.length;
|
||||
|
||||
|
||||
while (true) {
|
||||
var expansion = '$';
|
||||
var position = next + 1;
|
||||
@ -299,13 +313,14 @@ function ExpandReplacement(string, subject, captures, builder) {
|
||||
builder.add('$');
|
||||
} else if (peek == 38) { // $& - match
|
||||
++position;
|
||||
builder.addSpecialSlice(captures[0], captures[1]);
|
||||
builder.addSpecialSlice(matchInfo[CAPTURE0],
|
||||
matchInfo[CAPTURE1]);
|
||||
} else if (peek == 96) { // $` - prefix
|
||||
++position;
|
||||
builder.addSpecialSlice(0, captures[0]);
|
||||
builder.addSpecialSlice(0, matchInfo[CAPTURE0]);
|
||||
} else if (peek == 39) { // $' - suffix
|
||||
++position;
|
||||
builder.addSpecialSlice(captures[1], subject.length);
|
||||
builder.addSpecialSlice(matchInfo[CAPTURE1], subject.length);
|
||||
} else if (peek >= 48 && peek <= 57) { // $n, 0 <= n <= 9
|
||||
++position;
|
||||
var n = peek - 48;
|
||||
@ -329,7 +344,7 @@ function ExpandReplacement(string, subject, captures, builder) {
|
||||
}
|
||||
}
|
||||
if (0 < n && n < m) {
|
||||
addCaptureString(builder, captures, n);
|
||||
addCaptureString(builder, matchInfo, n);
|
||||
} else {
|
||||
// Because of the captures range check in the parsing of two
|
||||
// digit capture references, we can only enter here when a
|
||||
@ -361,26 +376,27 @@ function ExpandReplacement(string, subject, captures, builder) {
|
||||
};
|
||||
|
||||
|
||||
// Compute the string of a given PCRE capture.
|
||||
function CaptureString(string, captures, index) {
|
||||
// Compute the string of a given regular expression capture.
|
||||
function CaptureString(string, lastCaptureInfo, index) {
|
||||
// Scale the index.
|
||||
var scaled = index << 1;
|
||||
// Compute start and end.
|
||||
var start = captures[scaled];
|
||||
var end = captures[scaled + 1];
|
||||
var start = lastCaptureInfo[CAPTURE(scaled)];
|
||||
var end = lastCaptureInfo[CAPTURE(scaled + 1)];
|
||||
// If either start or end is missing return undefined.
|
||||
if (start < 0 || end < 0) return;
|
||||
return SubString(string, start, end);
|
||||
};
|
||||
|
||||
|
||||
// Add the string of a given PCRE capture to the ReplaceResultBuilder
|
||||
function addCaptureString(builder, captures, index) {
|
||||
// Add the string of a given regular expression capture to the
|
||||
// ReplaceResultBuilder
|
||||
function addCaptureString(builder, matchInfo, index) {
|
||||
// Scale the index.
|
||||
var scaled = index << 1;
|
||||
// Compute start and end.
|
||||
var start = captures[scaled];
|
||||
var end = captures[scaled + 1];
|
||||
var start = matchInfo[CAPTURE(scaled)];
|
||||
var end = matchInfo[CAPTURE(scaled + 1)];
|
||||
// If either start or end is missing return.
|
||||
if (start < 0 || end <= start) return;
|
||||
builder.addSpecialSlice(start, end);
|
||||
@ -396,10 +412,8 @@ function addCaptureString(builder, captures, index) {
|
||||
// should be 'abcd' and not 'dddd' (or anything else).
|
||||
function StringReplaceRegExpWithFunction(subject, regexp, replace) {
|
||||
var result = new ReplaceResultBuilder(subject);
|
||||
// Captures is an array of pairs of (start, end) indices for the match and
|
||||
// any captured substrings.
|
||||
var captures = DoRegExpExec(regexp, subject, 0);
|
||||
if (IS_NULL(captures)) return subject;
|
||||
var lastMatchInfo = DoRegExpExec(regexp, subject, 0);
|
||||
if (IS_NULL(lastMatchInfo)) return subject;
|
||||
|
||||
// There's at least one match. If the regexp is global, we have to loop
|
||||
// over all matches. The loop is not in C++ code here like the one in
|
||||
@ -409,13 +423,16 @@ function StringReplaceRegExpWithFunction(subject, regexp, replace) {
|
||||
if (regexp.global) {
|
||||
var previous = 0;
|
||||
do {
|
||||
result.addSpecialSlice(previous, captures[0]);
|
||||
result.add(ApplyReplacementFunction(replace, captures, subject));
|
||||
result.addSpecialSlice(previous, lastMatchInfo[CAPTURE0]);
|
||||
var startOfMatch = lastMatchInfo[CAPTURE0];
|
||||
previous = lastMatchInfo[CAPTURE1];
|
||||
result.add(ApplyReplacementFunction(replace, lastMatchInfo, subject));
|
||||
// Can't use lastMatchInfo any more from here, since the function could
|
||||
// overwrite it.
|
||||
// Continue with the next match.
|
||||
previous = captures[1];
|
||||
// Increment previous if we matched an empty string, as per ECMA-262
|
||||
// 15.5.4.10.
|
||||
if (previous == captures[0]) {
|
||||
if (previous == startOfMatch) {
|
||||
// Add the skipped character to the output, if any.
|
||||
if (previous < subject.length) {
|
||||
result.addSpecialSlice(previous, previous + 1);
|
||||
@ -425,19 +442,22 @@ function StringReplaceRegExpWithFunction(subject, regexp, replace) {
|
||||
|
||||
// Per ECMA-262 15.10.6.2, if the previous index is greater than the
|
||||
// string length, there is no match
|
||||
captures = (previous > subject.length)
|
||||
lastMatchInfo = (previous > subject.length)
|
||||
? null
|
||||
: DoRegExpExec(regexp, subject, previous);
|
||||
} while (!IS_NULL(captures));
|
||||
} while (!IS_NULL(lastMatchInfo));
|
||||
|
||||
// Tack on the final right substring after the last match, if necessary.
|
||||
if (previous < subject.length) {
|
||||
result.addSpecialSlice(previous, subject.length);
|
||||
}
|
||||
} else { // Not a global regexp, no need to loop.
|
||||
result.addSpecialSlice(0, captures[0]);
|
||||
result.add(ApplyReplacementFunction(replace, captures, subject));
|
||||
result.addSpecialSlice(captures[1], subject.length);
|
||||
result.addSpecialSlice(0, lastMatchInfo[CAPTURE0]);
|
||||
var endOfMatch = lastMatchInfo[CAPTURE1];
|
||||
result.add(ApplyReplacementFunction(replace, lastMatchInfo, subject));
|
||||
// Can't use lastMatchInfo any more from here, since the function could
|
||||
// overwrite it.
|
||||
result.addSpecialSlice(endOfMatch, subject.length);
|
||||
}
|
||||
|
||||
return result.generate();
|
||||
@ -445,20 +465,20 @@ function StringReplaceRegExpWithFunction(subject, regexp, replace) {
|
||||
|
||||
|
||||
// Helper function to apply a string replacement function once.
|
||||
function ApplyReplacementFunction(replace, captures, subject) {
|
||||
function ApplyReplacementFunction(replace, lastMatchInfo, subject) {
|
||||
// Compute the parameter list consisting of the match, captures, index,
|
||||
// and subject for the replace function invocation.
|
||||
var index = captures[0];
|
||||
var index = lastMatchInfo[CAPTURE0];
|
||||
// The number of captures plus one for the match.
|
||||
var m = captures.length >> 1;
|
||||
var m = NUMBER_OF_CAPTURES(lastMatchInfo) >> 1;
|
||||
if (m == 1) {
|
||||
var s = CaptureString(subject, captures, 0);
|
||||
var s = CaptureString(subject, lastMatchInfo, 0);
|
||||
// Don't call directly to avoid exposing the built-in global object.
|
||||
return ToString(replace.call(null, s, index, subject));
|
||||
}
|
||||
var parameters = $Array(m + 2);
|
||||
for (var j = 0; j < m; j++) {
|
||||
parameters[j] = CaptureString(subject, captures, j);
|
||||
parameters[j] = CaptureString(subject, lastMatchInfo, j);
|
||||
}
|
||||
parameters[j] = index;
|
||||
parameters[j + 1] = subject;
|
||||
@ -559,14 +579,14 @@ function StringSplit(separator, limit) {
|
||||
return result;
|
||||
}
|
||||
|
||||
var match = splitMatch(sep, subject, currentIndex, startIndex);
|
||||
var lastMatchInfo = splitMatch(sep, subject, currentIndex, startIndex);
|
||||
|
||||
if (IS_NULL(match)) {
|
||||
if (IS_NULL(lastMatchInfo)) {
|
||||
result[result.length] = subject.slice(currentIndex, length);
|
||||
return result;
|
||||
}
|
||||
|
||||
var endIndex = match[0];
|
||||
var endIndex = lastMatchInfo[CAPTURE1];
|
||||
|
||||
// We ignore a zero-length match at the currentIndex.
|
||||
if (startIndex === endIndex && endIndex === currentIndex) {
|
||||
@ -574,11 +594,20 @@ function StringSplit(separator, limit) {
|
||||
continue;
|
||||
}
|
||||
|
||||
result[result.length] = match[1];
|
||||
result[result.length] =
|
||||
SubString(subject, currentIndex, lastMatchInfo[CAPTURE0]);
|
||||
if (result.length === lim) return result;
|
||||
|
||||
for (var i = 2; i < match.length; i++) {
|
||||
result[result.length] = match[i];
|
||||
for (var i = 2; i < NUMBER_OF_CAPTURES(lastMatchInfo); i += 2) {
|
||||
var start = lastMatchInfo[CAPTURE(i)];
|
||||
var end = lastMatchInfo[CAPTURE(i + 1)];
|
||||
if (start != -1 && end != -1) {
|
||||
result[result.length] = SubString(subject,
|
||||
lastMatchInfo[CAPTURE(i)],
|
||||
lastMatchInfo[CAPTURE(i + 1)]);
|
||||
} else {
|
||||
result[result.length] = void 0;
|
||||
}
|
||||
if (result.length === lim) return result;
|
||||
}
|
||||
|
||||
@ -588,32 +617,24 @@ function StringSplit(separator, limit) {
|
||||
|
||||
|
||||
// ECMA-262 section 15.5.4.14
|
||||
// Helper function used by split.
|
||||
// Helper function used by split. This version returns the lastMatchInfo
|
||||
// instead of allocating a new array with basically the same information.
|
||||
function splitMatch(separator, subject, current_index, start_index) {
|
||||
if (IS_REGEXP(separator)) {
|
||||
var ovector = DoRegExpExec(separator, subject, start_index);
|
||||
if (ovector == null) return null;
|
||||
var nof_results = ovector.length >> 1;
|
||||
var result = new $Array(nof_results + 1);
|
||||
var lastMatchInfo = DoRegExpExec(separator, subject, start_index);
|
||||
if (lastMatchInfo == null) return null;
|
||||
// Section 15.5.4.14 paragraph two says that we do not allow zero length
|
||||
// matches at the end of the string.
|
||||
if (ovector[0] === subject.length) return null;
|
||||
result[0] = ovector[1];
|
||||
result[1] = subject.slice(current_index, ovector[0]);
|
||||
for (var i = 1; i < nof_results; i++) {
|
||||
var matching_start = ovector[2*i];
|
||||
var matching_end = ovector[2*i + 1];
|
||||
if (matching_start != -1 && matching_end != -1) {
|
||||
result[i + 1] = subject.slice(matching_start, matching_end);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
if (lastMatchInfo[CAPTURE0] === subject.length) return null;
|
||||
return lastMatchInfo;
|
||||
}
|
||||
|
||||
var separatorIndex = subject.indexOf(separator, start_index);
|
||||
if (separatorIndex === -1) return null;
|
||||
|
||||
return [ separatorIndex + separator.length, subject.slice(current_index, separatorIndex) ];
|
||||
reusableMatchInfo[CAPTURE0] = separatorIndex;
|
||||
reusableMatchInfo[CAPTURE1] = separatorIndex + separator.length;
|
||||
return reusableMatchInfo;
|
||||
};
|
||||
|
||||
|
||||
|
||||
22
test/mjsunit/regexp-string-methods.js
Normal file
22
test/mjsunit/regexp-string-methods.js
Normal file
@ -0,0 +1,22 @@
|
||||
// Regexp shouldn't use String.prototype.slice()
|
||||
var s = new String("foo");
|
||||
assertEquals("f", s.slice(0,1));
|
||||
String.prototype.slice = function() { return "x"; }
|
||||
assertEquals("x", s.slice(0,1));
|
||||
assertEquals("g", /g/.exec("gg"));
|
||||
|
||||
// Regexp shouldn't use String.prototype.charAt()
|
||||
var f1 = new RegExp("f", "i");
|
||||
assertEquals("F", f1.exec("F"));
|
||||
assertEquals("f", "foo".charAt(0));
|
||||
String.prototype.charAt = function(idx) { return 'g'; };
|
||||
assertEquals("g", "foo".charAt(0));
|
||||
var f2 = new RegExp("[g]", "i");
|
||||
assertEquals("G", f2.exec("G"));
|
||||
assertTrue(f2.ignoreCase);
|
||||
|
||||
// On the other hand test is defined in a semi-coherent way as a call to exec.
|
||||
// 15.10.6.3
|
||||
// SpiderMonkey fails this one.
|
||||
RegExp.prototype.exec = function(string) { return 'x'; }
|
||||
assertTrue(/f/.test('x'));
|
||||
@ -104,7 +104,7 @@ def ExpandConstants(lines, constants):
|
||||
|
||||
def ExpandMacros(lines, macros):
|
||||
for name, macro in macros.items():
|
||||
start = lines.find(name, 0)
|
||||
start = lines.find(name + '(', 0)
|
||||
while start != -1:
|
||||
# Scan over the arguments
|
||||
assert lines[start + len(name)] == '('
|
||||
@ -132,7 +132,7 @@ def ExpandMacros(lines, macros):
|
||||
result = macro.expand(mapping)
|
||||
# Replace the occurrence of the macro with the expansion
|
||||
lines = lines[:start] + result + lines[end:]
|
||||
start = lines.find(name, end)
|
||||
start = lines.find(name + '(', end)
|
||||
return lines
|
||||
|
||||
class TextMacro:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user