Index: runtime/lib/regexp.cc |
diff --git a/runtime/lib/regexp.cc b/runtime/lib/regexp.cc |
index e3907d32d91ab0e666036a6cd2eda1be2da97ede..9e9bcea23c751bf8a92c188ae4134487fd5166f8 100644 |
--- a/runtime/lib/regexp.cc |
+++ b/runtime/lib/regexp.cc |
@@ -17,7 +17,7 @@ namespace dart { |
DECLARE_FLAG(bool, trace_irregexp); |
-DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_factory, 4) { |
+DEFINE_NATIVE_ENTRY(RegExp_factory, 4) { |
ASSERT(TypeArguments::CheckedHandle(arguments->NativeArgAt(0)).IsNull()); |
GET_NON_NULL_NATIVE_ARGUMENT(String, pattern, arguments->NativeArgAt(1)); |
GET_NON_NULL_NATIVE_ARGUMENT( |
@@ -35,37 +35,37 @@ DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_factory, 4) { |
UNREACHABLE(); |
} |
- // Create a JSRegExp object containing only the initial parameters. |
- return RegExpEngine::CreateJSRegExp(zone, |
- pattern, |
- multi_line, |
- ignore_case); |
+ // Create a RegExp object containing only the initial parameters. |
+ return RegExpEngine::CreateRegExp(zone, |
+ pattern, |
+ multi_line, |
+ ignore_case); |
} |
-DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_getPattern, 1) { |
- const JSRegExp& regexp = JSRegExp::CheckedHandle(arguments->NativeArgAt(0)); |
+DEFINE_NATIVE_ENTRY(RegExp_getPattern, 1) { |
+ const RegExp& regexp = RegExp::CheckedHandle(arguments->NativeArgAt(0)); |
ASSERT(!regexp.IsNull()); |
return regexp.pattern(); |
} |
-DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_getIsMultiLine, 1) { |
- const JSRegExp& regexp = JSRegExp::CheckedHandle(arguments->NativeArgAt(0)); |
+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(JSSyntaxRegExp_getIsCaseSensitive, 1) { |
- const JSRegExp& regexp = JSRegExp::CheckedHandle(arguments->NativeArgAt(0)); |
+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(JSSyntaxRegExp_getGroupCount, 1) { |
- const JSRegExp& regexp = JSRegExp::CheckedHandle(arguments->NativeArgAt(0)); |
+DEFINE_NATIVE_ENTRY(RegExp_getGroupCount, 1) { |
+ const RegExp& regexp = RegExp::CheckedHandle(arguments->NativeArgAt(0)); |
ASSERT(!regexp.IsNull()); |
if (regexp.is_initialized()) { |
return regexp.num_bracket_expressions(); |
@@ -81,9 +81,9 @@ DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_getGroupCount, 1) { |
} |
-DEFINE_NATIVE_ENTRY(JSSyntaxRegExp_ExecuteMatch, 3) { |
- // This function is intrinsified. See Intrinsifier::JSRegExp_ExecuteMatch. |
- const JSRegExp& regexp = JSRegExp::CheckedHandle(arguments->NativeArgAt(0)); |
+DEFINE_NATIVE_ENTRY(RegExp_ExecuteMatch, 3) { |
+ // This function is intrinsified. See Intrinsifier::RegExp_ExecuteMatch. |
+ const RegExp& regexp = RegExp::CheckedHandle(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)); |