| Index: runtime/lib/regexp.cc
|
| diff --git a/runtime/lib/regexp.cc b/runtime/lib/regexp.cc
|
| index 1579374760a39104c391a805676f87693fc21101..92f411f941f064027681fc2cced13699ed0887cf 100644
|
| --- a/runtime/lib/regexp.cc
|
| +++ b/runtime/lib/regexp.cc
|
| @@ -7,9 +7,9 @@
|
| #include "vm/exceptions.h"
|
| #include "vm/native_entry.h"
|
| #include "vm/object.h"
|
| -#include "vm/regexp_parser.h"
|
| -#include "vm/regexp_assembler_ir.h"
|
| #include "vm/regexp_assembler_bytecode.h"
|
| +#include "vm/regexp_assembler_ir.h"
|
| +#include "vm/regexp_parser.h"
|
| #include "vm/thread.h"
|
|
|
| namespace dart {
|
| @@ -36,28 +36,24 @@ DEFINE_NATIVE_ENTRY(RegExp_factory, 4) {
|
| return RegExpEngine::CreateRegExp(thread, pattern, multi_line, ignore_case);
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(RegExp_getPattern, 1) {
|
| const RegExp& regexp = RegExp::CheckedHandle(arguments->NativeArgAt(0));
|
| ASSERT(!regexp.IsNull());
|
| return regexp.pattern();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(RegExp_getIsMultiLine, 1) {
|
| const RegExp& regexp = RegExp::CheckedHandle(arguments->NativeArgAt(0));
|
| ASSERT(!regexp.IsNull());
|
| return Bool::Get(regexp.is_multi_line()).raw();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(RegExp_getIsCaseSensitive, 1) {
|
| const RegExp& regexp = RegExp::CheckedHandle(arguments->NativeArgAt(0));
|
| ASSERT(!regexp.IsNull());
|
| return Bool::Get(!regexp.is_ignore_case()).raw();
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(RegExp_getGroupCount, 1) {
|
| const RegExp& regexp = RegExp::CheckedHandle(arguments->NativeArgAt(0));
|
| ASSERT(!regexp.IsNull());
|
| @@ -74,7 +70,6 @@ DEFINE_NATIVE_ENTRY(RegExp_getGroupCount, 1) {
|
| return Object::null();
|
| }
|
|
|
| -
|
| static RawObject* ExecuteMatch(Zone* zone,
|
| NativeArguments* arguments,
|
| bool sticky) {
|
| @@ -93,17 +88,14 @@ static RawObject* ExecuteMatch(Zone* zone,
|
| /*sticky=*/sticky, zone);
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(RegExp_ExecuteMatch, 3) {
|
| // This function is intrinsified. See Intrinsifier::RegExp_ExecuteMatch.
|
| return ExecuteMatch(zone, arguments, /*sticky=*/false);
|
| }
|
|
|
| -
|
| DEFINE_NATIVE_ENTRY(RegExp_ExecuteMatchSticky, 3) {
|
| // This function is intrinsified. See Intrinsifier::RegExp_ExecuteMatchSticky.
|
| return ExecuteMatch(zone, arguments, /*sticky=*/true);
|
| }
|
|
|
| -
|
| } // namespace dart
|
|
|