Merge 7ea26a4 into 10ac76e

jneen · Jul 9, 2017 · a5d36de · a5d36de
2 parents 10ac76e + 7ea26a4
commit a5d36de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/parsimmon.js b/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);
   });

diff --git a/test/core/regexp.test.js b/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},
+    });
   });
 
 });