Merge pull request #192 from /issues/189

Fixes #189 fixes regexp failure bug

CHANGELOG.md

@@ -1,3 +1,7 @@
+## version 1.6.2 (2017-07-08)
+
+* Fixes another bug with match groups outside the correct range in `Parsimmon.regexp(regexp, group)`.
+
 ## version 1.6.1 (2017-07-01)
 
 * **100% unit test coverage!** This does not mean bugs won't exist, but it keeps us much safer against regressions in the future.

package.json

@@ -1,6 +1,6 @@
 {
  "name": "parsimmon",
- "version": "1.6.1",
+ "version": "1.6.2",
  "description": "A monadic LL(infinity) parser combinator library",
  "keywords": [
  "parsing",

src/parsimmon.js

@@ -595,9 +595,9 @@ function regexp(re, group) {
  var groupMatch = match[group];
  return makeSuccess(i + fullMatch.length, groupMatch);
  }
- return makeFailure(
- 'valid match group (0 to ' + match.length + ') in ' + expected
- );
+ var message =
+ 'valid match group (0 to ' + match.length + ') in ' + expected;
+ return makeFailure(i, message);
  }
  return makeFailure(i, expected);
  });

test/core/regexp.test.js

@@ -47,7 +47,11 @@ suite('Parsimmon.regexp', function() {
  assert.strictEqual(parser0.parse('a1').value, 'a1');
  assert.strictEqual(parser1.parse('a1').value, 'a');
  assert.strictEqual(parser2.parse('a1').value, '1');
- assert.strictEqual(parser3.parse('a1').status, false);
+ assert.deepStrictEqual(parser3.parse('a1'), {
+ status: false,
+ expected: ['valid match group (0 to 3) in /(\\w)(\\d)/'],
+ index: {column: 1, line: 1, offset: 0},
+ });
  });
 
 });