regex no longer relies on global state (lastIndex) (#226)

jsonata-js · May 23, 2018 · 7cc2b0b · 7cc2b0b
1 parent 3c50c69
commit 7cc2b0b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/jsonata.js b/jsonata.js
@@ -2349,9 +2349,8 @@ var jsonata = (function() {
  * @returns {Function} Higher order function representing prepared regex
  */
  function evaluateRegex(expr) {
- expr.value.lastIndex = 0;
+ var re = new RegExp(expr.value);
  var closure = function(str) {
- var re = expr.value;
  var result;
  var match = re.exec(str);
  if(match !== null) {
@@ -2371,7 +2370,7 @@ var jsonata = (function() {
  return undefined;
  } else {
  var next = closure(str);
- if(next && next.match === '' && re.lastIndex === expr.value.lastIndex) {
+ if(next && next.match === '') {
  // matches zero length string; this will never progress
  throw {
  code: "D1004",