mirror of
https://github.com/dart-lang/sdk
synced 2024-09-05 00:13:50 +00:00
![Stevie Strickland](/assets/img/avatar_default.png)
This work pulls in v8 support for these features with appropriate changes for Dart and closes https://github.com/dart-lang/sdk/issues/34935. This adds support for the following features: * Interpreting patterns as Unicode patterns instead of BMP patterns * the dotAll flag (`/s`) for changing the behavior of '.' to also match line terminators * Escapes for character classes described by Unicode property groups (e.g., \p{Greek} to match all Greek characters, or \P{Greek} for all non-Greek characters). The following TC39 proposals describe some of the added features: * https://github.com/tc39/proposal-regexp-dotall-flag * https://github.com/tc39/proposal-regexp-unicode-property-escapes These additional changes are included: * Extends named capture group names to include the full range of identifier characters supported by ECMAScript, not just ASCII. * Changing the RegExp interface to return RegExpMatch objects, not Match objects, so that downcasting is not necessary to use named capture groups from Dart **Note**: The changes to the RegExp interface are a breaking change for implementers of the RegExp interface. Current users of the RegExp interface (i.e., code using Dart RegExp objects) will not be affected. Change-Id: Ie62e6082a0e2fedc1680ef2576ce0c6db80fc19a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/100641 Reviewed-by: Martin Kustermann <kustermann@google.com> Commit-Queue: Stevie Strickland <sstrickl@google.com>
142 lines
5.4 KiB
C++
142 lines
5.4 KiB
C++
// Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "platform/assert.h"
|
|
#include "vm/bootstrap_natives.h"
|
|
#include "vm/exceptions.h"
|
|
#include "vm/native_entry.h"
|
|
#include "vm/object.h"
|
|
#include "vm/regexp_assembler_bytecode.h"
|
|
#include "vm/regexp_assembler_ir.h"
|
|
#include "vm/regexp_parser.h"
|
|
#include "vm/thread.h"
|
|
|
|
namespace dart {
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_factory, 0, 6) {
|
|
ASSERT(
|
|
TypeArguments::CheckedHandle(zone, arguments->NativeArgAt(0)).IsNull());
|
|
GET_NON_NULL_NATIVE_ARGUMENT(String, pattern, arguments->NativeArgAt(1));
|
|
GET_NON_NULL_NATIVE_ARGUMENT(Instance, handle_multi_line,
|
|
arguments->NativeArgAt(2));
|
|
GET_NON_NULL_NATIVE_ARGUMENT(Instance, handle_case_sensitive,
|
|
arguments->NativeArgAt(3));
|
|
GET_NON_NULL_NATIVE_ARGUMENT(Instance, handle_unicode,
|
|
arguments->NativeArgAt(4));
|
|
GET_NON_NULL_NATIVE_ARGUMENT(Instance, handle_dot_all,
|
|
arguments->NativeArgAt(5));
|
|
bool ignore_case = handle_case_sensitive.raw() != Bool::True().raw();
|
|
bool multi_line = handle_multi_line.raw() == Bool::True().raw();
|
|
bool unicode = handle_unicode.raw() == Bool::True().raw();
|
|
bool dot_all = handle_dot_all.raw() == Bool::True().raw();
|
|
|
|
RegExpFlags flags;
|
|
|
|
if (ignore_case) flags.SetIgnoreCase();
|
|
if (multi_line) flags.SetMultiLine();
|
|
if (unicode) flags.SetUnicode();
|
|
if (dot_all) flags.SetDotAll();
|
|
|
|
// Parse the pattern once in order to throw any format exceptions within
|
|
// the factory constructor. It is parsed again upon compilation.
|
|
RegExpCompileData compileData;
|
|
// Throws an exception on parsing failure.
|
|
RegExpParser::ParseRegExp(pattern, flags, &compileData);
|
|
|
|
// Create a RegExp object containing only the initial parameters.
|
|
return RegExpEngine::CreateRegExp(thread, pattern, flags);
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_getPattern, 0, 1) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
return regexp.pattern();
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_getIsMultiLine, 0, 1) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
return Bool::Get(regexp.flags().IsMultiLine()).raw();
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_getIsUnicode, 0, 1) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
return Bool::Get(regexp.flags().IsUnicode()).raw();
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_getIsDotAll, 0, 1) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
return Bool::Get(regexp.flags().IsDotAll()).raw();
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_getIsCaseSensitive, 0, 1) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
return Bool::Get(!regexp.flags().IgnoreCase()).raw();
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_getGroupCount, 0, 1) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
if (regexp.is_initialized()) {
|
|
return regexp.num_bracket_expressions();
|
|
}
|
|
const String& pattern = String::Handle(regexp.pattern());
|
|
const String& errmsg =
|
|
String::Handle(String::New("Regular expression is not initialized yet."));
|
|
const String& message = String::Handle(String::Concat(errmsg, pattern));
|
|
const Array& args = Array::Handle(Array::New(1));
|
|
args.SetAt(0, message);
|
|
Exceptions::ThrowByType(Exceptions::kFormat, args);
|
|
return Object::null();
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_getGroupNameMap, 0, 1) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
if (regexp.is_initialized()) {
|
|
return regexp.capture_name_map();
|
|
}
|
|
const String& pattern = String::Handle(regexp.pattern());
|
|
const String& errmsg = String::Handle(
|
|
String::New("Regular expression is not initialized yet. "));
|
|
const String& message = String::Handle(String::Concat(errmsg, pattern));
|
|
const Array& args = Array::Handle(Array::New(1));
|
|
args.SetAt(0, message);
|
|
Exceptions::ThrowByType(Exceptions::kFormat, args);
|
|
return Object::null();
|
|
}
|
|
|
|
static RawObject* ExecuteMatch(Zone* zone,
|
|
NativeArguments* arguments,
|
|
bool sticky) {
|
|
const RegExp& regexp = RegExp::CheckedHandle(zone, arguments->NativeArgAt(0));
|
|
ASSERT(!regexp.IsNull());
|
|
GET_NON_NULL_NATIVE_ARGUMENT(String, subject, arguments->NativeArgAt(1));
|
|
GET_NON_NULL_NATIVE_ARGUMENT(Smi, start_index, arguments->NativeArgAt(2));
|
|
|
|
#if !defined(DART_PRECOMPILED_RUNTIME)
|
|
if (!FLAG_interpret_irregexp) {
|
|
return IRRegExpMacroAssembler::Execute(regexp, subject, start_index,
|
|
/*sticky=*/sticky, zone);
|
|
}
|
|
#endif
|
|
return BytecodeRegExpMacroAssembler::Interpret(regexp, subject, start_index,
|
|
/*sticky=*/sticky, zone);
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_ExecuteMatch, 0, 3) {
|
|
// This function is intrinsified. See Intrinsifier::RegExp_ExecuteMatch.
|
|
return ExecuteMatch(zone, arguments, /*sticky=*/false);
|
|
}
|
|
|
|
DEFINE_NATIVE_ENTRY(RegExp_ExecuteMatchSticky, 0, 3) {
|
|
// This function is intrinsified. See Intrinsifier::RegExp_ExecuteMatchSticky.
|
|
return ExecuteMatch(zone, arguments, /*sticky=*/true);
|
|
}
|
|
|
|
} // namespace dart
|