Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1533)

Unified Diff: sdk/lib/_internal/compiler/implementation/lib/string_helper.dart

Issue 12310103: Small cleanups in RegExp to avoid generating lots of code just because there is a try/catch in our … (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: sdk/lib/_internal/compiler/implementation/lib/string_helper.dart
===================================================================
--- sdk/lib/_internal/compiler/implementation/lib/string_helper.dart (revision 19035)
+++ sdk/lib/_internal/compiler/implementation/lib/string_helper.dart (working copy)
@@ -77,8 +77,6 @@
return JS('String', r'#.replace(#, #)', receiver, replacer, to);
}
-final RegExp quoteRegExp = const JSSyntaxRegExp(r'[-[\]{}()*+?.,\\^$|#\s]');
-
stringReplaceAllUnchecked(receiver, from, to) {
checkString(to);
if (from is String) {
@@ -96,15 +94,14 @@
return result.toString();
}
} else {
- var quoter = regExpMakeNative(quoteRegExp, global: true);
+ var quoter = JS('', "new RegExp(#, 'g')", r'[-[\]{}()*+?.,\\^$|#\s]');
var quoted = JS('String', r'#.replace(#, "\\$&")', from, quoter);
- RegExp replaceRegExp = new JSSyntaxRegExp(quoted);
- var replacer = regExpMakeNative(replaceRegExp, global: true);
+ var replacer = JS('', "new RegExp(#, 'g')", quoted);
return stringReplaceJS(receiver, replacer, to);
}
} else if (from is JSSyntaxRegExp) {
- var re = regExpMakeNative(from, global: true);
- return stringReplaceJS(receiver, re, to);
+ var re = new JSSyntaxRegExp._globalVersionOf(from);
+ return stringReplaceJS(receiver, re._nativeRegExp, to);
} else {
checkNull(from);
// TODO(floitsch): implement generic String.replace (with patterns).

Powered by Google App Engine
This is Rietveld 408576698