Index: src/js/regexp.js |
diff --git a/src/js/regexp.js b/src/js/regexp.js |
index 2ad7e336ea8c30a7cc3c22dd35fad345f0864d09..3d83dd639ee24476aa70925245a5d5bca6b5d12d 100644 |
--- a/src/js/regexp.js |
+++ b/src/js/regexp.js |
@@ -10,7 +10,6 @@ |
// Imports |
var ExpandReplacement; |
-var FLAG_harmony_tolength; |
var GlobalObject = global.Object; |
var GlobalRegExp = global.RegExp; |
var GlobalRegExpPrototype; |
@@ -22,10 +21,6 @@ var replaceSymbol = utils.ImportNow("replace_symbol"); |
var searchSymbol = utils.ImportNow("search_symbol"); |
var splitSymbol = utils.ImportNow("split_symbol"); |
-utils.ImportFromExperimental(function(from) { |
- FLAG_harmony_tolength = from.FLAG_harmony_tolength; |
-}); |
- |
utils.Import(function(from) { |
ExpandReplacement = from.ExpandReplacement; |
MakeTypeError = from.MakeTypeError; |
@@ -176,7 +171,7 @@ function RegExpExecJS(string) { |
// Conversion is required by the ES2015 specification (RegExpBuiltinExec |
// algorithm, step 4) even if the value is discarded for non-global RegExps. |
- var i = TO_LENGTH_OR_INTEGER(lastIndex); |
+ var i = TO_LENGTH(lastIndex); |
var updateLastIndex = REGEXP_GLOBAL(this) || REGEXP_STICKY(this); |
if (updateLastIndex) { |
@@ -223,7 +218,7 @@ function RegExpTest(string) { |
// Conversion is required by the ES2015 specification (RegExpBuiltinExec |
// algorithm, step 4) even if the value is discarded for non-global RegExps. |
- var i = TO_LENGTH_OR_INTEGER(lastIndex); |
+ var i = TO_LENGTH(lastIndex); |
if (REGEXP_GLOBAL(this) || REGEXP_STICKY(this)) { |
if (i < 0 || i > string.length) { |